Attachment 182443 Details for Bug 218912 – beta6

[patch] beta6

ff54.diff (text/plain), 53.59 KB, created by Jan Beich on 2017-05-09 15:19:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Beich

Created: 2017-05-09 15:19:04 UTC

Size: 53.59 KB

patch

obsolete

>From 8bf040fb108e0324f5da940f8a92c8dc78697582 Mon Sep 17 00:00:00 2001
>From: Some One Else <nobody@home>
>Date: Tue, 11 Apr 2017 14:17:57 +0000
>Subject: www/firefox: update to 54.0
>
>Changes:	https://www.mozilla.org/firefox/54.0/releasenotes/
>PR:		218912
>Security:	6cec1b0a-da15-467d-8691-1dea392d4c8d
>MFH:		2017Q2
>---
> Mk/Uses/gecko.mk                    |   4 +-
> Mk/bsd.gecko.mk                     |   8 +-
> www/firefox-i18n/Makefile           |   4 +-
> www/firefox-i18n/distinfo           | 358 ++++++++++++++++++------------------
> www/firefox/Makefile                |  12 +-
> www/firefox/distinfo                |   6 +-
> www/firefox/files/patch-bug1338655  |  66 -------
> www/firefox/files/patch-bug1359051  |  31 ----
> www/firefox/files/patch-bug1359142  |  57 ------
> www/firefox/files/patch-bug847568   |  20 +-
> www/firefox/files/patch-rust-option | 345 ++++++++++++++++++++++++++++++++++
> 11 files changed, 552 insertions(+), 359 deletions(-)
> delete mode 100644 www/firefox/files/patch-bug1338655
> delete mode 100644 www/firefox/files/patch-bug1359051
> delete mode 100644 www/firefox/files/patch-bug1359142
> create mode 100644 www/firefox/files/patch-rust-option
>
>diff --git a/Mk/Uses/gecko.mk b/Mk/Uses/gecko.mk
>index 46cc66c66f39..c895b04979de 100644
>--- a/Mk/Uses/gecko.mk
>+++ b/Mk/Uses/gecko.mk
>@@ -37,12 +37,12 @@ RUN_DEPENDS+=	libxul>=45:www/libxul
> .elif ${gecko_ARGS:Mfirefox}
> 
> _GECKO_DEFAULT_VERSION=	52
>-_GECKO_VERSIONS=		52 53
>+_GECKO_VERSIONS=		52 54
> _GECKO_TYPE=	firefox
> 
> # Dependence lines for different Firefox versions
> 52_DEPENDS=		${LOCALBASE}/lib/firefox/firefox:www/firefox-esr
>-53_DEPENDS=		${LOCALBASE}/lib/firefox/firefox:www/firefox
>+54_DEPENDS=		${LOCALBASE}/lib/firefox/firefox:www/firefox
> 
> .if exists(${LOCALBASE}/bin/firefox)
> _GECKO_INSTALLED_VER!=	${LOCALBASE}/bin/firefox --version 2>/dev/null
>diff --git a/Mk/bsd.gecko.mk b/Mk/bsd.gecko.mk
>index 6660465a4ae5..21970c2f3743 100644
>--- a/Mk/bsd.gecko.mk
>+++ b/Mk/bsd.gecko.mk
>@@ -328,12 +328,14 @@ MOZ_OPTIONS+=	--enable-gconf
> MOZ_OPTIONS+=	--disable-gconf
> .endif
> 
>-.if ${PORT_OPTIONS:MGNOMEUI}
>+.if ${MOZILLA_VER:R:R} < 55
>+. if ${PORT_OPTIONS:MGNOMEUI}
> BUILD_DEPENDS+=	${libgnomeui_DETECT}:${libgnomeui_LIB_DEPENDS:C/.*://}
> USE_GNOME+=		libgnomeui:build
> MOZ_OPTIONS+=	--enable-gnomeui
>-.else
>+. else
> MOZ_OPTIONS+=	--disable-gnomeui
>+. endif
> .endif
> 
> .if ${PORT_OPTIONS:MLIBPROXY}
>@@ -389,7 +391,7 @@ post-patch-SNDIO-on:
> .endif
> 
> .if ${PORT_OPTIONS:MRUST}
>-BUILD_DEPENDS+=	rustc:${RUST_PORT}
>+BUILD_DEPENDS+=	rust>=1.15.1:${RUST_PORT}
> . if ${MOZILLA_VER:R:R} >= 51
> BUILD_DEPENDS+=	cargo>=0.16.0:devel/cargo
> . endif
>diff --git a/www/firefox-i18n/Makefile b/www/firefox-i18n/Makefile
>index 1a571022372a..0ff77ecf2227 100644
>--- a/www/firefox-i18n/Makefile
>+++ b/www/firefox-i18n/Makefile
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	firefox-i18n
>-PORTVERSION=	53.0.2
>+PORTVERSION=	54.0b2
> CATEGORIES=	www
> MASTER_SITES=	MOZILLA/${PORTNAME:S|-i18n||}/releases/${DISTVERSION}/linux-i686/xpi \
> 		MOZILLA/${PORTNAME:S|-i18n||}/candidates/${DISTVERSION}-candidates/build1/linux-i686/xpi
>@@ -15,7 +15,7 @@ COMMENT=	Localized interface for Firefox
> 
> EXTRACT_DEPENDS=	zip:archivers/zip
> 
>-USES=		zip:infozip gecko:firefox,53,build
>+USES=		zip:infozip gecko:firefox,54,build
> USE_XPI=	firefox
> 
> NO_ARCH=	yes
>diff --git a/www/firefox-i18n/distinfo b/www/firefox-i18n/distinfo
>index ffce3d1d7a92..23619c2c423a 100644
>--- a/www/firefox-i18n/distinfo
>+++ b/www/firefox-i18n/distinfo
>@@ -1,179 +1,179 @@
>-TIMESTAMP = 1493948953
>-SHA256 (xpi/firefox-i18n-53.0.2/ach.xpi) = 57c8f888c5109c1c45784572794a2b74b10bb9f34a5dda285bb58b766903ac1f
>-SIZE (xpi/firefox-i18n-53.0.2/ach.xpi) = 432352
>-SHA256 (xpi/firefox-i18n-53.0.2/af.xpi) = 4d95208aaef969a4c85ce243a22561a3375cf14cf322328bd6a72784c3efc75d
>-SIZE (xpi/firefox-i18n-53.0.2/af.xpi) = 441830
>-SHA256 (xpi/firefox-i18n-53.0.2/an.xpi) = a6d38b2bb58273b211c34e158340f74dc67d67e18caf4089d34159942a0dfda4
>-SIZE (xpi/firefox-i18n-53.0.2/an.xpi) = 450801
>-SHA256 (xpi/firefox-i18n-53.0.2/ar.xpi) = ba974c802b3c4d2042f654f1b8024731fea2e05e48ddcffea006d7392a7116c9
>-SIZE (xpi/firefox-i18n-53.0.2/ar.xpi) = 479118
>-SHA256 (xpi/firefox-i18n-53.0.2/as.xpi) = d4991f2678fb785b7ce3edf87329c21058930edc83ba7f10771cebc413cf4c82
>-SIZE (xpi/firefox-i18n-53.0.2/as.xpi) = 491256
>-SHA256 (xpi/firefox-i18n-53.0.2/ast.xpi) = c7c8b11b7b809ae17d2a0945a08bef4dcc8ebb7fa7483e4a79787af5b7279c29
>-SIZE (xpi/firefox-i18n-53.0.2/ast.xpi) = 445436
>-SHA256 (xpi/firefox-i18n-53.0.2/az.xpi) = 5d36b5f1412c826fa19e5e9c71c2e22fcf98853d7e90e2979b3e4d7b802ac52d
>-SIZE (xpi/firefox-i18n-53.0.2/az.xpi) = 459504
>-SHA256 (xpi/firefox-i18n-53.0.2/bg.xpi) = 06172c0b39d6a525fc25a54e17f271bce07b2d3bccef835f3e384a8ab0a7cb84
>-SIZE (xpi/firefox-i18n-53.0.2/bg.xpi) = 492609
>-SHA256 (xpi/firefox-i18n-53.0.2/bn-BD.xpi) = ee03dd568ea3c0bcf62d3e7952591b357e319e2354777532abdcb1f41ea0f084
>-SIZE (xpi/firefox-i18n-53.0.2/bn-BD.xpi) = 516502
>-SHA256 (xpi/firefox-i18n-53.0.2/bn-IN.xpi) = 2e782b80abf77135b3a1e77f7360dea0110fbb8be86566f289f7d6fe46751186
>-SIZE (xpi/firefox-i18n-53.0.2/bn-IN.xpi) = 513553
>-SHA256 (xpi/firefox-i18n-53.0.2/br.xpi) = b002a5d6c595bed5c85ceea861e1757af2863bf396f89a28e3cf7ad64e45bdbf
>-SIZE (xpi/firefox-i18n-53.0.2/br.xpi) = 440068
>-SHA256 (xpi/firefox-i18n-53.0.2/bs.xpi) = d4ccbeb450813a9ca1eb7c94a2984b11662e78f4654900eaa038a9ad928f257a
>-SIZE (xpi/firefox-i18n-53.0.2/bs.xpi) = 446634
>-SHA256 (xpi/firefox-i18n-53.0.2/ca.xpi) = 7bf4aa4d3678814991d4b7b04e9bc6121dd8dd42777a5ac11adbc0c4f6b91c60
>-SIZE (xpi/firefox-i18n-53.0.2/ca.xpi) = 448943
>-SHA256 (xpi/firefox-i18n-53.0.2/cs.xpi) = 46466c4c12b3111029249ce16856680c9e55635a0c4de685bada0061e23c70e7
>-SIZE (xpi/firefox-i18n-53.0.2/cs.xpi) = 449412
>-SHA256 (xpi/firefox-i18n-53.0.2/cy.xpi) = 9a5095ee5a004ab7c43c019020bb1cfdd95ce6e654ddd244e8a124bb93a77bcf
>-SIZE (xpi/firefox-i18n-53.0.2/cy.xpi) = 441505
>-SHA256 (xpi/firefox-i18n-53.0.2/da.xpi) = 267b77dd8aace8dfd14f88a6a694a21ea9f9b8234fe9557a579bc9cbd2ce8843
>-SIZE (xpi/firefox-i18n-53.0.2/da.xpi) = 428974
>-SHA256 (xpi/firefox-i18n-53.0.2/de.xpi) = 93dce7fab3d847f26ea550de351f26d31ff1df94add3f21defc41a4af69064b5
>-SIZE (xpi/firefox-i18n-53.0.2/de.xpi) = 447785
>-SHA256 (xpi/firefox-i18n-53.0.2/dsb.xpi) = 2ce9e06d758109e3ceba6a0d2ff2fb574e5c19ceeacd81fac9ace7534b6cfee3
>-SIZE (xpi/firefox-i18n-53.0.2/dsb.xpi) = 464375
>-SHA256 (xpi/firefox-i18n-53.0.2/el.xpi) = 0b6b006908114bda2b977eb664802c1bd552b989c148a8e166d5555c057989d2
>-SIZE (xpi/firefox-i18n-53.0.2/el.xpi) = 523413
>-SHA256 (xpi/firefox-i18n-53.0.2/en-GB.xpi) = 1fb3092304c2727c2c5f52203a8e6f8bf66095aa9f143c95eb4832a30901ef7e
>-SIZE (xpi/firefox-i18n-53.0.2/en-GB.xpi) = 424830
>-SHA256 (xpi/firefox-i18n-53.0.2/en-US.xpi) = 2612776ad4b67c0f38cdbdfa2acc47af9dfd9785a59a80115e05379eeaaecd89
>-SIZE (xpi/firefox-i18n-53.0.2/en-US.xpi) = 430737
>-SHA256 (xpi/firefox-i18n-53.0.2/en-ZA.xpi) = 2ba80d3b42adbbc0f9c5bd632bd52ed46bea5d111f2ce623570aabc8ba2e82b0
>-SIZE (xpi/firefox-i18n-53.0.2/en-ZA.xpi) = 417992
>-SHA256 (xpi/firefox-i18n-53.0.2/eo.xpi) = 8513ca05f2779ea8e04acbf46ccfce5ea0a1c08c3584086571b58ffebe4b6154
>-SIZE (xpi/firefox-i18n-53.0.2/eo.xpi) = 442323
>-SHA256 (xpi/firefox-i18n-53.0.2/es-AR.xpi) = 3f2f136754229a06d210086fdd827a9c8da9b84ef104b8856a61c0cccd02fbe1
>-SIZE (xpi/firefox-i18n-53.0.2/es-AR.xpi) = 450768
>-SHA256 (xpi/firefox-i18n-53.0.2/es-CL.xpi) = c1e51e508ab65e9b95fc2506a23f2034bf32df5b9741e2968d01c70df02f1caa
>-SIZE (xpi/firefox-i18n-53.0.2/es-CL.xpi) = 450477
>-SHA256 (xpi/firefox-i18n-53.0.2/es-ES.xpi) = b770da50dd5183ab9f488899554c2b6ea0bd4021d108f19dcb9f992495f26754
>-SIZE (xpi/firefox-i18n-53.0.2/es-ES.xpi) = 347589
>-SHA256 (xpi/firefox-i18n-53.0.2/es-MX.xpi) = e568bf71290e9cee1fdca52dcca979af4b5abc7452bd1ca256cade23cbe2186a
>-SIZE (xpi/firefox-i18n-53.0.2/es-MX.xpi) = 453326
>-SHA256 (xpi/firefox-i18n-53.0.2/et.xpi) = 674dda4378cf4ac3c58bff4397d919a3db79173828d380b37a5a2f43f5a2ddfd
>-SIZE (xpi/firefox-i18n-53.0.2/et.xpi) = 428865
>-SHA256 (xpi/firefox-i18n-53.0.2/eu.xpi) = 3ab5f7e84264f64577e32a0c9e72cf8cce16563ba5d8d5f5c9486ac032351e53
>-SIZE (xpi/firefox-i18n-53.0.2/eu.xpi) = 443204
>-SHA256 (xpi/firefox-i18n-53.0.2/fa.xpi) = 094136aeb226e17f1e27e3a07f51a724353626f9168e2067c981a6a368dc257e
>-SIZE (xpi/firefox-i18n-53.0.2/fa.xpi) = 496783
>-SHA256 (xpi/firefox-i18n-53.0.2/ff.xpi) = 9a0b178833dfb5c4b3ef9530626fabe128abd9fb7a64f75c8c8076c1dbc94628
>-SIZE (xpi/firefox-i18n-53.0.2/ff.xpi) = 446670
>-SHA256 (xpi/firefox-i18n-53.0.2/fi.xpi) = bff8d55342c37091fd89f10fb56c4f951d024375bac98770428ad216d275cd07
>-SIZE (xpi/firefox-i18n-53.0.2/fi.xpi) = 434622
>-SHA256 (xpi/firefox-i18n-53.0.2/fr.xpi) = a7c1c5b13fc1d72356645c4103cce8b89eb3322a44a5a1d74dfd8f03e9848af2
>-SIZE (xpi/firefox-i18n-53.0.2/fr.xpi) = 457535
>-SHA256 (xpi/firefox-i18n-53.0.2/fy-NL.xpi) = 9bc1eaa66f61dcb59b29ba71914ede3511756c41a3fba1ad75a225b763c76274
>-SIZE (xpi/firefox-i18n-53.0.2/fy-NL.xpi) = 449823
>-SHA256 (xpi/firefox-i18n-53.0.2/ga-IE.xpi) = 0a6d92ddc38f354cacce92191cf122cb7bfb8edbf05808245da16ae4bfa01582
>-SIZE (xpi/firefox-i18n-53.0.2/ga-IE.xpi) = 463130
>-SHA256 (xpi/firefox-i18n-53.0.2/gd.xpi) = be2268534a473bdf875d40502f5a6be18c00134e9fe23580173bebb666d21580
>-SIZE (xpi/firefox-i18n-53.0.2/gd.xpi) = 452062
>-SHA256 (xpi/firefox-i18n-53.0.2/gl.xpi) = 71fc2f512276903f0355c49249d82e985e47336b9e2963b2c19b5543142cab92
>-SIZE (xpi/firefox-i18n-53.0.2/gl.xpi) = 449152
>-SHA256 (xpi/firefox-i18n-53.0.2/gn.xpi) = 8733575b95476c5b508b2b548b84c7f9e79e90d67b439d9815fb312672dd6ed0
>-SIZE (xpi/firefox-i18n-53.0.2/gn.xpi) = 461573
>-SHA256 (xpi/firefox-i18n-53.0.2/gu-IN.xpi) = 539bcd0893c4f264b99b519ed1f1c958579a419e1d23c276924dc71bfdf1e34f
>-SIZE (xpi/firefox-i18n-53.0.2/gu-IN.xpi) = 493672
>-SHA256 (xpi/firefox-i18n-53.0.2/he.xpi) = fff73d3aaa21a7c76ac6ca196a2b8102b626db4d53853a15919604647a54811c
>-SIZE (xpi/firefox-i18n-53.0.2/he.xpi) = 460050
>-SHA256 (xpi/firefox-i18n-53.0.2/hi-IN.xpi) = 7179ee33a18d6b6994e71adaf41acefb60c823e0a7d8d985f83f5295a9c0ba81
>-SIZE (xpi/firefox-i18n-53.0.2/hi-IN.xpi) = 511788
>-SHA256 (xpi/firefox-i18n-53.0.2/hr.xpi) = ff01c58746b194c806c3a9925647d633e29eb6e0425837d142e5da1240fe1334
>-SIZE (xpi/firefox-i18n-53.0.2/hr.xpi) = 453110
>-SHA256 (xpi/firefox-i18n-53.0.2/hsb.xpi) = 306460fe5618f498e232e891cc3c6e7988b119406de98fe924f346ec82a463f0
>-SIZE (xpi/firefox-i18n-53.0.2/hsb.xpi) = 462175
>-SHA256 (xpi/firefox-i18n-53.0.2/hu.xpi) = 5776c3178fb0392b202bbc693018540a62ca2c7b25f2aa16d6adaa502c327d65
>-SIZE (xpi/firefox-i18n-53.0.2/hu.xpi) = 456925
>-SHA256 (xpi/firefox-i18n-53.0.2/hy-AM.xpi) = 1ba34edfce543fd27a94e34df8739fb37d783c5e66352cfd0c22e6ef18154af2
>-SIZE (xpi/firefox-i18n-53.0.2/hy-AM.xpi) = 500718
>-SHA256 (xpi/firefox-i18n-53.0.2/id.xpi) = 2463d83abe03f48260ea6c8f195ff4d2800a2411f191c7abc5a0e97a2254c278
>-SIZE (xpi/firefox-i18n-53.0.2/id.xpi) = 430281
>-SHA256 (xpi/firefox-i18n-53.0.2/is.xpi) = e8132940f19bf8b2853a7eb2036b59b249ff21928a6d43ba0226d0bc1852c76a
>-SIZE (xpi/firefox-i18n-53.0.2/is.xpi) = 447334
>-SHA256 (xpi/firefox-i18n-53.0.2/it.xpi) = f06adfd40f8cb738dd8e71ba3678bed85eb5eda92f4715a15749100717d2a7bb
>-SIZE (xpi/firefox-i18n-53.0.2/it.xpi) = 341969
>-SHA256 (xpi/firefox-i18n-53.0.2/ja.xpi) = 3e75bafcc69a5a45366e9fe28a161865531112f4e5104b5e02f40ef0e5210123
>-SIZE (xpi/firefox-i18n-53.0.2/ja.xpi) = 493029
>-SHA256 (xpi/firefox-i18n-53.0.2/kk.xpi) = 63b1fd9875d4a54445026aaef9355ea0e1f5079a4b1f66ce2d13ae341054c0a5
>-SIZE (xpi/firefox-i18n-53.0.2/kk.xpi) = 499341
>-SHA256 (xpi/firefox-i18n-53.0.2/km.xpi) = 9a17f6f47ab582ebde8784279feb38f7f3b5b9156ea9e0535cafeb5344869fe5
>-SIZE (xpi/firefox-i18n-53.0.2/km.xpi) = 524729
>-SHA256 (xpi/firefox-i18n-53.0.2/kn.xpi) = ba5cbc5530c53132bcdac29a1f4b0bac383984618e1a38e68ec496725abe2fdf
>-SIZE (xpi/firefox-i18n-53.0.2/kn.xpi) = 524037
>-SHA256 (xpi/firefox-i18n-53.0.2/ko.xpi) = 2f34266559cd4fb7b9f0330c440ed41d690c715e00cf3c6e5dacba5225261e78
>-SIZE (xpi/firefox-i18n-53.0.2/ko.xpi) = 468653
>-SHA256 (xpi/firefox-i18n-53.0.2/lij.xpi) = 57319636af883e959011da403fa6ef6a6de722fcd45997fc5cf85e8f174b4159
>-SIZE (xpi/firefox-i18n-53.0.2/lij.xpi) = 435430
>-SHA256 (xpi/firefox-i18n-53.0.2/lt.xpi) = cc191030ef2cfc5ea4f485721fcbcf3c058ba3be5b48eb7a36c1892c7492c7a6
>-SIZE (xpi/firefox-i18n-53.0.2/lt.xpi) = 457034
>-SHA256 (xpi/firefox-i18n-53.0.2/lv.xpi) = 99bb8fb32784a0ae4e61be10e16c2b605ab24778170653b9b259c1f84e6e4147
>-SIZE (xpi/firefox-i18n-53.0.2/lv.xpi) = 453378
>-SHA256 (xpi/firefox-i18n-53.0.2/mai.xpi) = 487a37504caf77b332647a349ed48e8469880e1458d4d13bf18cb7814de1678d
>-SIZE (xpi/firefox-i18n-53.0.2/mai.xpi) = 504302
>-SHA256 (xpi/firefox-i18n-53.0.2/mk.xpi) = 967adfc3e5dd7671f359acce4266c9221fe621eb5c967afff76eaf0d2fe2aa46
>-SIZE (xpi/firefox-i18n-53.0.2/mk.xpi) = 499956
>-SHA256 (xpi/firefox-i18n-53.0.2/ml.xpi) = 20923f6d8410b1348943831241c3b861824cd3f2a7ecb39cc7dde7757ea1eb4c
>-SIZE (xpi/firefox-i18n-53.0.2/ml.xpi) = 520667
>-SHA256 (xpi/firefox-i18n-53.0.2/mr.xpi) = 518a448cf4933ffbda3e530acd82859980f1a2c35fd4cc49bb0467e9391d8a69
>-SIZE (xpi/firefox-i18n-53.0.2/mr.xpi) = 507882
>-SHA256 (xpi/firefox-i18n-53.0.2/ms.xpi) = 62d1b4f77f7a2c3178c483be67f6dbdab91550862bdeea25978bb057c09b9c68
>-SIZE (xpi/firefox-i18n-53.0.2/ms.xpi) = 440728
>-SHA256 (xpi/firefox-i18n-53.0.2/nb-NO.xpi) = c53f8bc9bf15c33c1d9bff266b8ee6f2f92d7b95411a332bddf7318005146742
>-SIZE (xpi/firefox-i18n-53.0.2/nb-NO.xpi) = 439033
>-SHA256 (xpi/firefox-i18n-53.0.2/nl.xpi) = 94434f919a61ebd7cff12a8d32ac9b36ac0b62edaa24c398d9da8793c85603b4
>-SIZE (xpi/firefox-i18n-53.0.2/nl.xpi) = 436860
>-SHA256 (xpi/firefox-i18n-53.0.2/nn-NO.xpi) = f7944456b7ad821d6a2e91805eed2e24f796bff7364d53689d803db606e539b7
>-SIZE (xpi/firefox-i18n-53.0.2/nn-NO.xpi) = 433329
>-SHA256 (xpi/firefox-i18n-53.0.2/or.xpi) = 3f4a1ca22105d616db0b07b7aa46e40e9ff705ddb3f594f123d2813d3a870f70
>-SIZE (xpi/firefox-i18n-53.0.2/or.xpi) = 501208
>-SHA256 (xpi/firefox-i18n-53.0.2/pa-IN.xpi) = d38d9bc9c4fb0cfc1a6bc4960a338dccc32620ec09e022697e61cf6607b86871
>-SIZE (xpi/firefox-i18n-53.0.2/pa-IN.xpi) = 480864
>-SHA256 (xpi/firefox-i18n-53.0.2/pl.xpi) = 582a7e229b1bdf7423be141f9a278668cd25b37459ec7bbb8b0b721758bd4922
>-SIZE (xpi/firefox-i18n-53.0.2/pl.xpi) = 354949
>-SHA256 (xpi/firefox-i18n-53.0.2/pt-BR.xpi) = 89a8ff9dcfe46c320314df02000b7d66f721a93886cedd98ffdb2e80f8c5185f
>-SIZE (xpi/firefox-i18n-53.0.2/pt-BR.xpi) = 442708
>-SHA256 (xpi/firefox-i18n-53.0.2/pt-PT.xpi) = 508575d58c837b3b94b5a05f0e5963f4bbcc34ba466f9c14b842e954d39cba77
>-SIZE (xpi/firefox-i18n-53.0.2/pt-PT.xpi) = 441599
>-SHA256 (xpi/firefox-i18n-53.0.2/rm.xpi) = 3dc06fb7cd7a5f3bbe141b68b4ee3034b81e93eb509c95b1f2a0e4aff5b5a2ea
>-SIZE (xpi/firefox-i18n-53.0.2/rm.xpi) = 439749
>-SHA256 (xpi/firefox-i18n-53.0.2/ro.xpi) = 7b40f8850aedaa33a9221e32747629de84074f807f93630664807e3214393975
>-SIZE (xpi/firefox-i18n-53.0.2/ro.xpi) = 454822
>-SHA256 (xpi/firefox-i18n-53.0.2/ru.xpi) = b56427d635748fc7746842bceade41fa81c16843afb0d87ef0bcac9da3d9d6ba
>-SIZE (xpi/firefox-i18n-53.0.2/ru.xpi) = 506894
>-SHA256 (xpi/firefox-i18n-53.0.2/si.xpi) = b733edc4c668debf7d0eda9ddcc0c1bbd9c5d31c7ea90e94108fd39c62a2a520
>-SIZE (xpi/firefox-i18n-53.0.2/si.xpi) = 496183
>-SHA256 (xpi/firefox-i18n-53.0.2/sk.xpi) = 96ccd04fb1df2ecd12ab6cd9ebb019f1c2a7d94e100b34112995adaff2f9227c
>-SIZE (xpi/firefox-i18n-53.0.2/sk.xpi) = 460859
>-SHA256 (xpi/firefox-i18n-53.0.2/sl.xpi) = b6a994768aaef58c97a0aade9f463044300c07dca10c58c2be11c1fade665719
>-SIZE (xpi/firefox-i18n-53.0.2/sl.xpi) = 438369
>-SHA256 (xpi/firefox-i18n-53.0.2/son.xpi) = ac56d8090a8e039244e5707048201429562eab3684f3871a1af9247be85f9d96
>-SIZE (xpi/firefox-i18n-53.0.2/son.xpi) = 439834
>-SHA256 (xpi/firefox-i18n-53.0.2/sq.xpi) = 2d9761c95ce185a175f5112fbfb24a3d53232a2f11c9f37384a93cd515f2b78f
>-SIZE (xpi/firefox-i18n-53.0.2/sq.xpi) = 453422
>-SHA256 (xpi/firefox-i18n-53.0.2/sr.xpi) = 056052c33435c69d1856116b296454638552229ba7b89ae7917be2d0af65a256
>-SIZE (xpi/firefox-i18n-53.0.2/sr.xpi) = 467997
>-SHA256 (xpi/firefox-i18n-53.0.2/sv-SE.xpi) = 05d606dcf0020efde60c28ebd1b49ce55626005c6b94cb9af148b9370254ff43
>-SIZE (xpi/firefox-i18n-53.0.2/sv-SE.xpi) = 445795
>-SHA256 (xpi/firefox-i18n-53.0.2/ta.xpi) = 13ca2bdd96e585d3386e5b825a1d0078c63874a67a9ff0e2c911000afd798a0b
>-SIZE (xpi/firefox-i18n-53.0.2/ta.xpi) = 500480
>-SHA256 (xpi/firefox-i18n-53.0.2/te.xpi) = 5a935b8017503ceb33ee83ce576d94b58e177fa70026edd20ce479cd0d7938ca
>-SIZE (xpi/firefox-i18n-53.0.2/te.xpi) = 520475
>-SHA256 (xpi/firefox-i18n-53.0.2/th.xpi) = 84dddef4741566dff676d55737be4c59c1be1d28c8831de6bf2f3c00259425ae
>-SIZE (xpi/firefox-i18n-53.0.2/th.xpi) = 494087
>-SHA256 (xpi/firefox-i18n-53.0.2/tr.xpi) = 22b099ef75d5c431fbe3efea9ff1051e040303120f0a6abb10339db873210548
>-SIZE (xpi/firefox-i18n-53.0.2/tr.xpi) = 445852
>-SHA256 (xpi/firefox-i18n-53.0.2/uk.xpi) = ee75859e48a0c5ceb62ce9e46ac72035b280f4d743c9752e874b6df9d1cb956e
>-SIZE (xpi/firefox-i18n-53.0.2/uk.xpi) = 497432
>-SHA256 (xpi/firefox-i18n-53.0.2/uz.xpi) = eac88ddcd6286476e3d144e3a662976d08206b576a8277cfb7fa60a8e2344abd
>-SIZE (xpi/firefox-i18n-53.0.2/uz.xpi) = 453391
>-SHA256 (xpi/firefox-i18n-53.0.2/vi.xpi) = 0bb35467af32fac2bbf056eca1a9adac33c77e4021baa562072215ea218621a0
>-SIZE (xpi/firefox-i18n-53.0.2/vi.xpi) = 455841
>-SHA256 (xpi/firefox-i18n-53.0.2/xh.xpi) = 4cc0edbbc43b525751436f7a1adac903f669e16ae058081a5f454c0f653fd872
>-SIZE (xpi/firefox-i18n-53.0.2/xh.xpi) = 446171
>-SHA256 (xpi/firefox-i18n-53.0.2/zh-CN.xpi) = c6da1d554094691262fb78bc9b2c256b00fb2f4d8b6bb911533632db9c8172ec
>-SIZE (xpi/firefox-i18n-53.0.2/zh-CN.xpi) = 463955
>-SHA256 (xpi/firefox-i18n-53.0.2/zh-TW.xpi) = 291335f845d203babd89a207cf7c3ac7991bb74364fbc9b08403b971027a59c4
>-SIZE (xpi/firefox-i18n-53.0.2/zh-TW.xpi) = 474982
>+TIMESTAMP = 1494295533
>+SHA256 (xpi/firefox-i18n-54.0b2/ach.xpi) = 6b50af6b457608c625b5a99c0f467e9e13827e84387223682c251847ef12ec03
>+SIZE (xpi/firefox-i18n-54.0b2/ach.xpi) = 432350
>+SHA256 (xpi/firefox-i18n-54.0b2/af.xpi) = 2e030e8d993a72fc2b922bd71749564706d5bbc4f5edd1d5cb0a2e2d341dd397
>+SIZE (xpi/firefox-i18n-54.0b2/af.xpi) = 441829
>+SHA256 (xpi/firefox-i18n-54.0b2/an.xpi) = 3b049eabcf49f57742f574c792b0f15a2f0fe7af8d7700074555741eba4b40bd
>+SIZE (xpi/firefox-i18n-54.0b2/an.xpi) = 450799
>+SHA256 (xpi/firefox-i18n-54.0b2/ar.xpi) = 0df14612d4a6fe4e6da247b8529b45ab856d3a6d6bf284dac9654af2b4c91909
>+SIZE (xpi/firefox-i18n-54.0b2/ar.xpi) = 479118
>+SHA256 (xpi/firefox-i18n-54.0b2/as.xpi) = 67a780398046cfb66c7b10d8aa3e42a7b8eef5d8eedb2f7d890ab1a748049708
>+SIZE (xpi/firefox-i18n-54.0b2/as.xpi) = 491255
>+SHA256 (xpi/firefox-i18n-54.0b2/ast.xpi) = 0b0cab248642b295d3ec4fdb5206c4b4ab3ec1d8aa9cec573f230bd6fa75a816
>+SIZE (xpi/firefox-i18n-54.0b2/ast.xpi) = 445436
>+SHA256 (xpi/firefox-i18n-54.0b2/az.xpi) = 59ead0e267f43af93c7caa1148947224dc4206d42a37f80156ff47adae994261
>+SIZE (xpi/firefox-i18n-54.0b2/az.xpi) = 459503
>+SHA256 (xpi/firefox-i18n-54.0b2/bg.xpi) = 5ca6477997bd96165af804a2a8bcd6c01c8bfb5c9f98354e1602f49a922cf65b
>+SIZE (xpi/firefox-i18n-54.0b2/bg.xpi) = 492607
>+SHA256 (xpi/firefox-i18n-54.0b2/bn-BD.xpi) = 9f52c102c056489b2187f9d781a645f2c1d205b812a3ca6afdad56130c211c7f
>+SIZE (xpi/firefox-i18n-54.0b2/bn-BD.xpi) = 516501
>+SHA256 (xpi/firefox-i18n-54.0b2/bn-IN.xpi) = f913e5d79388285ae6a7e7f59b81855135336c50c37e3dd90cbd101057017600
>+SIZE (xpi/firefox-i18n-54.0b2/bn-IN.xpi) = 513552
>+SHA256 (xpi/firefox-i18n-54.0b2/br.xpi) = 0bb79e4c792cd3bba0804064f91963389daba26a486cbf3fe84045ee6701ec07
>+SIZE (xpi/firefox-i18n-54.0b2/br.xpi) = 440067
>+SHA256 (xpi/firefox-i18n-54.0b2/bs.xpi) = e4c803a77b70c0077c3f0fb467a601b5ff143a37ac8303dd97005b7aa3007864
>+SIZE (xpi/firefox-i18n-54.0b2/bs.xpi) = 446633
>+SHA256 (xpi/firefox-i18n-54.0b2/ca.xpi) = 18483d647252cb2d6c9be0a2ec460de22cdecaa492b02d4a1ef3e5f9ded2aa59
>+SIZE (xpi/firefox-i18n-54.0b2/ca.xpi) = 448941
>+SHA256 (xpi/firefox-i18n-54.0b2/cs.xpi) = 5335967e578088e691d59a6f0540380075dab79e611c53fd67e2938da432f25a
>+SIZE (xpi/firefox-i18n-54.0b2/cs.xpi) = 449411
>+SHA256 (xpi/firefox-i18n-54.0b2/cy.xpi) = 0822da739fc2ce0bf267dcafc8af2841432e62793e4c66ca79d0d937c4e5780e
>+SIZE (xpi/firefox-i18n-54.0b2/cy.xpi) = 441503
>+SHA256 (xpi/firefox-i18n-54.0b2/da.xpi) = 823dfd42463c4b31a6a5b1cfdcb79bfda8e80ade999cd9d481d09e48b97190c6
>+SIZE (xpi/firefox-i18n-54.0b2/da.xpi) = 428973
>+SHA256 (xpi/firefox-i18n-54.0b2/de.xpi) = 81a6ac063827b7c3eb99a26b491e26c5e6898edf51e2d836d60e14a69a2d150d
>+SIZE (xpi/firefox-i18n-54.0b2/de.xpi) = 447784
>+SHA256 (xpi/firefox-i18n-54.0b2/dsb.xpi) = 72e03e9bcefc173af4df02bfc99f22df99e7b3829cbc1d07de1b3d98e8092b35
>+SIZE (xpi/firefox-i18n-54.0b2/dsb.xpi) = 464374
>+SHA256 (xpi/firefox-i18n-54.0b2/el.xpi) = e8815fb6cae7632d70ae00cd28293a96f9d875f4f2e4e6c1491751037f293437
>+SIZE (xpi/firefox-i18n-54.0b2/el.xpi) = 523412
>+SHA256 (xpi/firefox-i18n-54.0b2/en-GB.xpi) = 258bec58ec28b75eb3db7c9b9cc68af21497eb49603994ace4aaa105840c84fd
>+SIZE (xpi/firefox-i18n-54.0b2/en-GB.xpi) = 424829
>+SHA256 (xpi/firefox-i18n-54.0b2/en-US.xpi) = e8d3d164d433d755f7619c8413d1f53041f2f23d5819c8043362408b26245398
>+SIZE (xpi/firefox-i18n-54.0b2/en-US.xpi) = 430736
>+SHA256 (xpi/firefox-i18n-54.0b2/en-ZA.xpi) = 0fe0b4fc2bb38f15bfff36e44bbb2c62715daaa6b242f3914581512684fddeb7
>+SIZE (xpi/firefox-i18n-54.0b2/en-ZA.xpi) = 417992
>+SHA256 (xpi/firefox-i18n-54.0b2/eo.xpi) = 541501fc0829fcf8147ee269224928b52e6cf4e8f1b362a4177d63f906db902e
>+SIZE (xpi/firefox-i18n-54.0b2/eo.xpi) = 442322
>+SHA256 (xpi/firefox-i18n-54.0b2/es-AR.xpi) = 61ff3ce7467b5222e110107c4119e9f752645ad0b31c6b614487bb5c533a0311
>+SIZE (xpi/firefox-i18n-54.0b2/es-AR.xpi) = 450766
>+SHA256 (xpi/firefox-i18n-54.0b2/es-CL.xpi) = a806fc6176247cda5a54ef853c9637775f9a1c2e29a87dd1b55742a71f852b33
>+SIZE (xpi/firefox-i18n-54.0b2/es-CL.xpi) = 450475
>+SHA256 (xpi/firefox-i18n-54.0b2/es-ES.xpi) = 8604ba37430f71b800a67361ce53b2325d7d71cefd0167170db35c4f2e02ce59
>+SIZE (xpi/firefox-i18n-54.0b2/es-ES.xpi) = 347587
>+SHA256 (xpi/firefox-i18n-54.0b2/es-MX.xpi) = 2173f50a3dea92c658a7e60ae76fbab81335e2bd843a835bd31db2e6162d75f1
>+SIZE (xpi/firefox-i18n-54.0b2/es-MX.xpi) = 453324
>+SHA256 (xpi/firefox-i18n-54.0b2/et.xpi) = 1ded0ac4ec18c88b8c9425a9f00f02112514c0474c442d445fd210dae019bc77
>+SIZE (xpi/firefox-i18n-54.0b2/et.xpi) = 428863
>+SHA256 (xpi/firefox-i18n-54.0b2/eu.xpi) = 624fc7dfe57168f616153f03f34348786f82efe5dcb0a510d4e42c93560bede7
>+SIZE (xpi/firefox-i18n-54.0b2/eu.xpi) = 443202
>+SHA256 (xpi/firefox-i18n-54.0b2/fa.xpi) = a745c9cdf381f18097755226fd7fff59840c6498fd8601d8850f7b22d36ddddb
>+SIZE (xpi/firefox-i18n-54.0b2/fa.xpi) = 496781
>+SHA256 (xpi/firefox-i18n-54.0b2/ff.xpi) = f68a9e23a8e2a02ff493ebd0bd9698b17ff5a5a3850bc8f21bf6fe2d6c6f22cf
>+SIZE (xpi/firefox-i18n-54.0b2/ff.xpi) = 446668
>+SHA256 (xpi/firefox-i18n-54.0b2/fi.xpi) = b99cc77e76dcbf9a25fa68c622648aa9e2db64b610c83012d8695f13e55d23a9
>+SIZE (xpi/firefox-i18n-54.0b2/fi.xpi) = 434620
>+SHA256 (xpi/firefox-i18n-54.0b2/fr.xpi) = 85436c3886b9b89e601ddf39329af76275a0010fb6acc723574a239154cd3f07
>+SIZE (xpi/firefox-i18n-54.0b2/fr.xpi) = 457534
>+SHA256 (xpi/firefox-i18n-54.0b2/fy-NL.xpi) = 1896b79fd6ac6bfa4beca5f56d88292375231836d1d031a4146b126f464403ea
>+SIZE (xpi/firefox-i18n-54.0b2/fy-NL.xpi) = 449819
>+SHA256 (xpi/firefox-i18n-54.0b2/ga-IE.xpi) = c276e493fd8a6a77bb9f6a0542763ded93ceff0f74dfdc7329f2c86105d30e6c
>+SIZE (xpi/firefox-i18n-54.0b2/ga-IE.xpi) = 463129
>+SHA256 (xpi/firefox-i18n-54.0b2/gd.xpi) = 4da4ab8fc415524ea83e99f63edc5546c0027e8b3dca1615905e69521c358a38
>+SIZE (xpi/firefox-i18n-54.0b2/gd.xpi) = 452061
>+SHA256 (xpi/firefox-i18n-54.0b2/gl.xpi) = 3a6bbcc4ac4e7b6a16031a64a8b8518fa18c7932d90bbbedfa79beecc32ece96
>+SIZE (xpi/firefox-i18n-54.0b2/gl.xpi) = 449150
>+SHA256 (xpi/firefox-i18n-54.0b2/gn.xpi) = b750ecda7bef4e14213d8e04281e080748cf48ec6e26e81457de9451aabd1454
>+SIZE (xpi/firefox-i18n-54.0b2/gn.xpi) = 461571
>+SHA256 (xpi/firefox-i18n-54.0b2/gu-IN.xpi) = 922ab30d6f1cb0747d1cd18ec526014e6f1761d5667f5d16eed834ac214149f4
>+SIZE (xpi/firefox-i18n-54.0b2/gu-IN.xpi) = 493667
>+SHA256 (xpi/firefox-i18n-54.0b2/he.xpi) = 11d021e790ab97612caa09afd29586fff8d680f8c4267920180f4a2b888e34a2
>+SIZE (xpi/firefox-i18n-54.0b2/he.xpi) = 460047
>+SHA256 (xpi/firefox-i18n-54.0b2/hi-IN.xpi) = af30c610f0e1300a2deeb47438e303b1714fd554f7859693d0a55109915d66d9
>+SIZE (xpi/firefox-i18n-54.0b2/hi-IN.xpi) = 511787
>+SHA256 (xpi/firefox-i18n-54.0b2/hr.xpi) = f4f7ffc50536c254a274e593eefb63fa5d26601968efc4f53d71179c6c95180c
>+SIZE (xpi/firefox-i18n-54.0b2/hr.xpi) = 453109
>+SHA256 (xpi/firefox-i18n-54.0b2/hsb.xpi) = ba0e3f0d2d40c45d2b481dfd2680a2fc312e6eb981058c85e696690f90f52d4d
>+SIZE (xpi/firefox-i18n-54.0b2/hsb.xpi) = 462170
>+SHA256 (xpi/firefox-i18n-54.0b2/hu.xpi) = 486d533bddbc6dd76a435fbe4efcb092218ec13ccc62aaaf2577b118d008bff8
>+SIZE (xpi/firefox-i18n-54.0b2/hu.xpi) = 456925
>+SHA256 (xpi/firefox-i18n-54.0b2/hy-AM.xpi) = d0b02e04e824c1110f3bc1c16854e0d65632fbc1683ff149def5cb3878e35dca
>+SIZE (xpi/firefox-i18n-54.0b2/hy-AM.xpi) = 500717
>+SHA256 (xpi/firefox-i18n-54.0b2/id.xpi) = e4533c814f961d10f807c9e575989e1116bba1369731fc8f46c00fd5cc9d966a
>+SIZE (xpi/firefox-i18n-54.0b2/id.xpi) = 430280
>+SHA256 (xpi/firefox-i18n-54.0b2/is.xpi) = da4be8811abad593f3f8bf06f922ccdc0873a59ed6f63fbfc5d541272e211b89
>+SIZE (xpi/firefox-i18n-54.0b2/is.xpi) = 447329
>+SHA256 (xpi/firefox-i18n-54.0b2/it.xpi) = 7dbbe76bfea715179c118ed0d3547596454d45e9ee0b001d876893db807b68b8
>+SIZE (xpi/firefox-i18n-54.0b2/it.xpi) = 341968
>+SHA256 (xpi/firefox-i18n-54.0b2/ja.xpi) = d0ce0ca453f180cdf7edabf18e3268f3117c70018fd2d06f870b60eee8d5c2cf
>+SIZE (xpi/firefox-i18n-54.0b2/ja.xpi) = 493027
>+SHA256 (xpi/firefox-i18n-54.0b2/kk.xpi) = 29bbb10188bac81daf7d73c82da3d4c653fd4b8ae384527b18bbda3fed07eca3
>+SIZE (xpi/firefox-i18n-54.0b2/kk.xpi) = 499340
>+SHA256 (xpi/firefox-i18n-54.0b2/km.xpi) = 36101d95663960644b096602ee3db596b0f1e59ead95e9a5bf64be3accad8bdb
>+SIZE (xpi/firefox-i18n-54.0b2/km.xpi) = 524728
>+SHA256 (xpi/firefox-i18n-54.0b2/kn.xpi) = 59c340fdedbf240a5e46e07144a11ce01cb0bd83d4cd7fa0c611e2f2bcbd465e
>+SIZE (xpi/firefox-i18n-54.0b2/kn.xpi) = 524035
>+SHA256 (xpi/firefox-i18n-54.0b2/ko.xpi) = 9e67ce2142de5d82e959dff3e812efff88ec34f1b691d07fa0312a50173de95d
>+SIZE (xpi/firefox-i18n-54.0b2/ko.xpi) = 468651
>+SHA256 (xpi/firefox-i18n-54.0b2/lij.xpi) = c739536b93b9f8a6b97f958531d19907752d77619d84232e03bf9b14bb543995
>+SIZE (xpi/firefox-i18n-54.0b2/lij.xpi) = 435428
>+SHA256 (xpi/firefox-i18n-54.0b2/lt.xpi) = 8a42c0b05b37d3554ae70478a84a16b8e78ee3aa6eb26a1b6fd4cbaba0e9c1bb
>+SIZE (xpi/firefox-i18n-54.0b2/lt.xpi) = 457033
>+SHA256 (xpi/firefox-i18n-54.0b2/lv.xpi) = e2067c4beced017ce7559bf0bb610d5cc3e2fc0e2d654223e93224fe09f26c49
>+SIZE (xpi/firefox-i18n-54.0b2/lv.xpi) = 453376
>+SHA256 (xpi/firefox-i18n-54.0b2/mai.xpi) = de5a34ad598a77c50be8f51529ec384f163ab388d6c14919a1928bf00dc4a8ea
>+SIZE (xpi/firefox-i18n-54.0b2/mai.xpi) = 504301
>+SHA256 (xpi/firefox-i18n-54.0b2/mk.xpi) = bd05f2c417b776651c5aa58f610d532a7b1402c9ab30fdde3126e3bd7b38ccc9
>+SIZE (xpi/firefox-i18n-54.0b2/mk.xpi) = 499954
>+SHA256 (xpi/firefox-i18n-54.0b2/ml.xpi) = 89e1127cfd43e994b39505b901e5dc696acbe744cd55f30ebfbd832530ae4d59
>+SIZE (xpi/firefox-i18n-54.0b2/ml.xpi) = 520665
>+SHA256 (xpi/firefox-i18n-54.0b2/mr.xpi) = 94d69be50f1c958102715dcc93ed12f2e9e8b8dd9431c9f675949b9208a0ae45
>+SIZE (xpi/firefox-i18n-54.0b2/mr.xpi) = 507881
>+SHA256 (xpi/firefox-i18n-54.0b2/ms.xpi) = d0a9ebeb04a68cbf250cfc02aca420e1398d09709dcc2ec2030b90ccaaeee314
>+SIZE (xpi/firefox-i18n-54.0b2/ms.xpi) = 440726
>+SHA256 (xpi/firefox-i18n-54.0b2/nb-NO.xpi) = d87de6098aa2e6a6589a4892009e321702cdf3ab78f1d098b8c8cc4002b8b250
>+SIZE (xpi/firefox-i18n-54.0b2/nb-NO.xpi) = 439031
>+SHA256 (xpi/firefox-i18n-54.0b2/nl.xpi) = d81a6ffa69b3735e9d2d7009a5272917566960842ef6bfd3d1ddfa79ef486954
>+SIZE (xpi/firefox-i18n-54.0b2/nl.xpi) = 436859
>+SHA256 (xpi/firefox-i18n-54.0b2/nn-NO.xpi) = 4e514e8d606b0af61e383830fb4cd01026c54670886c4292222280be15628afe
>+SIZE (xpi/firefox-i18n-54.0b2/nn-NO.xpi) = 433328
>+SHA256 (xpi/firefox-i18n-54.0b2/or.xpi) = 1dd68ac544f06277082413f6673ec34e4e2472991b6ee3c0ee2e6eb2136da45f
>+SIZE (xpi/firefox-i18n-54.0b2/or.xpi) = 501207
>+SHA256 (xpi/firefox-i18n-54.0b2/pa-IN.xpi) = 02fd50b2c13337bbda22d54d9284418ddbb015107194a0ceef1983686de8f76c
>+SIZE (xpi/firefox-i18n-54.0b2/pa-IN.xpi) = 480863
>+SHA256 (xpi/firefox-i18n-54.0b2/pl.xpi) = a883b9cee7408f109fc1c4f7067081b83d483c341c972d1ba458635e64e68402
>+SIZE (xpi/firefox-i18n-54.0b2/pl.xpi) = 354948
>+SHA256 (xpi/firefox-i18n-54.0b2/pt-BR.xpi) = 0fa8dc3ed0ebd891e877782b04b9b256b9074612095feed6002b21d6beb27f21
>+SIZE (xpi/firefox-i18n-54.0b2/pt-BR.xpi) = 442706
>+SHA256 (xpi/firefox-i18n-54.0b2/pt-PT.xpi) = e330926df408aa8641f75736a9badef3e7e4e6e2aba7b2ea94b614aafdb563ae
>+SIZE (xpi/firefox-i18n-54.0b2/pt-PT.xpi) = 441597
>+SHA256 (xpi/firefox-i18n-54.0b2/rm.xpi) = 02b3d8b7c7a955ebc031515048fa973901551e503b469404c9424188f7d7ffb1
>+SIZE (xpi/firefox-i18n-54.0b2/rm.xpi) = 439746
>+SHA256 (xpi/firefox-i18n-54.0b2/ro.xpi) = e4369e1952a7960a95b2c081c8103006b1d0cf6bf03caa42a457b5ef3300ab50
>+SIZE (xpi/firefox-i18n-54.0b2/ro.xpi) = 454821
>+SHA256 (xpi/firefox-i18n-54.0b2/ru.xpi) = a2d465ba99ba544cefd517c3c2725453501e04d993fe0c6554c04d5e1a2e52c6
>+SIZE (xpi/firefox-i18n-54.0b2/ru.xpi) = 506893
>+SHA256 (xpi/firefox-i18n-54.0b2/si.xpi) = 3f59729bae26437926a1db83d3cb711f5e5a7dc0b77bcb8ded6741cbaa400e35
>+SIZE (xpi/firefox-i18n-54.0b2/si.xpi) = 496182
>+SHA256 (xpi/firefox-i18n-54.0b2/sk.xpi) = 9b59cc6c64d376c99f599ba39094ac2c9d0cbd7460e8a22b27d6a0840337e3a4
>+SIZE (xpi/firefox-i18n-54.0b2/sk.xpi) = 460857
>+SHA256 (xpi/firefox-i18n-54.0b2/sl.xpi) = 04454bfb17d444bb5bee5075e67c63bbaa021293bfdb73ef6c34b41ddd16ddc6
>+SIZE (xpi/firefox-i18n-54.0b2/sl.xpi) = 438368
>+SHA256 (xpi/firefox-i18n-54.0b2/son.xpi) = e3eb6d18f50936eb502aa115f93b23769e7490b34fea9d7a95263a2700a52d99
>+SIZE (xpi/firefox-i18n-54.0b2/son.xpi) = 439833
>+SHA256 (xpi/firefox-i18n-54.0b2/sq.xpi) = 8e2472bdb82639b71fd57fa8f9beec91fb5d3542b086f24ff53155d12c66abe7
>+SIZE (xpi/firefox-i18n-54.0b2/sq.xpi) = 453422
>+SHA256 (xpi/firefox-i18n-54.0b2/sr.xpi) = c89f53af42e87fdb87cc5f3651fe4bd33c98ed2306102ed91961e2901793771e
>+SIZE (xpi/firefox-i18n-54.0b2/sr.xpi) = 467995
>+SHA256 (xpi/firefox-i18n-54.0b2/sv-SE.xpi) = 8ea1cbf75b2a2dd31fbaabda7af29a911a70d0565c82058f38d677e43bf07e73
>+SIZE (xpi/firefox-i18n-54.0b2/sv-SE.xpi) = 445794
>+SHA256 (xpi/firefox-i18n-54.0b2/ta.xpi) = 6f9c38e64e388bc9d20e29ca63d3ff9b67b3d6a896bc0d647a50ec90295f3413
>+SIZE (xpi/firefox-i18n-54.0b2/ta.xpi) = 500477
>+SHA256 (xpi/firefox-i18n-54.0b2/te.xpi) = b7b8b3b74d150c3d676a2f527f77c3c80c2f4ecdf255e280ed2db3a748e6abe3
>+SIZE (xpi/firefox-i18n-54.0b2/te.xpi) = 520473
>+SHA256 (xpi/firefox-i18n-54.0b2/th.xpi) = baf97ade535c20e08c5a804a2a08441b07e6237b35970e9471490a8c74fb32d0
>+SIZE (xpi/firefox-i18n-54.0b2/th.xpi) = 494085
>+SHA256 (xpi/firefox-i18n-54.0b2/tr.xpi) = e25bdd9f0e2fccffd28cfeb4df596a41f762c20933593dfe3ff5b044af703e81
>+SIZE (xpi/firefox-i18n-54.0b2/tr.xpi) = 445852
>+SHA256 (xpi/firefox-i18n-54.0b2/uk.xpi) = b0259c08112f7a846d9fef89f1fc44130e7ce1760efaf4a0ec6e657c08351fac
>+SIZE (xpi/firefox-i18n-54.0b2/uk.xpi) = 497430
>+SHA256 (xpi/firefox-i18n-54.0b2/uz.xpi) = 4b99ed2093fa73aa086bae96f4b04b34a8ea5f73aeb25ec21a1c316d97085224
>+SIZE (xpi/firefox-i18n-54.0b2/uz.xpi) = 453390
>+SHA256 (xpi/firefox-i18n-54.0b2/vi.xpi) = 0cdb6fd7573de2f4315d6c1d6011b6d74abb33f1e562a42b5807f4be3218a71e
>+SIZE (xpi/firefox-i18n-54.0b2/vi.xpi) = 455840
>+SHA256 (xpi/firefox-i18n-54.0b2/xh.xpi) = 8999ad2228f4a96829e65a0c17f77bd2f9c21cba50f40238c381054dc358660d
>+SIZE (xpi/firefox-i18n-54.0b2/xh.xpi) = 446170
>+SHA256 (xpi/firefox-i18n-54.0b2/zh-CN.xpi) = 3a0efa39397231033295ba594f4fff36ec3e829727a3c4e1fd7cafa6cf6a67da
>+SIZE (xpi/firefox-i18n-54.0b2/zh-CN.xpi) = 463955
>+SHA256 (xpi/firefox-i18n-54.0b2/zh-TW.xpi) = 9e1f57da99b79fbce6d70f6d04e7295663c5e84fa151e9026c3519ab8d3bbd61
>+SIZE (xpi/firefox-i18n-54.0b2/zh-TW.xpi) = 474980
>diff --git a/www/firefox/Makefile b/www/firefox/Makefile
>index 786090e1e08d..5a6fe37e3429 100644
>--- a/www/firefox/Makefile
>+++ b/www/firefox/Makefile
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	firefox
>-DISTVERSION=	53.0.2
>+DISTVERSION=	54.0b6
> DISTVERSIONSUFFIX=.source
> PORTEPOCH=	1
> CATEGORIES=	www ipv6
>@@ -12,11 +12,11 @@ MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \
> MAINTAINER=	gecko@FreeBSD.org
> COMMENT=	Web browser based on the browser portion of Mozilla
> 
>-BUILD_DEPENDS=	nspr>=4.13.1:devel/nspr \
>-		nss>=3.29.5:security/nss \
>-		libevent>=2.0.21_2:devel/libevent \
>-		harfbuzz>=1.4.1:print/harfbuzz \
>-		graphite2>=1.3.8:graphics/graphite2 \
>+BUILD_DEPENDS=	nspr>=4.14:devel/nspr \
>+		nss>=3.30.2:security/nss \
>+		libevent>=2.0.22:devel/libevent \
>+		harfbuzz>=1.4.3:print/harfbuzz \
>+		graphite2>=1.3.10:graphics/graphite2 \
> 		png>=1.6.28:graphics/png \
> 		libvorbis>=1.3.5,3:audio/libvorbis \
> 		libvpx>=1.5.0:multimedia/libvpx \
>diff --git a/www/firefox/distinfo b/www/firefox/distinfo
>index bd2ab8edfd03..87a9e57f7fa9 100644
>--- a/www/firefox/distinfo
>+++ b/www/firefox/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1493948953
>-SHA256 (firefox-53.0.2.source.tar.xz) = c536df9794fafe61e4e74562e2a37cd4a6fb1c13d99d5330d61be03b2d57ae54
>-SIZE (firefox-53.0.2.source.tar.xz) = 215124156
>+TIMESTAMP = 1494295533
>+SHA256 (firefox-54.0b6.source.tar.xz) = e2c4aab83889fb2f967ae910ee5859b5cb8abbb4cf3e3a1cde55745d5ac9e25f
>+SIZE (firefox-54.0b6.source.tar.xz) = 229651508
>diff --git a/www/firefox/files/patch-bug1338655 b/www/firefox/files/patch-bug1338655
>deleted file mode 100644
>index 580424128ca8..000000000000
>--- a/www/firefox/files/patch-bug1338655
>+++ /dev/null
>@@ -1,66 +0,0 @@
>-commit bbd48a5613c8
>-Author: Ralph Giles <giles@mozilla.com>
>-Date:   Fri Feb 10 12:58:18 2017 -0800
>-
>-    Bug 1338655 - Don't try to build mp4parse bindings. r=froydnj
>-    
>-    We use the cheddar crate to generate a C header file
>-    for our mp4parse_capi wrapper crate. Currently we
>-    do this at code check-in time via update-rust.sh.
>-    
>-    Cargo 0.18 and later will try to execute a build.rs
>-    file in the crate source tree regardless of whether
>-    it's specified in Cargo.toml so patching out that
>-    line just results in 'crate cheddar not found'.
>-    
>-    This change restores the old behaviour by substituting
>-    a 'build = false' line instead.
>-    
>-    We do have syntex vendored, but we don't currently build
>-    it by default, so I prefer this solution to just vendoring
>-    cheddar and generating the header at build time. The syntex
>-    crate is quite large and adds significantly to our compile
>-    time.
>-    
>-    MozReview-Commit-ID: InJRRODWAdP
>-    
>-    --HG--
>-    extra : rebase_source : 29378fcbc86015ce6cc22dc66d38a43ddbac204e
>----
>- media/libstagefright/binding/mp4parse-cargo.patch     | 5 +++--
>- media/libstagefright/binding/mp4parse_capi/Cargo.toml | 2 ++
>- 2 files changed, 5 insertions(+), 2 deletions(-)
>-
>-diff --git media/libstagefright/binding/mp4parse-cargo.patch media/libstagefright/binding/mp4parse-cargo.patch
>-index 1dd13d20472a..bfa0ab74b424 100644
>---- media/libstagefright/binding/mp4parse-cargo.patch
>-+++ media/libstagefright/binding/mp4parse-cargo.patch
>-@@ -27,12 +27,13 @@ diff --git a/media/libstagefright/binding/mp4parse_capi/Cargo.toml b/media/libst
>- index aeeebc65..5c0836a 100644
>- --- a/media/libstagefright/binding/mp4parse_capi/Cargo.toml
>- +++ b/media/libstagefright/binding/mp4parse_capi/Cargo.toml
>--@@ -18,18 +18,10 @@ exclude = [
>-+@@ -18,18 +18,12 @@ exclude = [
>-    "*.mp4",
>-  ]
>-  
>- -build = "build.rs"
>---
>-++build = false
>-+
>-  [dependencies]
>-  byteorder = "1.0.0"
>-  "mp4parse" = {version = "0.6.0", path = "../mp4parse"}
>-diff --git media/libstagefright/binding/mp4parse_capi/Cargo.toml media/libstagefright/binding/mp4parse_capi/Cargo.toml
>-index aee7ee947151..d7e3f55119d3 100644
>---- media/libstagefright/binding/mp4parse_capi/Cargo.toml
>-+++ media/libstagefright/binding/mp4parse_capi/Cargo.toml
>-@@ -18,6 +18,8 @@ exclude = [
>-   "*.mp4",
>- ]
>- 
>-+build = false
>-+
>- [dependencies]
>- byteorder = "1.0.0"
>- "mp4parse" = {version = "0.6.0", path = "../mp4parse"}
>diff --git a/www/firefox/files/patch-bug1359051 b/www/firefox/files/patch-bug1359051
>deleted file mode 100644
>index a9268b30ea14..000000000000
>--- a/www/firefox/files/patch-bug1359051
>+++ /dev/null
>@@ -1,31 +0,0 @@
>-commit fe7592e16fcc
>-Author: Sean Stangl <sstangl@mozilla.com>
>-Date:   Mon Apr 24 07:10:58 2017 -0700
>-
>-    Bug 1359051 - Define cacheFlush for non-Simulator ARM64 builds. r=tcampbell
>----
>- js/src/jit/ExecutableAllocator.h | 4 ++--
>- 1 file changed, 2 insertions(+), 2 deletions(-)
>-
>-diff --git js/src/jit/ExecutableAllocator.h js/src/jit/ExecutableAllocator.h
>-index 3a42918142ef..570a25ff0dc3 100644
>---- js/src/jit/ExecutableAllocator.h
>-+++ js/src/jit/ExecutableAllocator.h
>-@@ -259,7 +259,7 @@ class ExecutableAllocator
>-     {
>-         __clear_cache(code, reinterpret_cast<char*>(code) + size);
>-     }
>--#elif defined(JS_CODEGEN_ARM) && defined(XP_IOS)
>-+#elif (defined(JS_CODEGEN_ARM) || defined(JS_CODEGEN_ARM64)) && defined(XP_IOS)
>-     static void cacheFlush(void* code, size_t size)
>-     {
>-         sys_icache_invalidate(code, size);
>-@@ -297,7 +297,7 @@ class ExecutableAllocator
>-                 : "r0", "r1", "r2");
>-         }
>-     }
>--#elif defined(JS_CODEGEN_ARM64) && (defined(__linux__) || defined(ANDROID)) && defined(__GNUC__)
>-+#elif defined(JS_CODEGEN_ARM64)
>-     static void cacheFlush(void* code, size_t size)
>-     {
>-         vixl::CPU::EnsureIAndDCacheCoherency(code, size);
>diff --git a/www/firefox/files/patch-bug1359142 b/www/firefox/files/patch-bug1359142
>deleted file mode 100644
>index b7998c5d705a..000000000000
>--- a/www/firefox/files/patch-bug1359142
>+++ /dev/null
>@@ -1,57 +0,0 @@
>-Define EPC_sig and RFP_sig for JS_CODEGEN_(ARM64|MIPS) on BSDs
>-
>-diff --git js/src/wasm/WasmSignalHandlers.cpp js/src/wasm/WasmSignalHandlers.cpp
>-index 1ab76eeb4bd9..bcdff0487837 100644
>---- js/src/wasm/WasmSignalHandlers.cpp
>-+++ js/src/wasm/WasmSignalHandlers.cpp
>-@@ -108,7 +108,19 @@ class AutoSetHandlingSegFault
>- # define R12_sig(p) ((p)->sc_r12)
>- # define R13_sig(p) ((p)->sc_r13)
>- # define R14_sig(p) ((p)->sc_r14)
>--# define R15_sig(p) ((p)->sc_r15)
>-+# if defined(__arm__)
>-+#  define R15_sig(p) ((p)->sc_pc)
>-+# else
>-+#  define R15_sig(p) ((p)->sc_r15)
>-+# endif
>-+# if defined(__aarch64__)
>-+#  define EPC_sig(p) ((p)->sc_elr)
>-+#  define RFP_sig(p) ((p)->sc_x[29])
>-+# endif
>-+# if defined(__mips__)
>-+#  define EPC_sig(p) ((p)->sc_pc)
>-+#  define RFP_sig(p) ((p)->sc_regs[30])
>-+# endif
>- #elif defined(__linux__) || defined(SOLARIS)
>- # if defined(__linux__)
>- #  define XMM_sig(p,i) ((p)->uc_mcontext.fpregs->_xmm[i])
>-@@ -171,6 +183,14 @@ class AutoSetHandlingSegFault
>- # define R13_sig(p) ((p)->uc_mcontext.__gregs[_REG_R13])
>- # define R14_sig(p) ((p)->uc_mcontext.__gregs[_REG_R14])
>- # define R15_sig(p) ((p)->uc_mcontext.__gregs[_REG_R15])
>-+# if defined(__aarch64__)
>-+#  define EPC_sig(p) ((p)->uc_mcontext.__gregs[_REG_PC])
>-+#  define RFP_sig(p) ((p)->uc_mcontext.__gregs[_REG_X29])
>-+# endif
>-+# if defined(__mips__)
>-+#  define EPC_sig(p) ((p)->uc_mcontext.__gregs[_REG_EPC])
>-+#  define RFP_sig(p) ((p)->uc_mcontext.__gregs[_REG_S8])
>-+# endif
>- #elif defined(__DragonFly__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
>- # if defined(__DragonFly__)
>- #  define XMM_sig(p,i) (((union savefpu*)(p)->uc_mcontext.mc_fpregs)->sv_xmm.sv_xmm[i])
>-@@ -200,6 +220,14 @@ class AutoSetHandlingSegFault
>- # else
>- #  define R15_sig(p) ((p)->uc_mcontext.mc_r15)
>- # endif
>-+# if defined(__FreeBSD__) && defined(__aarch64__)
>-+#  define EPC_sig(p) ((p)->uc_mcontext.mc_gpregs.gp_elr)
>-+#  define RFP_sig(p) ((p)->uc_mcontext.mc_gpregs.gp_x[29])
>-+# endif
>-+# if defined(__FreeBSD__) && defined(__mips__)
>-+#  define EPC_sig(p) ((p)->uc_mcontext.mc_pc)
>-+#  define RFP_sig(p) ((p)->uc_mcontext.mc_regs[30])
>-+# endif
>- #elif defined(XP_DARWIN)
>- # define EIP_sig(p) ((p)->uc_mcontext->__ss.__eip)
>- # define EBP_sig(p) ((p)->uc_mcontext->__ss.__ebp)
>diff --git a/www/firefox/files/patch-bug847568 b/www/firefox/files/patch-bug847568
>index 9588ce5df654..9ef2dbadd362 100644
>--- a/www/firefox/files/patch-bug847568
>+++ b/www/firefox/files/patch-bug847568
>@@ -145,10 +145,10 @@ index 2118677ca3a8..e4978b413784 100644
>      CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS']
>      CXXFLAGS += CONFIG['CAIRO_FT_CFLAGS']
> diff --git gfx/thebes/moz.build gfx/thebes/moz.build
>-index dee9b7bfa2cb..bd801f3a468e 100644
>+index 56f1b9fe3f4b..0ac1100b0df3 100644
> --- gfx/thebes/moz.build
> +++ gfx/thebes/moz.build
>-@@ -273,7 +273,13 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3'):
>+@@ -269,7 +269,13 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3'):
>  
>  LOCAL_INCLUDES += CONFIG['SKIA_INCLUDES']
>  
>@@ -167,14 +167,14 @@ diff --git intl/unicharutil/util/moz.build intl/unicharutil/util/moz.build
> index cb1233c56d7e..06fb1f9f174b 100644
> --- intl/unicharutil/util/moz.build
> +++ intl/unicharutil/util/moz.build
>-@@ -40,4 +40,7 @@ if CONFIG['_MSC_VER']:
>- if CONFIG['ENABLE_INTL_API']:
>-     USE_LIBS += ['icu']
>+@@ -29,4 +29,7 @@ if CONFIG['ENABLE_INTL_API']:
>+         'ICUUtils.cpp',
>+     ]
>  
> +if CONFIG['MOZ_SYSTEM_HARFBUZZ']:
> +    CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS']
> +
>- DIST_INSTALL = True
>+ FINAL_LIBRARY = 'xul'
> diff --git netwerk/dns/moz.build netwerk/dns/moz.build
> index 79c26e3e7001..c4d93bc5f7dc 100644
> --- netwerk/dns/moz.build
>@@ -209,7 +209,7 @@ index 95a58b634593..b614eef85c89 100644
> +                               * 100 + GR2_VERSION_BUGFIX >= \
> +                               (major) * 10000 + (minor) * 100 + (bugfix) )
> +                   ], [
>-+                     #if !GR2_VERSION_REQUIRE(1,3,8)
>++                     #if !GR2_VERSION_REQUIRE(1,3,10)
> +                     #error "Insufficient graphite2 version."
> +                     #endif
> +                   ], [],
>@@ -225,7 +225,7 @@ diff --git toolkit/library/moz.build toolkit/library/moz.build
> index 24f940e1ed7e..079a575adec3 100644
> --- toolkit/library/moz.build
> +++ toolkit/library/moz.build
>-@@ -228,6 +228,12 @@ if CONFIG['MOZ_SYSTEM_JPEG']:
>+@@ -224,6 +224,12 @@ if CONFIG['MOZ_SYSTEM_JPEG']:
>  if CONFIG['MOZ_SYSTEM_PNG']:
>      OS_LIBS += CONFIG['MOZ_PNG_LIBS']
>  
>@@ -242,7 +242,7 @@ diff --git toolkit/moz.configure toolkit/moz.configure
> index 9297e4d6f501..d8e273887e4b 100644
> --- toolkit/moz.configure
> +++ toolkit/moz.configure
>-@@ -343,6 +343,26 @@ add_old_configure_assignment('FT2_LIBS',
>+@@ -356,6 +356,26 @@ add_old_configure_assignment('FT2_LIBS',
>  add_old_configure_assignment('FT2_CFLAGS',
>                               delayed_getattr(ft2_info, 'cflags'))
>  
>@@ -261,7 +261,7 @@ index 9297e4d6f501..d8e273887e4b 100644
> +option('--with-system-harfbuzz',
> +       help="Use system harfbuzz (located with pkgconfig)")
> +
>-+system_harfbuzz = pkg_check_modules('MOZ_HARFBUZZ', 'harfbuzz >= 1.4.1',
>++system_harfbuzz = pkg_check_modules('MOZ_HARFBUZZ', 'harfbuzz >= 1.4.3',
> +                                    when='--with-system-harfbuzz')
> +
> +set_config('MOZ_SYSTEM_HARFBUZZ', depends_if(system_harfbuzz)(lambda _: True))
>diff --git a/www/firefox/files/patch-rust-option b/www/firefox/files/patch-rust-option
>new file mode 100644
>index 000000000000..b7515ee6b473
>--- /dev/null
>+++ b/www/firefox/files/patch-rust-option
>@@ -0,0 +1,345 @@
>+Revert bug 1284816 and bug 1341967 to postpone bustage on non-x86 archs.
>+
>+diff --git browser/confvars.sh browser/confvars.sh
>+index d8dcd99c2757..740d9d3e5fcf 100755
>+--- browser/confvars.sh
>++++ browser/confvars.sh
>+@@ -56,6 +56,7 @@ ACCEPTED_MAR_CHANNEL_IDS=firefox-mozilla-beta,firefox-mozilla-release
>+ MAR_CHANNEL_ID=firefox-mozilla-beta
>+ MOZ_PROFILE_MIGRATOR=1
>+ MOZ_JSDOWNLOADS=1
>++MOZ_RUST_MP4PARSE=1
>+ 
>+ # Enable checking that add-ons are signed by the trusted root
>+ MOZ_ADDON_SIGNING=1
>+diff --git build/moz.configure/rust.configure build/moz.configure/rust.configure
>+index 267d989f1597..f709820e60ae 100644
>+--- build/moz.configure/rust.configure
>++++ build/moz.configure/rust.configure
>+@@ -4,10 +4,20 @@
>+ # License, v. 2.0. If a copy of the MPL was not distributed with this
>+ # file, You can obtain one at http://mozilla.org/MPL/2.0/.
>+ 
>+-# Rust is required by `rust_compiler` below. We allow_missing here
>+-# to propagate failures to the better error message there.
>+-rustc = check_prog('RUSTC', ['rustc'], allow_missing=True)
>+-cargo = check_prog('CARGO', ['cargo'], allow_missing=True)
>++option('--disable-rust', help='Don\'t include Rust language sources')
>++
>++@depends('--enable-rust')
>++def rust_compiler_names(value):
>++    if value:
>++        return ['rustc']
>++
>++@depends('--enable-rust')
>++def cargo_binary_names(value):
>++    if value:
>++        return ['cargo']
>++
>++rustc = check_prog('RUSTC', rust_compiler_names, allow_missing=True)
>++cargo = check_prog('CARGO', cargo_binary_names, allow_missing=True)
>+ 
>+ @depends_if(rustc)
>+ @checking('rustc version', lambda info: info.version)
>+@@ -43,9 +53,12 @@ def cargo_info(cargo):
>+         version=Version(version),
>+     )
>+ 
>+-@depends(rustc_info, cargo_info)
>++@depends('--enable-rust', rustc_info, cargo_info)
>+ @imports(_from='textwrap', _import='dedent')
>+-def rust_compiler(rustc_info, cargo_info):
>++def rust_compiler(value, rustc_info, cargo_info):
>++    if not value:
>++        return None
>++
>+     if not rustc_info:
>+         die(dedent('''\
>+         Rust compiler not found.
>+diff --git dom/media/MediaPrefs.h dom/media/MediaPrefs.h
>+index 4dcc659222a4..559334d89fd1 100644
>+--- dom/media/MediaPrefs.h
>++++ dom/media/MediaPrefs.h
>+@@ -165,7 +165,7 @@ private:
>+   DECL_MEDIA_PREF("media.ogg.flac.enabled",                   FlacInOgg, bool, false);
>+   DECL_MEDIA_PREF("media.flac.enabled",                       FlacEnabled, bool, true);
>+ 
>+-#if !defined(RELEASE_OR_BETA)
>++#if defined(MOZ_RUST_MP4PARSE) && !defined(RELEASE_OR_BETA)
>+   DECL_MEDIA_PREF("media.rust.test_mode",                     RustTestMode, bool, false);
>+ #endif
>+ 
>+diff --git media/libstagefright/binding/DecoderData.cpp media/libstagefright/binding/DecoderData.cpp
>+index 109ea329d154..a06e533b1e62 100644
>+--- media/libstagefright/binding/DecoderData.cpp
>++++ media/libstagefright/binding/DecoderData.cpp
>+@@ -13,9 +13,11 @@
>+ #include "mozilla/ArrayUtils.h"
>+ #include "include/ESDS.h"
>+ 
>++#ifdef MOZ_RUST_MP4PARSE
>+ // OpusDecoder header is really needed only by MP4 in rust
>+ #include "OpusDecoder.h"
>+ #include "mp4parse.h"
>++#endif // MOZ_RUST_MP4PARSE
>+ 
>+ using namespace stagefright;
>+ 
>+@@ -187,6 +189,7 @@ MP4VideoInfo::Update(const MetaData* aMetaData, const char* aMimeType)
>+ 
>+ }
>+ 
>++#ifdef MOZ_RUST_MP4PARSE
>+ static void
>+ UpdateTrackProtectedInfo(mozilla::TrackInfo& aConfig,
>+                          const mp4parse_sinf_info& aSinf)
>+@@ -266,6 +269,7 @@ MP4VideoInfo::Update(const mp4parse_track_info* track,
>+     mExtraData->AppendElements(video->extra_data.data, video->extra_data.length);
>+   }
>+ }
>++#endif // MOZ_RUST_MP4PARSE
>+ 
>+ bool
>+ MP4VideoInfo::IsValid() const
>+diff --git media/libstagefright/binding/MP4Metadata.cpp media/libstagefright/binding/MP4Metadata.cpp
>+index 5c3810d99a38..5d14dfd8b8a9 100644
>+--- media/libstagefright/binding/MP4Metadata.cpp
>++++ media/libstagefright/binding/MP4Metadata.cpp
>+@@ -19,14 +19,18 @@
>+ #include "mp4_demuxer/MP4Metadata.h"
>+ #include "mp4_demuxer/Stream.h"
>+ #include "MediaPrefs.h"
>++#ifdef MOZ_RUST_MP4PARSE
>+ #include "mp4parse.h"
>++#endif // MOZ_RUST_MP4PARSE
>+ 
>+ #include <limits>
>+ #include <stdint.h>
>+ #include <vector>
>+ 
>+ 
>++#ifdef MOZ_RUST_MP4PARSE
>+ struct FreeMP4Parser { void operator()(mp4parse_parser* aPtr) { mp4parse_free(aPtr); } };
>++#endif // MOZ_RUST_MP4PARSE
>+ 
>+ using namespace stagefright;
>+ 
>+@@ -101,6 +103,7 @@ private:
>+   bool mCanSeek;
>+ };
>+ 
>++#ifdef MOZ_RUST_MP4PARSE
>+ // Wrap an mp4_demuxer::Stream to remember the read offset.
>+ 
>+ class RustStreamAdaptor {
>+@@ -145,9 +149,11 @@ private:
>+   RustStreamAdaptor mRustSource;
>+   mozilla::UniquePtr<mp4parse_parser, FreeMP4Parser> mRustParser;
>+ };
>++#endif // MOZ_RUST_MP4PARSE
>+ 
>+ MP4Metadata::MP4Metadata(Stream* aSource)
>+  : mStagefright(MakeUnique<MP4MetadataStagefright>(aSource))
>++#ifdef MOZ_RUST_MP4PARSE
>+  , mRust(MakeUnique<MP4MetadataRust>(aSource))
>+  , mPreferRust(false)
>+  , mReportedAudioTrackTelemetry(false)
>+@@ -155,6 +161,7 @@ MP4Metadata::MP4Metadata(Stream* aSource)
>+ #ifndef RELEASE_OR_BETA
>+  , mRustTestMode(MediaPrefs::RustTestMode())
>+ #endif
>++#endif // MOZ_RUST_MP4PARSE
>+ {
>+ }
>+ 
>+@@ -186,6 +193,7 @@ MP4Metadata::GetNumberTracks(mozilla::TrackInfo::TrackType aType) const
>+ {
>+   uint32_t numTracks = mStagefright->GetNumberTracks(aType);
>+ 
>++#ifdef MOZ_RUST_MP4PARSE
>+   if (!mRust) {
>+     return numTracks;
>+   }
>+@@ -211,10 +219,12 @@ MP4Metadata::GetNumberTracks(mozilla::TrackInfo::TrackType aType) const
>+     mPreferRust = true;
>+     return numTracksRust;
>+   }
>++#endif // MOZ_RUST_MP4PARSE
>+ 
>+   return numTracks;
>+ }
>+ 
>++#ifdef MOZ_RUST_MP4PARSE
>+ bool MP4Metadata::ShouldPreferRust() const {
>+   if (!mRust) {
>+     return false;
>+@@ -245,6 +255,7 @@ bool MP4Metadata::ShouldPreferRust() const {
>+   // Otherwise, fall back.
>+   return false;
>+ }
>++#endif // MOZ_RUST_MP4PARSE
>+ 
>+ mozilla::UniquePtr<mozilla::TrackInfo>
>+ MP4Metadata::GetTrackInfo(mozilla::TrackInfo::TrackType aType,
>+@@ -253,6 +264,7 @@ MP4Metadata::GetTrackInfo(mozilla::TrackInfo::TrackType aType,
>+   mozilla::UniquePtr<mozilla::TrackInfo> info =
>+       mStagefright->GetTrackInfo(aType, aTrackNumber);
>+ 
>++#ifdef MOZ_RUST_MP4PARSE
>+   if (!mRust) {
>+     return info;
>+   }
>+@@ -305,6 +317,7 @@ MP4Metadata::GetTrackInfo(mozilla::TrackInfo::TrackTyp
>+   if (mPreferRust) {
>+     return infoRust;
>+   }
>++#endif // MOZ_RUST_MP4PARSE
>+ 
>+   return info;
>+ }
>+@@ -319,6 +334,7 @@ const CryptoFile&
>+ MP4Metadata::Crypto() const
>+ {
>+   const CryptoFile& crypto = mStagefright->Crypto();
>++#ifdef MOZ_RUST_MP4PARSE
>+   const CryptoFile& rustCrypto = mRust->Crypto();
>+ 
>+ #ifndef RELEASE_OR_BETA
>+@@ -330,6 +347,7 @@ MP4Metadata::Crypto() const
>+   if (mPreferRust) {
>+     return rustCrypto;
>+   }
>++#endif // MOZ_RUST_MP4PARSE
>+ 
>+   return crypto;
>+ }
>+@@ -594,6 +612,7 @@ MP4MetadataStagefright::Metadata(Stream* aSource)
>+   return parser->Metadata();
>+ }
>+ 
>++#ifdef MOZ_RUST_MP4PARSE
>+ bool
>+ RustStreamAdaptor::Read(uint8_t* buffer, uintptr_t size, size_t* bytes_read)
>+ {
>+@@ -859,5 +878,6 @@ MP4MetadataRust::Metadata(Stream* aSource)
>+   MOZ_ASSERT(false, "Not yet implemented");
>+   return nullptr;
>+ }
>++#endif // MOZ_RUST_MP4PARSE
>+ 
>+ } // namespace mp4_demuxer
>+diff --git media/libstagefright/binding/include/mp4_demuxer/DecoderData.h media/libstagefright/binding/include/mp4_demuxer/DecoderData.h
>+index 3cd4b7c142f4..dc25ddf03b10 100644
>+--- media/libstagefright/binding/include/mp4_demuxer/DecoderData.h
>++++ media/libstagefright/binding/include/mp4_demuxer/DecoderData.h
>+@@ -19,11 +19,13 @@ namespace stagefright
>+ class MetaData;
>+ }
>+ 
>++#ifdef MOZ_RUST_MP4PARSE
>+ extern "C" {
>+ typedef struct mp4parse_track_info mp4parse_track_info;
>+ typedef struct mp4parse_track_audio_info mp4parse_track_audio_info;
>+ typedef struct mp4parse_track_video_info mp4parse_track_video_info;
>+ }
>++#endif // MOZ_RUST_MP4PARSE
>+ 
>+ namespace mp4_demuxer
>+ {
>+@@ -71,8 +73,10 @@ public:
>+   void Update(const stagefright::MetaData* aMetaData,
>+               const char* aMimeType);
>+ 
>++#ifdef MOZ_RUST_MP4PARSE
>+   void Update(const mp4parse_track_info* track,
>+               const mp4parse_track_audio_info* audio);
>++#endif // MOZ_RUST_MP4PARSE
>+ 
>+   virtual bool IsValid() const override;
>+ };
>+@@ -85,8 +89,10 @@ public:
>+   void Update(const stagefright::MetaData* aMetaData,
>+               const char* aMimeType);
>+ 
>++#ifdef MOZ_RUST_MP4PARSE
>+   void Update(const mp4parse_track_info* track,
>+               const mp4parse_track_video_info* video);
>++#endif // MOZ_RUST_MP4PARSE
>+ 
>+   virtual bool IsValid() const override;
>+ };
>+diff --git media/libstagefright/binding/include/mp4_demuxer/MP4Metadata.h media/libstagefright/binding/include/mp4_demuxer/MP4Metadata.h
>+index 492c9c1c1bc3..e16dbbd1155e 100644
>+--- media/libstagefright/binding/include/mp4_demuxer/MP4Metadata.h
>++++ media/libstagefright/binding/include/mp4_demuxer/MP4Metadata.h
>+@@ -36,6 +36,7 @@ public:
>+ 
>+ private:
>+   UniquePtr<MP4MetadataStagefright> mStagefright;
>++#ifdef MOZ_RUST_MP4PARSE
>+   UniquePtr<MP4MetadataRust> mRust;
>+   mutable bool mPreferRust;
>+   mutable bool mReportedAudioTrackTelemetry;
>+@@ -44,6 +45,7 @@ private:
>+   mutable bool mRustTestMode;
>+ #endif
>+   bool ShouldPreferRust() const;
>++#endif // MOZ_RUST_MP4PARSE
>+ };
>+ 
>+ } // namespace mp4_demuxer
>+diff --git mobile/android/confvars.sh mobile/android/confvars.sh
>+index e79b6f5c0707..eb62763acaf7 100644
>+--- mobile/android/confvars.sh
>++++ mobile/android/confvars.sh
>+@@ -30,6 +30,8 @@ MOZ_XULRUNNER=
>+ MOZ_CAPTURE=1
>+ MOZ_RAW=1
>+ 
>++MOZ_RUST_MP4PARSE=1
>++
>+ # use custom widget for html:select
>+ MOZ_USE_NATIVE_POPUP_WINDOWS=1
>+ 
>+diff --git toolkit/components/telemetry/Histograms.json toolkit/components/telemetry/Histograms.json
>+index 061c55f6a5b6..e49dfd176952 100644
>+--- toolkit/components/telemetry/Histograms.json
>++++ toolkit/components/telemetry/Histograms.json
>+@@ -6996,7 +6996,8 @@
>+     "expires_in_version": "55",
>+     "kind": "boolean",
>+     "bug_numbers": [1220885],
>+-    "description": "(Bug 1220885) Whether the rust mp4 demuxer successfully parsed a stream segment."
>++    "description": "(Bug 1220885) Whether the rust mp4 demuxer successfully parsed a stream segment.",
>++    "cpp_guard": "MOZ_RUST_MP4PARSE"
>+   },
>+   "MEDIA_RUST_MP4PARSE_ERROR_CODE": {
>+     "alert_emails": ["giles@mozilla.com", "kinetik@flim.org"],
>+@@ -7004,21 +7005,24 @@
>+     "kind": "enumerated",
>+     "n_values": 32,
>+     "bug_numbers": [1238420],
>+-    "description": "The error code reported when an MP4 parse attempt has failed.0 = OK, 1 = bad argument, 2 = invalid data, 3 = unsupported, 4 = unexpected end of file, 5 = read error."
>++    "description": "The error code reported when an MP4 parse attempt has failed.0 = OK, 1 = bad argument, 2 = invalid data, 3 = unsupported, 4 = unexpected end of file, 5 = read error.",
>++    "cpp_guard": "MOZ_RUST_MP4PARSE"
>+   },
>+   "MEDIA_RUST_MP4PARSE_TRACK_MATCH_AUDIO": {
>+     "alert_emails": ["giles@mozilla.com", "kinetik@flim.org"],
>+     "expires_in_version": "55",
>+     "kind": "boolean",
>+     "bug_numbers": [1231169],
>+-    "description": "Whether rust and stagefight mp4 parser audio track results match."
>++    "description": "Whether rust and stagefight mp4 parser audio track results match.",
>++    "cpp_guard": "MOZ_RUST_MP4PARSE"
>+   },
>+   "MEDIA_RUST_MP4PARSE_TRACK_MATCH_VIDEO": {
>+     "alert_emails": ["giles@mozilla.com", "kinetik@flim.org"],
>+     "expires_in_version": "55",
>+     "kind": "boolean",
>+     "bug_numbers": [1231169],
>+-    "description": "Whether rust and stagefight mp4 parser video track results match."
>++    "description": "Whether rust and stagefight mp4 parser video track results match.",
>++    "cpp_guard": "MOZ_RUST_MP4PARSE"
>+   },
>+   "MEDIA_WMF_DECODE_ERROR": {
>+     "expires_in_version": "55",

Actions: View | Diff

Attachments on bug 218912: 182124 | 182443 | 182633 | 182767 | 183262 | 183442