Attachment 189115 Details for Bug 223425 – beta13

[patch] beta13

ff58.diff (text/plain), 67.96 KB, created by Jan Beich on 2017-12-26 17:22:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Beich

Created: 2017-12-26 17:22:06 UTC

Size: 67.96 KB

patch

obsolete

>From 87ef43207e304ef87635ed699f8d8c4a2f9c5c82 Mon Sep 17 00:00:00 2001
>From: jbeich <jbeich@35697150-7ecd-e111-bb59-0022644237b5>
>Date: Wed, 27 Sep 2017 04:12:34 +0000
>Subject: [PATCH] www/firefox: update to 58.0
>
>Changes:	https://www.mozilla.org/firefox/58.0/releasenotes/
>PR:		223425
>Tested by:	Greg V, tobik
>Security:	a891c5b4-3d7a-4de9-9c71-eef3fd698c77
>MFH:		2018Q1
>---
> Mk/Uses/gecko.mk                                   |   4 +-
> Mk/bsd.gecko.mk                                    |   6 +-
> www/firefox-i18n/Makefile                          |   6 +-
> www/firefox-i18n/Makefile.lang                     |   5 +-
> www/firefox-i18n/Makefile.option                   |   2 +
> www/firefox-i18n/distinfo                          | 384 +++++++++++----------
> www/firefox/Makefile                               |  11 +-
> www/firefox/distinfo                               |   6 +-
> www/firefox/files/patch-bug1186967                 |  41 ---
> www/firefox/files/patch-bug1366201                 |  40 ---
> www/firefox/files/patch-bug1412558                 |  83 -----
> www/firefox/files/patch-bug1414440                 | 108 ------
> www/firefox/files/patch-bug826985                  |  40 +--
> www/firefox/files/patch-bug847568                  | 102 +++---
> .../files/patch-dom_media_flac_FlacDecoder.cpp     |  25 ++
> www/firefox/files/patch-toolkit_moz.configure      |  15 +
> www/firefox/files/patch-z-bug517422                | 119 +++----
> 17 files changed, 378 insertions(+), 619 deletions(-)
> delete mode 100644 www/firefox/files/patch-bug1186967
> delete mode 100644 www/firefox/files/patch-bug1366201
> delete mode 100644 www/firefox/files/patch-bug1412558
> delete mode 100644 www/firefox/files/patch-bug1414440
> create mode 100644 www/firefox/files/patch-dom_media_flac_FlacDecoder.cpp
> create mode 100644 www/firefox/files/patch-toolkit_moz.configure
>
>diff --git a/Mk/Uses/gecko.mk b/Mk/Uses/gecko.mk
>index 432c60edd28e..3afb4c50583b 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 57
>+_GECKO_VERSIONS=		52 58
> _GECKO_TYPE=	firefox
> 
> # Dependence lines for different Firefox versions
> 52_DEPENDS=		${LOCALBASE}/lib/firefox/firefox:www/firefox-esr
>-57_DEPENDS=		${LOCALBASE}/lib/firefox/firefox:www/firefox
>+58_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 bfafacd4399d..482f0032d4a4 100644
>--- a/Mk/bsd.gecko.mk
>+++ b/Mk/bsd.gecko.mk
>@@ -109,14 +109,15 @@ USE_XORG+=	xcb
> MESA_LLVM_VER?=	50
> BUILD_DEPENDS+=	llvm${MESA_LLVM_VER}>0:devel/llvm${MESA_LLVM_VER}
> MOZ_EXPORT+=	LLVM_CONFIG=llvm-config${MESA_LLVM_VER}
>+.if ${MOZILLA_VER:R:R} < 58
> MOZ_EXPORT+=	BINDGEN_CFLAGS="${BINDGEN_CFLAGS}"
>-# XXX bug 1341234
> . if ! ${USE_MOZILLA:M-nspr}
> BINDGEN_CFLAGS+=-isystem${LOCALBASE}/include/nspr
> . endif
> . if ! ${USE_MOZILLA:M-pixman}
> BINDGEN_CFLAGS+=-isystem${LOCALBASE}/include/pixman-1
> . endif
>+.endif # MOZILLA_VER < 58
> .endif
> 
> .if ${OPSYS} == FreeBSD && ${OSREL} == 11.1
>@@ -144,6 +145,7 @@ PKGDEINSTALL_INC?=	${.CURDIR}/../../www/firefox/files/pkg-deinstall.in
> MOZ_PKGCONFIG_FILES?=	${MOZILLA}-gtkmozembed ${MOZILLA}-js \
> 			${MOZILLA}-xpcom ${MOZILLA}-plugin
> 
>+MAKE_ENV+=		MACH=1 # XXX bug 1412398
> ALL_TARGET?=	build
> 
> MOZ_EXPORT+=	${CONFIGURE_ENV} \
>@@ -389,7 +391,7 @@ post-patch-SNDIO-on:
> .endif
> 
> .if ${PORT_OPTIONS:MRUST} || ${MOZILLA_VER:R:R} >= 54
>-BUILD_DEPENDS+=	${RUST_PORT:T}>=1.19.0_2:${RUST_PORT}
>+BUILD_DEPENDS+=	${RUST_PORT:T}>=1.21.0:${RUST_PORT}
> RUST_PORT?=		lang/rust
> . if ${MOZILLA_VER:R:R} < 54
> MOZ_OPTIONS+=	--enable-rust
>diff --git a/www/firefox-i18n/Makefile b/www/firefox-i18n/Makefile
>index 4b87c8b1a33a..40f5c2dc5584 100644
>--- a/www/firefox-i18n/Makefile
>+++ b/www/firefox-i18n/Makefile
>@@ -2,10 +2,10 @@
> # $FreeBSD$
> 
> PORTNAME=	firefox-i18n
>-PORTVERSION=	57.0.2
>+PORTVERSION=	58.0b13
> CATEGORIES=	www
> MASTER_SITES=	MOZILLA/${PORTNAME:S|-i18n||}/releases/${DISTVERSION}/linux-i686/xpi \
>-		MOZILLA/${PORTNAME:S|-i18n||}/candidates/${DISTVERSION}-candidates/build2/linux-i686/xpi
>+		MOZILLA/${PORTNAME:S|-i18n||}/candidates/${DISTVERSION}-candidates/build1/linux-i686/xpi
> PKGNAMEPREFIX=
> DISTFILES=	${FIREFOX_I18N_:S/$/.xpi/}
> DIST_SUBDIR=	xpi/${DISTNAME}
>@@ -15,7 +15,7 @@ COMMENT=	Localized interface for Firefox
> 
> EXTRACT_DEPENDS=	zip:archivers/zip
> 
>-USES=		zip:infozip gecko:firefox,57,build
>+USES=		zip:infozip gecko:firefox,58,build
> USE_XPI=	firefox
> 
> NO_ARCH=	yes
>diff --git a/www/firefox-i18n/Makefile.lang b/www/firefox-i18n/Makefile.lang
>index 20d45f4ce03e..1a30788af35a 100644
>--- a/www/firefox-i18n/Makefile.lang
>+++ b/www/firefox-i18n/Makefile.lang
>@@ -5,7 +5,7 @@ FIREFOX_I18N_ALL_=	ach af an ar as ast az be bg bn-BD bn-IN br bs ca cak	\
> 			cs cy da de dsb el en-GB en-US en-ZA eo es-AR es-CL	\
> 			es-ES es-MX et eu fa ff fi fr fy-NL ga-IE gd gl gn	\
> 			gu-IN he hi-IN hr hsb hu hy-AM id is it ja ka kab	\
>-			kk km kn ko lij lt lv mai mk ml mr ms my nb-NO nl	\
>+			kk km kn ko lij lt lv mai mk ml mr ms my nb-NO ne-NP nl	\
> 			nn-NO or pa-IN pl pt-BR pt-PT rm ro ru si sk sl son	\
> 			sq sr sv-SE ta te th tr uk ur uz vi xh zh-CN zh-TW
> 
>@@ -213,6 +213,9 @@ FIREFOX_I18N+=  my
> .if ${PORT_OPTIONS:MLANG_NB}
> FIREFOX_I18N+=  nb-NO
> .endif
>+.if ${PORT_OPTIONS:MLANG_NE}
>+FIREFOX_I18N+=  ne-NP
>+.endif
> .if ${PORT_OPTIONS:MLANG_NL}
> FIREFOX_I18N+=  nl
> .endif
>diff --git a/www/firefox-i18n/Makefile.option b/www/firefox-i18n/Makefile.option
>index bc2035278e9d..6bb0f6a7dd3b 100644
>--- a/www/firefox-i18n/Makefile.option
>+++ b/www/firefox-i18n/Makefile.option
>@@ -69,6 +69,7 @@ OPTIONS_DEFINE=	LANG_ACH \
> 		LANG_MS \
> 		LANG_MY \
> 		LANG_NB \
>+		LANG_NE \
> 		LANG_NL \
> 		LANG_NN \
> 		LANG_OR \
>@@ -118,6 +119,7 @@ LANG_KM_DESC?=	Khmer language support
> LANG_LIJ_DESC?=	Ligurian (Genoa) language support
> LANG_MS_DESC?=	Malay language support
> LANG_MY_DESC?=	Burmese language support
>+LANG_NE_DESC?=	Nepali language support
> LANG_SW_DESC?=	Swahili language support
> LANG_UR_DESC?=	Urdu (Pakistan) language support
> LANG_UZ_DESC?=	Uzbek language support
>diff --git a/www/firefox-i18n/distinfo b/www/firefox-i18n/distinfo
>index 89a84386b27b..b698a260f963 100644
>--- a/www/firefox-i18n/distinfo
>+++ b/www/firefox-i18n/distinfo
>@@ -1,191 +1,193 @@
>-TIMESTAMP = 1511907528
>-SHA256 (xpi/firefox-i18n-57.0.2/ach.xpi) = e4997e2ec4ac9b164d0f1a0e69c539fcd62f4f3ad8781b62bc91161d87244ca6
>-SIZE (xpi/firefox-i18n-57.0.2/ach.xpi) = 441113
>-SHA256 (xpi/firefox-i18n-57.0.2/af.xpi) = 049dbcbddd71bc640a192f0412660b49b9635fb3c95c69bc6bc39921efc858b6
>-SIZE (xpi/firefox-i18n-57.0.2/af.xpi) = 442206
>-SHA256 (xpi/firefox-i18n-57.0.2/an.xpi) = cd8551e2217b018ac4b77cf7ac556b0e3d337ada79faa05e8b433d82bfce2563
>-SIZE (xpi/firefox-i18n-57.0.2/an.xpi) = 462778
>-SHA256 (xpi/firefox-i18n-57.0.2/ar.xpi) = 4ab6c8a349b84c80a60093dd24e12e32cd3674cefc95a7d7f4399b87c7e68f43
>-SIZE (xpi/firefox-i18n-57.0.2/ar.xpi) = 488160
>-SHA256 (xpi/firefox-i18n-57.0.2/as.xpi) = b9bcf4ef2bc5d55a5861de8efa8451174a420e4032cafe9fe463c78fa029963b
>-SIZE (xpi/firefox-i18n-57.0.2/as.xpi) = 491075
>-SHA256 (xpi/firefox-i18n-57.0.2/ast.xpi) = a812abe6c44bde6e39820bccc3c7448a658ef9d9d7d98639ad7fdf39229ce6ae
>-SIZE (xpi/firefox-i18n-57.0.2/ast.xpi) = 455504
>-SHA256 (xpi/firefox-i18n-57.0.2/az.xpi) = ed972e2fc9c7aad3196b5db6c82812acd37d08bb83c1b9f276cb73f99cb10e44
>-SIZE (xpi/firefox-i18n-57.0.2/az.xpi) = 466043
>-SHA256 (xpi/firefox-i18n-57.0.2/be.xpi) = 5ff30769b04e5953c33cc9f64c66d8bbdc0ce8b0b1929910ffd82071964e138d
>-SIZE (xpi/firefox-i18n-57.0.2/be.xpi) = 516092
>-SHA256 (xpi/firefox-i18n-57.0.2/bg.xpi) = 11984db8c70e3bd49a96c3e893c3681108bb9e9f698167c91f221799c5b26c23
>-SIZE (xpi/firefox-i18n-57.0.2/bg.xpi) = 510351
>-SHA256 (xpi/firefox-i18n-57.0.2/bn-BD.xpi) = 9140e4b831f42d17d738515a104613b1632c6c39cd7165514e99dfdd561fddc3
>-SIZE (xpi/firefox-i18n-57.0.2/bn-BD.xpi) = 527189
>-SHA256 (xpi/firefox-i18n-57.0.2/bn-IN.xpi) = 7d6c277c61341ecd01d154a0c63e1d6d6d30139b22efa4dc050297194ef6ee54
>-SIZE (xpi/firefox-i18n-57.0.2/bn-IN.xpi) = 516180
>-SHA256 (xpi/firefox-i18n-57.0.2/br.xpi) = acda7accd57dd95b5a48ec7baf25b29cc6938027e5bfbe9dd4ce999a31e448c1
>-SIZE (xpi/firefox-i18n-57.0.2/br.xpi) = 451866
>-SHA256 (xpi/firefox-i18n-57.0.2/bs.xpi) = 69accf3f165f7feabdc3d3d59ef19af4b01811a89dfc3cff89798f71bb1759cb
>-SIZE (xpi/firefox-i18n-57.0.2/bs.xpi) = 459650
>-SHA256 (xpi/firefox-i18n-57.0.2/ca.xpi) = b409e3f6d3359fbe1885bed346d04f856910704258be6235ac4b8d677ac87e8b
>-SIZE (xpi/firefox-i18n-57.0.2/ca.xpi) = 466641
>-SHA256 (xpi/firefox-i18n-57.0.2/cak.xpi) = fa9159287516e9c84f11fab742147c767c405a5ba51036cd8251af9f83dcc295
>-SIZE (xpi/firefox-i18n-57.0.2/cak.xpi) = 475935
>-SHA256 (xpi/firefox-i18n-57.0.2/cs.xpi) = ceae997c6945d2bbcda249433c72299d42e7798c19b7f2c71deebe77afc0ef33
>-SIZE (xpi/firefox-i18n-57.0.2/cs.xpi) = 469457
>-SHA256 (xpi/firefox-i18n-57.0.2/cy.xpi) = 1fd06e46a5cc6d4ae771fbc148b71e9e53e2a53396a44097bc9068714e94a805
>-SIZE (xpi/firefox-i18n-57.0.2/cy.xpi) = 455788
>-SHA256 (xpi/firefox-i18n-57.0.2/da.xpi) = c8fe1d4d5fa996f43c4ee9206fcd0519725d55221ba53017c482f8dae8880b70
>-SIZE (xpi/firefox-i18n-57.0.2/da.xpi) = 448415
>-SHA256 (xpi/firefox-i18n-57.0.2/de.xpi) = 5bd6244175c8cd96a0938eec42aeb470bbe833d25c1f1745afbb9bb3e66eb814
>-SIZE (xpi/firefox-i18n-57.0.2/de.xpi) = 460813
>-SHA256 (xpi/firefox-i18n-57.0.2/dsb.xpi) = c9be692a527ac9934ca28bcbb6be3a1c1a7a6d5471cfe75809100c3941d55a37
>-SIZE (xpi/firefox-i18n-57.0.2/dsb.xpi) = 479511
>-SHA256 (xpi/firefox-i18n-57.0.2/el.xpi) = 2e1ee6612d7ed621aa5e43843de253b5ae3b31185e3d9d2607bb5518e27e864b
>-SIZE (xpi/firefox-i18n-57.0.2/el.xpi) = 534484
>-SHA256 (xpi/firefox-i18n-57.0.2/en-GB.xpi) = 64c001b0a31985485269c870adf37f0652898f22774a1042030faf8a9af5f362
>-SIZE (xpi/firefox-i18n-57.0.2/en-GB.xpi) = 435623
>-SHA256 (xpi/firefox-i18n-57.0.2/en-US.xpi) = 7c830511020b3c3d941d6b699b569a3a7a0897affe70ae4f55229af657b4696b
>-SIZE (xpi/firefox-i18n-57.0.2/en-US.xpi) = 441880
>-SHA256 (xpi/firefox-i18n-57.0.2/en-ZA.xpi) = d09067757c1d240253fd4a28c41955163677f2198b9ca8967120b876bb206109
>-SIZE (xpi/firefox-i18n-57.0.2/en-ZA.xpi) = 432020
>-SHA256 (xpi/firefox-i18n-57.0.2/eo.xpi) = b9f4311f6aabccb3abb87198a56e34ad6560fb2802e227a557603b7dfe811cd6
>-SIZE (xpi/firefox-i18n-57.0.2/eo.xpi) = 454910
>-SHA256 (xpi/firefox-i18n-57.0.2/es-AR.xpi) = fc5fc1f2126c2c87757efcaaa90d4cd5e5d1ce05af4c0e74cca1d144589416e2
>-SIZE (xpi/firefox-i18n-57.0.2/es-AR.xpi) = 462980
>-SHA256 (xpi/firefox-i18n-57.0.2/es-CL.xpi) = 2138bc886d134a7a3c9511f25acf984e83f05b0940de4ccf1ed5c15b5388a2d1
>-SIZE (xpi/firefox-i18n-57.0.2/es-CL.xpi) = 465514
>-SHA256 (xpi/firefox-i18n-57.0.2/es-ES.xpi) = 880c74c8994f4353f7b5149b88795cb84b6b66f26ee3a5fe181bc3cffc48db9a
>-SIZE (xpi/firefox-i18n-57.0.2/es-ES.xpi) = 353625
>-SHA256 (xpi/firefox-i18n-57.0.2/es-MX.xpi) = 79cb2491f93e1e77710b7f946e46ad2dd1d2ea1d99353ac513159a5ea05edabf
>-SIZE (xpi/firefox-i18n-57.0.2/es-MX.xpi) = 468761
>-SHA256 (xpi/firefox-i18n-57.0.2/et.xpi) = 321d33ef3bf6faffa2bc5f333ac247773742402a597017b07cc6ea02b6d0c564
>-SIZE (xpi/firefox-i18n-57.0.2/et.xpi) = 447279
>-SHA256 (xpi/firefox-i18n-57.0.2/eu.xpi) = 55ebe6b49e65bd84c5d4a7dd54d98457979d9d58abfe7ebc861ed16bf1e23957
>-SIZE (xpi/firefox-i18n-57.0.2/eu.xpi) = 454673
>-SHA256 (xpi/firefox-i18n-57.0.2/fa.xpi) = 4adce2a2efc8d02fbeee08fcc4442ca9bacd2ee4efaac9ab5639cc39dd7e0441
>-SIZE (xpi/firefox-i18n-57.0.2/fa.xpi) = 510829
>-SHA256 (xpi/firefox-i18n-57.0.2/ff.xpi) = 527edbec7d942e34714f234509985738125cb751011ed781e17a8888a40e2b29
>-SIZE (xpi/firefox-i18n-57.0.2/ff.xpi) = 454015
>-SHA256 (xpi/firefox-i18n-57.0.2/fi.xpi) = e51f8f137b63cbac65bc8d1a63e301f128b58a502d090bd05838320829d28eb5
>-SIZE (xpi/firefox-i18n-57.0.2/fi.xpi) = 446244
>-SHA256 (xpi/firefox-i18n-57.0.2/fr.xpi) = e6c47c559b647b9e2e2ad7b7dadbd9c92680bfaa26a706181d7d15d6b3b80189
>-SIZE (xpi/firefox-i18n-57.0.2/fr.xpi) = 472721
>-SHA256 (xpi/firefox-i18n-57.0.2/fy-NL.xpi) = 80c291b1e480765fdcf012c460c172297e25bb022290f72c3e742cf4a0113fb1
>-SIZE (xpi/firefox-i18n-57.0.2/fy-NL.xpi) = 465911
>-SHA256 (xpi/firefox-i18n-57.0.2/ga-IE.xpi) = 8f575e976a6b2580344957ae13809aaaff7f64f29722ff7e339c3535ca713346
>-SIZE (xpi/firefox-i18n-57.0.2/ga-IE.xpi) = 475963
>-SHA256 (xpi/firefox-i18n-57.0.2/gd.xpi) = 5c78506787b4e207f2e5cfd9a387d566ee9d964b2e29d41c9c1500171b33d81e
>-SIZE (xpi/firefox-i18n-57.0.2/gd.xpi) = 465122
>-SHA256 (xpi/firefox-i18n-57.0.2/gl.xpi) = 24cc04f7de1401540069fe12231c69d53d72bf48b21ad0158a57a199e324a97c
>-SIZE (xpi/firefox-i18n-57.0.2/gl.xpi) = 452032
>-SHA256 (xpi/firefox-i18n-57.0.2/gn.xpi) = 0cb1ba780dbf7e71dad2182dadc3d157261e479d2eb9ac847a5eb93274af83b2
>-SIZE (xpi/firefox-i18n-57.0.2/gn.xpi) = 471956
>-SHA256 (xpi/firefox-i18n-57.0.2/gu-IN.xpi) = bbb0c993585759536559ce2cca98827a5915dbe3880507a8681bc09a54e44901
>-SIZE (xpi/firefox-i18n-57.0.2/gu-IN.xpi) = 511990
>-SHA256 (xpi/firefox-i18n-57.0.2/he.xpi) = fafc4772fbb6b96857d3f42402da2a556c20a0f291b479ac66e0c53745d29abe
>-SIZE (xpi/firefox-i18n-57.0.2/he.xpi) = 471921
>-SHA256 (xpi/firefox-i18n-57.0.2/hi-IN.xpi) = 978e0c8cb2985aa8906f35bb49fb4e4e2bec3492bc9c7c5b0a66cdbd9acde794
>-SIZE (xpi/firefox-i18n-57.0.2/hi-IN.xpi) = 526110
>-SHA256 (xpi/firefox-i18n-57.0.2/hr.xpi) = 2eb787c77113156ab23d0986c234c12142981f73486af8474d011f1d89d03e7e
>-SIZE (xpi/firefox-i18n-57.0.2/hr.xpi) = 460722
>-SHA256 (xpi/firefox-i18n-57.0.2/hsb.xpi) = 6d5537e0b83586d2561030eb480c21f9560c764c5c9d53cff6a109ff0e4a0849
>-SIZE (xpi/firefox-i18n-57.0.2/hsb.xpi) = 476505
>-SHA256 (xpi/firefox-i18n-57.0.2/hu.xpi) = 363848557e54c141f7aaa065ba9fc658217b85cac901e71877d912e176004d50
>-SIZE (xpi/firefox-i18n-57.0.2/hu.xpi) = 476604
>-SHA256 (xpi/firefox-i18n-57.0.2/hy-AM.xpi) = c36719ef55557538fec0d7a011adda063494428f07495fc7cc3a592ec3c28aaa
>-SIZE (xpi/firefox-i18n-57.0.2/hy-AM.xpi) = 510825
>-SHA256 (xpi/firefox-i18n-57.0.2/id.xpi) = ecdd58c5c92133cc92e0c3cac9c2e3de06e4ab5520c031ad74a03813e3ed0fe4
>-SIZE (xpi/firefox-i18n-57.0.2/id.xpi) = 444041
>-SHA256 (xpi/firefox-i18n-57.0.2/is.xpi) = 900a1823028928d24247cf707f98cfa5226f04cf5045b7d50889f68a9c35f735
>-SIZE (xpi/firefox-i18n-57.0.2/is.xpi) = 452660
>-SHA256 (xpi/firefox-i18n-57.0.2/it.xpi) = 8723506b966f04413dd5b20ca7bbfdf82373637b9d791e4eecd36f6aa0028aac
>-SIZE (xpi/firefox-i18n-57.0.2/it.xpi) = 347171
>-SHA256 (xpi/firefox-i18n-57.0.2/ja.xpi) = ed1f6920353721d64167b93b85bd2119c370553ef914aef1f18e2f01739cb0b9
>-SIZE (xpi/firefox-i18n-57.0.2/ja.xpi) = 508552
>-SHA256 (xpi/firefox-i18n-57.0.2/ka.xpi) = ebd1b1bbb217a1b93726b8fd720dd63680d28fa76b9fb55768e87f7b9565470f
>-SIZE (xpi/firefox-i18n-57.0.2/ka.xpi) = 492355
>-SHA256 (xpi/firefox-i18n-57.0.2/kab.xpi) = 47105e123349f68f071d748fb2a654fd2b8445dcb9bc1006a83401d759a5d71e
>-SIZE (xpi/firefox-i18n-57.0.2/kab.xpi) = 462531
>-SHA256 (xpi/firefox-i18n-57.0.2/kk.xpi) = 7504d2e8e224240aa1a2d0761fec7f36c6c6427a529021f5aa7f33f35185072d
>-SIZE (xpi/firefox-i18n-57.0.2/kk.xpi) = 519249
>-SHA256 (xpi/firefox-i18n-57.0.2/km.xpi) = c5b950cd3fc7b1b2dcfea70508da8f8fbe327ab4ec662bf4ab8e9796482bd109
>-SIZE (xpi/firefox-i18n-57.0.2/km.xpi) = 530080
>-SHA256 (xpi/firefox-i18n-57.0.2/kn.xpi) = 114e741a4ff2c75863ff217b4df778f4c2f4c3307bbeab6eacadcb9b0b2821fc
>-SIZE (xpi/firefox-i18n-57.0.2/kn.xpi) = 531316
>-SHA256 (xpi/firefox-i18n-57.0.2/ko.xpi) = 8d0a46effa9d4dea17ec8f32538494ef903dd6f2908fd7e4d12cf89b9f514dcf
>-SIZE (xpi/firefox-i18n-57.0.2/ko.xpi) = 487306
>-SHA256 (xpi/firefox-i18n-57.0.2/lij.xpi) = d6d97b8381806d315448eae8ac3071d57aae58a2f7ab89f419ae21430e71736e
>-SIZE (xpi/firefox-i18n-57.0.2/lij.xpi) = 452343
>-SHA256 (xpi/firefox-i18n-57.0.2/lt.xpi) = c1de5e657eaf33e1336162c06e9a643de44cae2083c6d8f7dfc026852aa2c33f
>-SIZE (xpi/firefox-i18n-57.0.2/lt.xpi) = 474957
>-SHA256 (xpi/firefox-i18n-57.0.2/lv.xpi) = a6720e6734307e659ca989b3131cbbc51ac3cee8f75b40da2748ee4b26ac8bb2
>-SIZE (xpi/firefox-i18n-57.0.2/lv.xpi) = 465243
>-SHA256 (xpi/firefox-i18n-57.0.2/mai.xpi) = 0548e9b8e574db76432a231fc9e6bb281328e22413bcaf73be79ac0d815cb4cc
>-SIZE (xpi/firefox-i18n-57.0.2/mai.xpi) = 507396
>-SHA256 (xpi/firefox-i18n-57.0.2/mk.xpi) = 9727349fce8a362e83acb24cf403dff55dbf788e77d367cb236db8453b3d1e7f
>-SIZE (xpi/firefox-i18n-57.0.2/mk.xpi) = 490853
>-SHA256 (xpi/firefox-i18n-57.0.2/ml.xpi) = aed732d507da43096c2666c7082394382b57d8f5db57f9469819c1c461ba1eff
>-SIZE (xpi/firefox-i18n-57.0.2/ml.xpi) = 528256
>-SHA256 (xpi/firefox-i18n-57.0.2/mr.xpi) = a6da2ad562c248b922e9329511d649a7ff30edafba512585ff9824a047fa9b5c
>-SIZE (xpi/firefox-i18n-57.0.2/mr.xpi) = 521291
>-SHA256 (xpi/firefox-i18n-57.0.2/ms.xpi) = 29278b6bb2f86c00b47bc1555bdf39901fbae933bfb8da332c6fb4d9bb98eb93
>-SIZE (xpi/firefox-i18n-57.0.2/ms.xpi) = 451255
>-SHA256 (xpi/firefox-i18n-57.0.2/my.xpi) = 85b542b1df86fbaf5e72dcbdcdb1902cb4c9399bf9d8358864189748bc40be4f
>-SIZE (xpi/firefox-i18n-57.0.2/my.xpi) = 517703
>-SHA256 (xpi/firefox-i18n-57.0.2/nb-NO.xpi) = fcbdaca8ade333dcc6a9907d25826c96a3bdd38b738d767e8dd0e4d136cd0a04
>-SIZE (xpi/firefox-i18n-57.0.2/nb-NO.xpi) = 451557
>-SHA256 (xpi/firefox-i18n-57.0.2/nl.xpi) = f11ebb89292b1f6ea4b23aa1ebc9d2cf06eca70f74e3716bdf212813fa27d1f8
>-SIZE (xpi/firefox-i18n-57.0.2/nl.xpi) = 458318
>-SHA256 (xpi/firefox-i18n-57.0.2/nn-NO.xpi) = 62f6b27b921403b5eb66ed6cd756ae58158c576113fdab7e22c2e0d6addeee0d
>-SIZE (xpi/firefox-i18n-57.0.2/nn-NO.xpi) = 452004
>-SHA256 (xpi/firefox-i18n-57.0.2/or.xpi) = 51add79881216d6b0b6b6a0e542312077c90a2f4bfecde7cfab50c021922c255
>-SIZE (xpi/firefox-i18n-57.0.2/or.xpi) = 500867
>-SHA256 (xpi/firefox-i18n-57.0.2/pa-IN.xpi) = c50223c03c0a988592f6ff6faf988b0decd20ffcbf86a4094095795aae1a191b
>-SIZE (xpi/firefox-i18n-57.0.2/pa-IN.xpi) = 495271
>-SHA256 (xpi/firefox-i18n-57.0.2/pl.xpi) = 3363080d6e6f3f64f0f65fd5dfbae135afb9fa7ac581dc11eb1f6b1d729c3419
>-SIZE (xpi/firefox-i18n-57.0.2/pl.xpi) = 364230
>-SHA256 (xpi/firefox-i18n-57.0.2/pt-BR.xpi) = 122a54c218fd4f0968815a4bf5211952225194c1cdae6c87d5236f14775cfd08
>-SIZE (xpi/firefox-i18n-57.0.2/pt-BR.xpi) = 457155
>-SHA256 (xpi/firefox-i18n-57.0.2/pt-PT.xpi) = a287438f5494388161055e2cec97ed4656423431697a244cb35c77ef722655e9
>-SIZE (xpi/firefox-i18n-57.0.2/pt-PT.xpi) = 460000
>-SHA256 (xpi/firefox-i18n-57.0.2/rm.xpi) = a99b89dbc7cd74f212edc93435ec28f8ec07cc09b815a07cd247eb5f9db51eef
>-SIZE (xpi/firefox-i18n-57.0.2/rm.xpi) = 451059
>-SHA256 (xpi/firefox-i18n-57.0.2/ro.xpi) = 481f65471392779bc115b78e9b743092e807ba623cfdb7fe1a5f0c6ef140c790
>-SIZE (xpi/firefox-i18n-57.0.2/ro.xpi) = 455511
>-SHA256 (xpi/firefox-i18n-57.0.2/ru.xpi) = b25dd55d5d046ef80f5dbabba18008a53074dfb5b10694c3a1ef0bfa2ed47768
>-SIZE (xpi/firefox-i18n-57.0.2/ru.xpi) = 526955
>-SHA256 (xpi/firefox-i18n-57.0.2/si.xpi) = 0aa9b90d9ee33055fd45ce508906231efae349a7fe902dff42d8f52477d9d572
>-SIZE (xpi/firefox-i18n-57.0.2/si.xpi) = 498324
>-SHA256 (xpi/firefox-i18n-57.0.2/sk.xpi) = 4e23b6888f767ce131b440679025cfa523cd29673985b32e4693233780ddc1fd
>-SIZE (xpi/firefox-i18n-57.0.2/sk.xpi) = 480397
>-SHA256 (xpi/firefox-i18n-57.0.2/sl.xpi) = 9a5bb0644c00fea4eaf1e0cc5491340769a011a64ad106b2fd0c6fbbffba73b6
>-SIZE (xpi/firefox-i18n-57.0.2/sl.xpi) = 459377
>-SHA256 (xpi/firefox-i18n-57.0.2/son.xpi) = 94bdf395d5fc7650a2af468f011b937f8fdf60d5d3803985d557978af1f8310f
>-SIZE (xpi/firefox-i18n-57.0.2/son.xpi) = 450931
>-SHA256 (xpi/firefox-i18n-57.0.2/sq.xpi) = 16f41d29b8afabb32e7e488c476fee2bc84bcf0e6fb348c1a4c6a8157f465cbd
>-SIZE (xpi/firefox-i18n-57.0.2/sq.xpi) = 465051
>-SHA256 (xpi/firefox-i18n-57.0.2/sr.xpi) = 333722711aa715f65cd79b98f9edc109d151706b71ccec052cad1c3f55530e0b
>-SIZE (xpi/firefox-i18n-57.0.2/sr.xpi) = 487003
>-SHA256 (xpi/firefox-i18n-57.0.2/sv-SE.xpi) = b1547d3a366944f2f2eb2efe5bb2140d5be98590983bc9a5375bf92516835df2
>-SIZE (xpi/firefox-i18n-57.0.2/sv-SE.xpi) = 459666
>-SHA256 (xpi/firefox-i18n-57.0.2/ta.xpi) = fb8ca50c06430e851aa7f27812e223f80ac46770ce243b8fbd0785b574d9f822
>-SIZE (xpi/firefox-i18n-57.0.2/ta.xpi) = 513228
>-SHA256 (xpi/firefox-i18n-57.0.2/te.xpi) = 0cd211ae333511fb7047b0c9ff7643b1b34893cb6255139c8058ccb267c03a78
>-SIZE (xpi/firefox-i18n-57.0.2/te.xpi) = 530693
>-SHA256 (xpi/firefox-i18n-57.0.2/th.xpi) = fefbf5da1b82dc13057c322d1896834a44663369d849468acb1338fe8d2c0009
>-SIZE (xpi/firefox-i18n-57.0.2/th.xpi) = 502451
>-SHA256 (xpi/firefox-i18n-57.0.2/tr.xpi) = 3f42f3473a001ad4f04d5c0adbccc9a1eb467dd478d13577ac508dbf29da392c
>-SIZE (xpi/firefox-i18n-57.0.2/tr.xpi) = 465580
>-SHA256 (xpi/firefox-i18n-57.0.2/uk.xpi) = 30bafef9fc22b8079e2ab3546a2589ad6899e9b5e45a6141d85419dbde0e86e9
>-SIZE (xpi/firefox-i18n-57.0.2/uk.xpi) = 518138
>-SHA256 (xpi/firefox-i18n-57.0.2/ur.xpi) = 2d3cc8579a83f5992e3b53f0f4ba1bf941400f075aab154c85c889069970cef7
>-SIZE (xpi/firefox-i18n-57.0.2/ur.xpi) = 511138
>-SHA256 (xpi/firefox-i18n-57.0.2/uz.xpi) = f72a755f23c77fbd7bde1f150d320ddf3516baf26131a795c3227f85a41d1b43
>-SIZE (xpi/firefox-i18n-57.0.2/uz.xpi) = 461694
>-SHA256 (xpi/firefox-i18n-57.0.2/vi.xpi) = 07718242af2d00df88cde15704e5af63149eafac507eaa903e9f094f7796be70
>-SIZE (xpi/firefox-i18n-57.0.2/vi.xpi) = 471320
>-SHA256 (xpi/firefox-i18n-57.0.2/xh.xpi) = e996e2042c168ec26fe8310343cb1d32fdebceecd633cdb403118bf679062526
>-SIZE (xpi/firefox-i18n-57.0.2/xh.xpi) = 464461
>-SHA256 (xpi/firefox-i18n-57.0.2/zh-CN.xpi) = d66d88d278fc54ff0081f83c0b15a4b2f47308f2bcb340332f6cf13e85dba160
>-SIZE (xpi/firefox-i18n-57.0.2/zh-CN.xpi) = 483625
>-SHA256 (xpi/firefox-i18n-57.0.2/zh-TW.xpi) = 9b669d4dd297915657f2d8dca25aeb51d49e9138d6d6c542e82256dfc477d696
>-SIZE (xpi/firefox-i18n-57.0.2/zh-TW.xpi) = 482462
>+TIMESTAMP = 1514295516
>+SHA256 (xpi/firefox-i18n-58.0b13/ach.xpi) = 7c4e9a3d40bee39b8eda799cc4d517933549c80342a9a5fefe7b70aeffc89942
>+SIZE (xpi/firefox-i18n-58.0b13/ach.xpi) = 444872
>+SHA256 (xpi/firefox-i18n-58.0b13/af.xpi) = 86ae9d41737cbf687c01107fd4292f61704ce5427a18b60b5d2ca419fdd33075
>+SIZE (xpi/firefox-i18n-58.0b13/af.xpi) = 444574
>+SHA256 (xpi/firefox-i18n-58.0b13/an.xpi) = 2898aed292d63e62545c3a6f605133e150e3d571f4468f4b59010d489e03309c
>+SIZE (xpi/firefox-i18n-58.0b13/an.xpi) = 468931
>+SHA256 (xpi/firefox-i18n-58.0b13/ar.xpi) = 74bc2712d853b286f8d1e853c489884f77d6ea0560acb03e0278721aeef3ac4d
>+SIZE (xpi/firefox-i18n-58.0b13/ar.xpi) = 493719
>+SHA256 (xpi/firefox-i18n-58.0b13/as.xpi) = 1bef07d2815d4964016df69f78c6114ee5f62109cc11021147cb0161b06ca83b
>+SIZE (xpi/firefox-i18n-58.0b13/as.xpi) = 492795
>+SHA256 (xpi/firefox-i18n-58.0b13/ast.xpi) = 0a063ab8289be7c884e0dd0b737b11feb47f530129f9f38833ac2e5b5ce3c33a
>+SIZE (xpi/firefox-i18n-58.0b13/ast.xpi) = 461572
>+SHA256 (xpi/firefox-i18n-58.0b13/az.xpi) = 0bc61ede399303c28947ad21d41fe252450d23e7e3348608019b46d9b5bfd2c4
>+SIZE (xpi/firefox-i18n-58.0b13/az.xpi) = 468525
>+SHA256 (xpi/firefox-i18n-58.0b13/be.xpi) = c4d256984ef85b19a991ba78ba41fdba944e0f260194bfc892c4101aaf099577
>+SIZE (xpi/firefox-i18n-58.0b13/be.xpi) = 521175
>+SHA256 (xpi/firefox-i18n-58.0b13/bg.xpi) = eb97467b9b6097beafe6edd6ab2e0f86b7545ab623c149b489cd78b4a486638d
>+SIZE (xpi/firefox-i18n-58.0b13/bg.xpi) = 515702
>+SHA256 (xpi/firefox-i18n-58.0b13/bn-BD.xpi) = aaa80b64c3d43899b94356d20978b904b22386b59cd66de9708087a9996a369c
>+SIZE (xpi/firefox-i18n-58.0b13/bn-BD.xpi) = 528704
>+SHA256 (xpi/firefox-i18n-58.0b13/bn-IN.xpi) = 1b792d745b3b95fec955834cf70928f1386ccee515a231ddae2dc6aeeddd92bc
>+SIZE (xpi/firefox-i18n-58.0b13/bn-IN.xpi) = 518318
>+SHA256 (xpi/firefox-i18n-58.0b13/br.xpi) = 0dad734591736df7031e0f593214a6672f7af545ae3b921660306b5074d554d5
>+SIZE (xpi/firefox-i18n-58.0b13/br.xpi) = 457134
>+SHA256 (xpi/firefox-i18n-58.0b13/bs.xpi) = 279d93c7b5235635a33136ad782966e15e3b1c406d56a66bb8924e95b064efe8
>+SIZE (xpi/firefox-i18n-58.0b13/bs.xpi) = 461814
>+SHA256 (xpi/firefox-i18n-58.0b13/ca.xpi) = 8ea023d710160fc69a9e5a17f1dfad7e24a9b4282a4d0dc29c860118cb32a015
>+SIZE (xpi/firefox-i18n-58.0b13/ca.xpi) = 470157
>+SHA256 (xpi/firefox-i18n-58.0b13/cak.xpi) = bc6c92bb04d8f71453d554eb1d951dc9fb4fe4ffa0a80d338878fabc492f1959
>+SIZE (xpi/firefox-i18n-58.0b13/cak.xpi) = 481298
>+SHA256 (xpi/firefox-i18n-58.0b13/cs.xpi) = 91f04e97066e74b7366617f63ca701eb88fb0924f6921034c660761d54aeea20
>+SIZE (xpi/firefox-i18n-58.0b13/cs.xpi) = 478410
>+SHA256 (xpi/firefox-i18n-58.0b13/cy.xpi) = 25d446670c629bfa8616fb807cedad6aae9e7469b9b1b50e98e440af41788191
>+SIZE (xpi/firefox-i18n-58.0b13/cy.xpi) = 460986
>+SHA256 (xpi/firefox-i18n-58.0b13/da.xpi) = f6f5c69b689eb31b3daad2819ef15c4f2fbcd535833c24dccdd7c0a735385f86
>+SIZE (xpi/firefox-i18n-58.0b13/da.xpi) = 450529
>+SHA256 (xpi/firefox-i18n-58.0b13/de.xpi) = 171211e4597b72b98c1aea340f325343238f8d62b4ad1c8106032263b3040496
>+SIZE (xpi/firefox-i18n-58.0b13/de.xpi) = 464694
>+SHA256 (xpi/firefox-i18n-58.0b13/dsb.xpi) = 4a1462ac6012065f8f3c3c9afed0347260cd10153f2b5d6213a21dab26115293
>+SIZE (xpi/firefox-i18n-58.0b13/dsb.xpi) = 485516
>+SHA256 (xpi/firefox-i18n-58.0b13/el.xpi) = 0d9f19a18803ca98dc7830a1bebcbef2f5cc3ae5e3c8bcf151860aae65e26c6f
>+SIZE (xpi/firefox-i18n-58.0b13/el.xpi) = 538370
>+SHA256 (xpi/firefox-i18n-58.0b13/en-GB.xpi) = f2150a70b821542759993b04a50299a0665d6a85dc33074d2e4d4ccc0c2d846e
>+SIZE (xpi/firefox-i18n-58.0b13/en-GB.xpi) = 439092
>+SHA256 (xpi/firefox-i18n-58.0b13/en-US.xpi) = 6744a00143f93992fd9ddbbcaed7e58bc2bab3f42709ba61480fd1f1cd98f9b1
>+SIZE (xpi/firefox-i18n-58.0b13/en-US.xpi) = 440002
>+SHA256 (xpi/firefox-i18n-58.0b13/en-ZA.xpi) = 21ff6c58a514b0b05b137196096f2711105f4b15c27a9dbadeff6ad111e14747
>+SIZE (xpi/firefox-i18n-58.0b13/en-ZA.xpi) = 434818
>+SHA256 (xpi/firefox-i18n-58.0b13/eo.xpi) = 6cdfa7224b1afc9bef0d2d53defe0ef36d420d5af62a406e1402076063f5b507
>+SIZE (xpi/firefox-i18n-58.0b13/eo.xpi) = 457975
>+SHA256 (xpi/firefox-i18n-58.0b13/es-AR.xpi) = 8b9085ed8faa5a2372ff62c9e603ac5ccea8402a0b7e7446eb848c6ad30c562a
>+SIZE (xpi/firefox-i18n-58.0b13/es-AR.xpi) = 467897
>+SHA256 (xpi/firefox-i18n-58.0b13/es-CL.xpi) = d93e4de1557e6bb4ddf7cbf8c9ad5c2903765b685b9557c1a8014d8f09392dd9
>+SIZE (xpi/firefox-i18n-58.0b13/es-CL.xpi) = 472661
>+SHA256 (xpi/firefox-i18n-58.0b13/es-ES.xpi) = b8e0618b9a254cffe60286f1e8356c9fd6a870f4b2674adc07745b7f21ef0a25
>+SIZE (xpi/firefox-i18n-58.0b13/es-ES.xpi) = 356827
>+SHA256 (xpi/firefox-i18n-58.0b13/es-MX.xpi) = 2f1f789d271d9ed30b4b3ab3dbeebd36fb44fd32187a83502fa7f6a1405a1bf8
>+SIZE (xpi/firefox-i18n-58.0b13/es-MX.xpi) = 472343
>+SHA256 (xpi/firefox-i18n-58.0b13/et.xpi) = 2421e32ae104cac3ed233664aa23faa5ba9fd5233bd2d92af2fbffe1ddf2d453
>+SIZE (xpi/firefox-i18n-58.0b13/et.xpi) = 450450
>+SHA256 (xpi/firefox-i18n-58.0b13/eu.xpi) = 57ce2af5d8579ce2d634e2ed9da6613f1c3838ac9f2ea25c8368a23fa22891ec
>+SIZE (xpi/firefox-i18n-58.0b13/eu.xpi) = 459750
>+SHA256 (xpi/firefox-i18n-58.0b13/fa.xpi) = d4d40d6aef3d887d910a00a7d28cb0272f525f64e7b5948ba07f24c4adda8139
>+SIZE (xpi/firefox-i18n-58.0b13/fa.xpi) = 516038
>+SHA256 (xpi/firefox-i18n-58.0b13/ff.xpi) = a29b465b7c16677465e0e65ceee94de250da5b65c69e859e1ac52e2fb59cb7b0
>+SIZE (xpi/firefox-i18n-58.0b13/ff.xpi) = 461467
>+SHA256 (xpi/firefox-i18n-58.0b13/fi.xpi) = f2be988378d19ebafe9b85299b65108c39071e01c783e289404de6619c05edaa
>+SIZE (xpi/firefox-i18n-58.0b13/fi.xpi) = 451161
>+SHA256 (xpi/firefox-i18n-58.0b13/fr.xpi) = 60aba5e10d02a1cb422f99cdcf83330badded0e9ca6bf24bb865dbbda590c854
>+SIZE (xpi/firefox-i18n-58.0b13/fr.xpi) = 477980
>+SHA256 (xpi/firefox-i18n-58.0b13/fy-NL.xpi) = b6744ac3792b7b8ac58f1da3d2a4ce3cd41822ab64d8ab77033dd5a6a40c5c76
>+SIZE (xpi/firefox-i18n-58.0b13/fy-NL.xpi) = 469750
>+SHA256 (xpi/firefox-i18n-58.0b13/ga-IE.xpi) = b51fe762d88c14a7f43a5604e38be6ebba948bf8a16abda66c81b3742d6a844a
>+SIZE (xpi/firefox-i18n-58.0b13/ga-IE.xpi) = 479265
>+SHA256 (xpi/firefox-i18n-58.0b13/gd.xpi) = f01213cff3a196272976ba25c55c5d3b90223d48112879f46318c277d58e27a4
>+SIZE (xpi/firefox-i18n-58.0b13/gd.xpi) = 466996
>+SHA256 (xpi/firefox-i18n-58.0b13/gl.xpi) = 96792d343d328d2586b9ba02362ee7c72b4b7683b7396915e38973b1f73a9a79
>+SIZE (xpi/firefox-i18n-58.0b13/gl.xpi) = 454324
>+SHA256 (xpi/firefox-i18n-58.0b13/gn.xpi) = 56bb603067c7bd1ffc53682c64bcd1c0337b6318e7b912357d9f8b792ff9a4bf
>+SIZE (xpi/firefox-i18n-58.0b13/gn.xpi) = 475399
>+SHA256 (xpi/firefox-i18n-58.0b13/gu-IN.xpi) = 19341da7dc0dca198c490a05b6c1f6d98f056edcbb44514158a6ef00044c307b
>+SIZE (xpi/firefox-i18n-58.0b13/gu-IN.xpi) = 520668
>+SHA256 (xpi/firefox-i18n-58.0b13/he.xpi) = 0b9840f4942adaa0bf1810d0b9dd7aae58a4156ab212a02bd4edacbd872861bf
>+SIZE (xpi/firefox-i18n-58.0b13/he.xpi) = 478364
>+SHA256 (xpi/firefox-i18n-58.0b13/hi-IN.xpi) = 64677c3006ebca31ff5e0bd49b5238845328cd15b910831d4fe9e02695311036
>+SIZE (xpi/firefox-i18n-58.0b13/hi-IN.xpi) = 528342
>+SHA256 (xpi/firefox-i18n-58.0b13/hr.xpi) = 09d74738a2155f8de2005755a19cf46813ba2d911742a62436721ea05c09cd3b
>+SIZE (xpi/firefox-i18n-58.0b13/hr.xpi) = 466023
>+SHA256 (xpi/firefox-i18n-58.0b13/hsb.xpi) = 39a8020737bdc8494dfdf072bd2399b66d741d67bbb084e817c4aa11b994d441
>+SIZE (xpi/firefox-i18n-58.0b13/hsb.xpi) = 482468
>+SHA256 (xpi/firefox-i18n-58.0b13/hu.xpi) = 7bca44e0df6a3d0dd547f66f106473b4a9cc2139ccee5556272daae8feff0e51
>+SIZE (xpi/firefox-i18n-58.0b13/hu.xpi) = 481473
>+SHA256 (xpi/firefox-i18n-58.0b13/hy-AM.xpi) = 9aae408ac8e0eb101e8a1186837a4bd41c3821834bb2f0ac4bc00f6a39a0dfbf
>+SIZE (xpi/firefox-i18n-58.0b13/hy-AM.xpi) = 515028
>+SHA256 (xpi/firefox-i18n-58.0b13/id.xpi) = cdcc74b70e358db9a1e0bd09798aa1ecfef0bb1820cd939a856bebe9f3e50afc
>+SIZE (xpi/firefox-i18n-58.0b13/id.xpi) = 447287
>+SHA256 (xpi/firefox-i18n-58.0b13/is.xpi) = 6f84b805852b8d5f1cae3e9861ae91ae3a93656a1e48e03f0b5db3ad7c00fccd
>+SIZE (xpi/firefox-i18n-58.0b13/is.xpi) = 458899
>+SHA256 (xpi/firefox-i18n-58.0b13/it.xpi) = ea625ef8773b24fea2e14c817e205e745e5ecbedffcf491e1a3b7136a1ecc1ae
>+SIZE (xpi/firefox-i18n-58.0b13/it.xpi) = 349758
>+SHA256 (xpi/firefox-i18n-58.0b13/ja.xpi) = 976fdefc7012feddee7a936f251a5be8989edd1666df37ee9686d0bc96c6a195
>+SIZE (xpi/firefox-i18n-58.0b13/ja.xpi) = 512766
>+SHA256 (xpi/firefox-i18n-58.0b13/ka.xpi) = 6a9a17b081735ab036e6e00834c3a406a49ac72e000e491f2deec00195b805b7
>+SIZE (xpi/firefox-i18n-58.0b13/ka.xpi) = 499586
>+SHA256 (xpi/firefox-i18n-58.0b13/kab.xpi) = b402369ff353faba1a848efaf5f162fab7825753717ba7549d888d2e9ee5fada
>+SIZE (xpi/firefox-i18n-58.0b13/kab.xpi) = 468028
>+SHA256 (xpi/firefox-i18n-58.0b13/kk.xpi) = 13372992ea9fa201de1df2cd8bb72c79dbcaa5f7a7d79d43417a7804aa66ba95
>+SIZE (xpi/firefox-i18n-58.0b13/kk.xpi) = 523596
>+SHA256 (xpi/firefox-i18n-58.0b13/km.xpi) = 9686b573aff4df80cb630d80112f2e478a569d9a9e873f97a79c5287ddfb8228
>+SIZE (xpi/firefox-i18n-58.0b13/km.xpi) = 532324
>+SHA256 (xpi/firefox-i18n-58.0b13/kn.xpi) = 1047b89ee28e2cc60a3b62686e745d9235efb1b77d0815f65ce9a0b40f9f06d2
>+SIZE (xpi/firefox-i18n-58.0b13/kn.xpi) = 535940
>+SHA256 (xpi/firefox-i18n-58.0b13/ko.xpi) = 98ff8d7e454cca00c35ee33864803f9e6788ef24207b23743ab3c89179583f14
>+SIZE (xpi/firefox-i18n-58.0b13/ko.xpi) = 492312
>+SHA256 (xpi/firefox-i18n-58.0b13/lij.xpi) = 4d35c9c5eed73a23a21b0acc3fc9d56cb438d86eb1f611ca145aca0904a5171f
>+SIZE (xpi/firefox-i18n-58.0b13/lij.xpi) = 455541
>+SHA256 (xpi/firefox-i18n-58.0b13/lt.xpi) = 228f05ff56651f5467b35f4a2f1afb3a4a51ec8b7d1eac0a7fef4b68ffc22112
>+SIZE (xpi/firefox-i18n-58.0b13/lt.xpi) = 477092
>+SHA256 (xpi/firefox-i18n-58.0b13/lv.xpi) = c7fa9ef97d49b0ddbb61cf3786135cdfdababca9dad68eab4e71fa61801a7294
>+SIZE (xpi/firefox-i18n-58.0b13/lv.xpi) = 468514
>+SHA256 (xpi/firefox-i18n-58.0b13/mai.xpi) = ae9f9390adb8ea8e9df3a9e805ba5149e65db7ac44ea3a955dde3a2fbab341ec
>+SIZE (xpi/firefox-i18n-58.0b13/mai.xpi) = 509069
>+SHA256 (xpi/firefox-i18n-58.0b13/mk.xpi) = b10ae273eea89b520a1f96b60279707bf5ca41f1607a8dd0bf23f76db50a8067
>+SIZE (xpi/firefox-i18n-58.0b13/mk.xpi) = 492513
>+SHA256 (xpi/firefox-i18n-58.0b13/ml.xpi) = c40dcbb10a4a118d4fd2c67032fd5cb178e14e6cae3ed40e24c6b022bb6a71e0
>+SIZE (xpi/firefox-i18n-58.0b13/ml.xpi) = 546665
>+SHA256 (xpi/firefox-i18n-58.0b13/mr.xpi) = 8848fa0390743021a7373e1ff9b82d687b78e0ae6c65d6737f2e38c5a2923dfd
>+SIZE (xpi/firefox-i18n-58.0b13/mr.xpi) = 523118
>+SHA256 (xpi/firefox-i18n-58.0b13/ms.xpi) = a4936b6c21f1c61aa2ccfdc6e791cc642e9a271af14207a83beb8cf473639b5c
>+SIZE (xpi/firefox-i18n-58.0b13/ms.xpi) = 457059
>+SHA256 (xpi/firefox-i18n-58.0b13/my.xpi) = d8a309b641915532ce098cee4181d893c747ea58b73171a1967bf77cb3d6add7
>+SIZE (xpi/firefox-i18n-58.0b13/my.xpi) = 520422
>+SHA256 (xpi/firefox-i18n-58.0b13/nb-NO.xpi) = f513a8df5805b1e1aa53c401253a61ecb183163e19b4cd88559c37505fcf5894
>+SIZE (xpi/firefox-i18n-58.0b13/nb-NO.xpi) = 456804
>+SHA256 (xpi/firefox-i18n-58.0b13/ne-NP.xpi) = eaebd2f5e64d5db13000889b84bda88a55b1f9ceee401245281c5db0f95c1366
>+SIZE (xpi/firefox-i18n-58.0b13/ne-NP.xpi) = 517046
>+SHA256 (xpi/firefox-i18n-58.0b13/nl.xpi) = dde64ca31ac34885f1d6b3d69395c58e09ff2112cb8b095a64f0ec3b163420f3
>+SIZE (xpi/firefox-i18n-58.0b13/nl.xpi) = 464338
>+SHA256 (xpi/firefox-i18n-58.0b13/nn-NO.xpi) = c2230bfe5a237f4af252aacb8b20cdf9db9edb15d814c7ea2f8d59091daf6035
>+SIZE (xpi/firefox-i18n-58.0b13/nn-NO.xpi) = 456705
>+SHA256 (xpi/firefox-i18n-58.0b13/or.xpi) = 286fec32531641fa74d46c2760366c4e304414504c9c910ae283afb46b8d7534
>+SIZE (xpi/firefox-i18n-58.0b13/or.xpi) = 502587
>+SHA256 (xpi/firefox-i18n-58.0b13/pa-IN.xpi) = 5d65b650780b06c0e8664352553238302f9fe9b06665f1187a6c2471f758fc03
>+SIZE (xpi/firefox-i18n-58.0b13/pa-IN.xpi) = 497515
>+SHA256 (xpi/firefox-i18n-58.0b13/pl.xpi) = e7a3635174f883d06b2f190b79e7b193129644074a7a680d6a3a56a4550981d2
>+SIZE (xpi/firefox-i18n-58.0b13/pl.xpi) = 365324
>+SHA256 (xpi/firefox-i18n-58.0b13/pt-BR.xpi) = dab2334b3f6575c0b37f06516e6db66f1c2aa465cfd7ecbfb0da9b396c816839
>+SIZE (xpi/firefox-i18n-58.0b13/pt-BR.xpi) = 462440
>+SHA256 (xpi/firefox-i18n-58.0b13/pt-PT.xpi) = ab3467b22a49514e842a490d34c025c027c11172b9237c2317719a21e357dfbf
>+SIZE (xpi/firefox-i18n-58.0b13/pt-PT.xpi) = 465749
>+SHA256 (xpi/firefox-i18n-58.0b13/rm.xpi) = 3a8103585e0bd761c38bd2b43bd502adaa6b19d7572d174082f837e953662971
>+SIZE (xpi/firefox-i18n-58.0b13/rm.xpi) = 458240
>+SHA256 (xpi/firefox-i18n-58.0b13/ro.xpi) = 22cd64cf9c60852e0cee86d21f66fb822802f708ebc1f3b4fe9335d2ad5c5984
>+SIZE (xpi/firefox-i18n-58.0b13/ro.xpi) = 458746
>+SHA256 (xpi/firefox-i18n-58.0b13/ru.xpi) = c5a5441236e75ec309f194dc6b7f7040c169a4b3734d74031bbee946a374b290
>+SIZE (xpi/firefox-i18n-58.0b13/ru.xpi) = 531422
>+SHA256 (xpi/firefox-i18n-58.0b13/si.xpi) = 309466ca6bd299bbbeab6dfcde85d25e5144566f88c170b286cc4735848ccbc6
>+SIZE (xpi/firefox-i18n-58.0b13/si.xpi) = 500389
>+SHA256 (xpi/firefox-i18n-58.0b13/sk.xpi) = eb7e0c9b45ae881622a98e3f274539d81cb54c4b30a099fa9d9b3ad1bc268b05
>+SIZE (xpi/firefox-i18n-58.0b13/sk.xpi) = 484544
>+SHA256 (xpi/firefox-i18n-58.0b13/sl.xpi) = fa1d496847410a8ea46135de624607e54c87c4ba9fe3c2cdc90bf0da9ecc5664
>+SIZE (xpi/firefox-i18n-58.0b13/sl.xpi) = 461910
>+SHA256 (xpi/firefox-i18n-58.0b13/son.xpi) = 0b6275f2fca13c105f7857c74a1b67745a4ce0eba648ce30b4aaf86a4b2183da
>+SIZE (xpi/firefox-i18n-58.0b13/son.xpi) = 453958
>+SHA256 (xpi/firefox-i18n-58.0b13/sq.xpi) = 2ee16e07de9525dc40581773a53bb7f5cf1fa22daebac9ba1c023a3f5f2bf2ae
>+SIZE (xpi/firefox-i18n-58.0b13/sq.xpi) = 471954
>+SHA256 (xpi/firefox-i18n-58.0b13/sr.xpi) = 868f17bf905ffc172bd141f0103c1830be667cf2e08a7e9d66c74965481ff2f1
>+SIZE (xpi/firefox-i18n-58.0b13/sr.xpi) = 492195
>+SHA256 (xpi/firefox-i18n-58.0b13/sv-SE.xpi) = 0064764f26ea544f929effeb0d2dbad75f2b6f3bd01f54d669fc6a07fa85e066
>+SIZE (xpi/firefox-i18n-58.0b13/sv-SE.xpi) = 465202
>+SHA256 (xpi/firefox-i18n-58.0b13/ta.xpi) = f808615955af018e0bf823b6711e24c9ee5de2620438cb547cdb07b4ebb81004
>+SIZE (xpi/firefox-i18n-58.0b13/ta.xpi) = 518560
>+SHA256 (xpi/firefox-i18n-58.0b13/te.xpi) = 47310b16e3b82e9d2c11a922b54c16cfe27c6973bdfcefb4854156bc57fb87f4
>+SIZE (xpi/firefox-i18n-58.0b13/te.xpi) = 535197
>+SHA256 (xpi/firefox-i18n-58.0b13/th.xpi) = fe9238eba87ac1afae437f4768aa2b477b5e55bee19a96ea6b214b40cc801288
>+SIZE (xpi/firefox-i18n-58.0b13/th.xpi) = 505465
>+SHA256 (xpi/firefox-i18n-58.0b13/tr.xpi) = a1bc981e5ccf0b340994e40716c5587852946c3ad73608fd9bfbbd2c8162b960
>+SIZE (xpi/firefox-i18n-58.0b13/tr.xpi) = 470489
>+SHA256 (xpi/firefox-i18n-58.0b13/uk.xpi) = 146dc401a55e88dbce63eb43e2107921c915af53b7882e27f6f31a430dc14cf0
>+SIZE (xpi/firefox-i18n-58.0b13/uk.xpi) = 522142
>+SHA256 (xpi/firefox-i18n-58.0b13/ur.xpi) = 57078f2f19193a74231175b4c215cc9b046be783317eee858c58ccba468e4fb1
>+SIZE (xpi/firefox-i18n-58.0b13/ur.xpi) = 514449
>+SHA256 (xpi/firefox-i18n-58.0b13/uz.xpi) = 2b6cf0ae2087227427bb0b2c7a2a0d736d6b64f236e88dc08c94185a1ba015c9
>+SIZE (xpi/firefox-i18n-58.0b13/uz.xpi) = 464526
>+SHA256 (xpi/firefox-i18n-58.0b13/vi.xpi) = 3902ebd3b9ed3eb735328e022969bc78cb4e113dd1bfe85509a696f2d59c6589
>+SIZE (xpi/firefox-i18n-58.0b13/vi.xpi) = 475105
>+SHA256 (xpi/firefox-i18n-58.0b13/xh.xpi) = b8efa4b6bf7f603878a0333178a02f0d105a45104d3ca0246f931c8f8fa5f538
>+SIZE (xpi/firefox-i18n-58.0b13/xh.xpi) = 467386
>+SHA256 (xpi/firefox-i18n-58.0b13/zh-CN.xpi) = 0edc0f71bd033047c74ddb705bbd5e9baf5923e85dcc95d56cbad2d3f3586d54
>+SIZE (xpi/firefox-i18n-58.0b13/zh-CN.xpi) = 489516
>+SHA256 (xpi/firefox-i18n-58.0b13/zh-TW.xpi) = 7b5474ad82a5b9e3c7b1c8986f55cf17bc59a5ff4e0c587dbf74bcf8131e985a
>+SIZE (xpi/firefox-i18n-58.0b13/zh-TW.xpi) = 487147
>diff --git a/www/firefox/Makefile b/www/firefox/Makefile
>index 8a07f48e693c..e9a24b0672db 100644
>--- a/www/firefox/Makefile
>+++ b/www/firefox/Makefile
>@@ -2,24 +2,23 @@
> # $FreeBSD$
> 
> PORTNAME=	firefox
>-DISTVERSION=	57.0.2
>-PORTREVISION=	1
>+DISTVERSION=	58.0b13
> PORTEPOCH=	1
> CATEGORIES=	www ipv6
> MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \
>-		MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build2/source
>+		MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source
> DISTFILES=	${DISTNAME}.source${EXTRACT_SUFX}
> 
> MAINTAINER=	gecko@FreeBSD.org
> COMMENT=	Web browser based on the browser portion of Mozilla
> 
> BUILD_DEPENDS=	nspr>=4.17:devel/nspr \
>-		nss>=3.33:security/nss \
>+		nss>=3.34.1:security/nss \
> 		icu>=59.1,1:devel/icu \
> 		libevent>=2.1.8:devel/libevent \
>-		harfbuzz>=1.5.1:print/harfbuzz \
>+		harfbuzz>=1.7.2:print/harfbuzz \
> 		graphite2>=1.3.10:graphics/graphite2 \
>-		png>=1.6.31:graphics/png \
>+		png>=1.6.34:graphics/png \
> 		libvorbis>=1.3.5,3:audio/libvorbis \
> 		libvpx>=1.5.0:multimedia/libvpx \
> 		sqlite3>=3.20.1:databases/sqlite3 \
>diff --git a/www/firefox/distinfo b/www/firefox/distinfo
>index 993d57217eb1..ee9c5163e6c6 100644
>--- a/www/firefox/distinfo
>+++ b/www/firefox/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1512592860
>-SHA256 (firefox-57.0.2.source.tar.xz) = cad021a13daf8fd2c951fab763e784c82aabef45e68a34c941fb64d62f1a5707
>-SIZE (firefox-57.0.2.source.tar.xz) = 248772480
>+TIMESTAMP = 1514295516
>+SHA256 (firefox-58.0b13.source.tar.xz) = 4e91c0f574d7b205f5e7c09f069a7c57384e7a7d92428217fb9b1c6cc56e42aa
>+SIZE (firefox-58.0b13.source.tar.xz) = 249197352
>diff --git a/www/firefox/files/patch-bug1186967 b/www/firefox/files/patch-bug1186967
>deleted file mode 100644
>index 26d304fbd3e9..000000000000
>--- a/www/firefox/files/patch-bug1186967
>+++ /dev/null
>@@ -1,41 +0,0 @@
>-commit 64bb4e051b50
>-Author: Martin Stransky <stransky@redhat.com>
>-Date:   Tue Oct 17 09:50:18 2017 +0200
>-
>-    Bug 1186967 - ignore double-click on WM without _NET_WM_MOVERESIZE support, r=jhorak
>-    
>-    MozReview-Commit-ID: 2Vs6i5leero
>-    
>-    --HG--
>-    extra : rebase_source : d8f2bbaf9ef9b2025478f029a68ee7e87e07de79
>----
>- widget/gtk/nsWindow.cpp | 16 ++++++++++++++++
>- 1 file changed, 16 insertions(+)
>-
>-diff --git widget/gtk/nsWindow.cpp widget/gtk/nsWindow.cpp
>-index eb2f0e5e95cd..955327297ac9 100644
>---- widget/gtk/nsWindow.cpp
>-+++ widget/gtk/nsWindow.cpp
>-@@ -6444,6 +6444,22 @@ nsWindow::GetDragInfo(WidgetMouseEvent* aMouseEvent,
>-         return false;
>-     }
>- 
>-+    if (mIsX11Display) {
>-+      // Workaround for https://bugzilla.gnome.org/show_bug.cgi?id=789054
>-+      // To avoid crashes disable double-click on WM without _NET_WM_MOVERESIZE.
>-+      // See _should_perform_ewmh_drag() at gdkwindow-x11.c
>-+      GdkScreen* screen = gdk_window_get_screen(gdk_window);
>-+      GdkAtom atom = gdk_atom_intern("_NET_WM_MOVERESIZE", FALSE);
>-+      if (!gdk_x11_screen_supports_net_wm_hint(screen, atom)) {
>-+          static unsigned int lastTimeStamp = 0;
>-+          if (lastTimeStamp != aMouseEvent->mTime) {
>-+              lastTimeStamp = aMouseEvent->mTime;
>-+          } else {
>-+              return false;
>-+          }
>-+      }
>-+    }
>-+
>-     // FIXME: It would be nice to have the widget position at the time
>-     // of the event, but it's relatively unlikely that the widget has
>-     // moved since the mousedown.  (On the other hand, it's quite likely
>diff --git a/www/firefox/files/patch-bug1366201 b/www/firefox/files/patch-bug1366201
>deleted file mode 100644
>index 0ee5140e1b9a..000000000000
>--- a/www/firefox/files/patch-bug1366201
>+++ /dev/null
>@@ -1,40 +0,0 @@
>-commit 139967a109c1
>-Author: Jean-Yves Avenard <jyavenard@mozilla.com>
>-Date:   Wed Oct 25 18:25:37 2017 +0200
>-
>-    Bug 1366201 - P5. Get around FFmpeg bug with corrupted data. r=gerald
>-    
>-    According to FFmpeg documentation, the out parameter is "set to size of parsed buffer or zero if not yet finished. " however this is only the case if no error occurred; otherwise it is left untouched.
>-    
>-    We want the invalid content to generate a decoding error, so we set size to inputSize to ensure decoding failed later.
>-    
>-    MozReview-Commit-ID: FZeiZUdUtLG
>----
>- dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp | 4 ++--
>- 1 file changed, 2 insertions(+), 2 deletions(-)
>-
>-diff --git dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp
>-index 6acc8fef4dd8..fdee880c9e3b 100644
>---- dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp
>-+++ dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp
>-@@ -212,18 +212,18 @@ FFmpegVideoDecoder<LIBAV_VER>::DoDecode(MediaRawData* aSample, bool* aGotFrame,
>- 
>- #if LIBAVCODEC_VERSION_MAJOR >= 54
>-   if (inputSize && mCodecParser && (mCodecID == AV_CODEC_ID_VP8
>- #if LIBAVCODEC_VERSION_MAJOR >= 55
>-       || mCodecID == AV_CODEC_ID_VP9
>- #endif
>-       )) {
>-     while (inputSize) {
>--      uint8_t* data;
>--      int size;
>-+      uint8_t* data = inputData;
>-+      int size = inputSize;
>-       int len = mLib->av_parser_parse2(
>-         mCodecParser, mCodecContext, &data, &size, inputData, inputSize,
>-         aSample->mTime.ToMicroseconds(), aSample->mTimecode.ToMicroseconds(),
>-         aSample->mOffset);
>-       if (size_t(len) > inputSize) {
>-         return NS_ERROR_DOM_MEDIA_DECODE_ERR;
>-       }
>-       inputData += len;
>diff --git a/www/firefox/files/patch-bug1412558 b/www/firefox/files/patch-bug1412558
>deleted file mode 100644
>index b6d3b045eae5..000000000000
>--- a/www/firefox/files/patch-bug1412558
>+++ /dev/null
>@@ -1,83 +0,0 @@
>-diff --git dom/media/flac/FlacDecoder.cpp dom/media/flac/FlacDecoder.cpp
>-index 53fc3c9937f7..b23771ab80fa 100644
>---- dom/media/flac/FlacDecoder.cpp
>-+++ dom/media/flac/FlacDecoder.cpp
>-@@ -7,6 +7,7 @@
>- #include "FlacDecoder.h"
>- #include "MediaContainerType.h"
>- #include "MediaPrefs.h"
>-+#include "PDMFactory.h"
>- 
>- namespace mozilla {
>- 
>-@@ -15,6 +16,10 @@ FlacDecoder::IsEnabled()
>- {
>- #ifdef MOZ_FFVPX
>-   return MediaPrefs::FlacEnabled();
>-+#elif defined(MOZ_FFMPEG)
>-+  RefPtr<PDMFactory> platform = new PDMFactory();
>-+  return MediaPrefs::FlacEnabled() && platform->SupportsMimeType(NS_LITERAL_CSTRING("audio/flac"),
>-+                                    /* DecoderDoctorDiagnostics* */ nullptr);
>- #else
>-   // Until bug 1295886 is fixed.
>-   return false;
>-diff --git media/ffvpx/README_MOZILLA media/ffvpx/README_MOZILLA
>-index 5d3a6037efe0..43144b726a92 100644
>---- media/ffvpx/README_MOZILLA
>-+++ media/ffvpx/README_MOZILLA
>-@@ -17,14 +17,6 @@ configuration files were generated as follow using the configure script:
>- config*:
>- replace: /HAVE_(MALLOC_H|ARC4RANDOM|LOCALTIME_R|MEMALIGN|POSIX_MEMALIGN)/d
>- 
>--config_darwin32.h:
>--add to configure command: --disable-asm --disable-yasm --cc='clang -m32'
>--
>--config_unix32.h:
>--add to configure command: --disable-asm --disable-yasm --cc='clang -m32'
>--replace: s/HAVE_SYSCTL 1/HAVE_SYSCTL 0/ and s/HAVE_MEMALIGN 1/HAVE_MEMALIGN 0/ and s/HAVE_POSIX_MEMALIGN 1/HAVE_POSIX_MEMALIGN 0/
>--
>--
>- config_unix64.h/config_unix64.asm:
>- replace: s/HAVE_SYSCTL 1/HAVE_SYSCTL 0
>- 
>-diff --git media/ffvpx/config.h media/ffvpx/config.h
>-index dab01e05cd65..26ebe529bd98 100644
>---- media/ffvpx/config.h
>-+++ media/ffvpx/config.h
>-@@ -27,17 +27,9 @@
>- #define HAVE_LIBC_MSVCRT 0
>- #endif
>- #elif defined(XP_DARWIN)
>--#if defined(HAVE_64BIT_BUILD)
>- #include "config_darwin64.h"
>--#else
>--#include "config_darwin32.h"
>--#endif
>- #elif defined(XP_UNIX)
>--#if defined(HAVE_64BIT_BUILD)
>- #include "config_unix64.h"
>--#else
>--#include "config_unix32.h"
>--#endif
>- #endif
>- #include "config_common.h"
>- #endif // MOZ_FFVPX_CONFIG_H
>-diff --git old-configure.in old-configure.in
>-index b8ce71278548..410be683c2f6 100644
>---- old-configure.in
>-+++ old-configure.in
>-@@ -3279,11 +3279,11 @@ dnl = FFmpeg's ffvpx configuration
>- dnl ========================================================
>- 
>- MOZ_FFVPX=
>--case "$CPU_ARCH" in
>--  x86)
>-+case "$OS_ARCH:$CPU_ARCH" in
>-+  WINNT:x86)
>-       MOZ_FFVPX=1
>-   ;;
>--  x86_64)
>-+  *:x86_64)
>-       MOZ_FFVPX=1
>-   ;;
>- esac
>diff --git a/www/firefox/files/patch-bug1414440 b/www/firefox/files/patch-bug1414440
>deleted file mode 100644
>index 1b82917bebb5..000000000000
>--- a/www/firefox/files/patch-bug1414440
>+++ /dev/null
>@@ -1,108 +0,0 @@
>-Always build libyuv x86 optimizations with Clang.
>-
>-diff --git media/libyuv/libyuv/include/libyuv/compare_row.h media/libyuv/libyuv/include/libyuv/compare_row.h
>-index 7abc2d4aef8f..542df1ef504b 100644
>---- media/libyuv/libyuv/include/libyuv/compare_row.h
>-+++ media/libyuv/libyuv/include/libyuv/compare_row.h
>-@@ -19,7 +19,7 @@ extern "C" {
>- #endif
>- 
>- #if defined(__pnacl__) || defined(__CLR_VER) || \
>--    (defined(__i386__) && !defined(__SSE2__))
>-+    (defined(__i386__) && !defined(__SSE__) && !defined(__clang__))
>- #define LIBYUV_DISABLE_X86
>- #endif
>- // MemorySanitizer does not support assembly code yet. http://crbug.com/344505
>-diff --git media/libyuv/libyuv/include/libyuv/planar_functions.h media/libyuv/libyuv/include/libyuv/planar_functions.h
>-index 040839c211b1..5f6a8034d209 100644
>---- media/libyuv/libyuv/include/libyuv/planar_functions.h
>-+++ media/libyuv/libyuv/include/libyuv/planar_functions.h
>-@@ -720,7 +720,7 @@ int I420Interpolate(const uint8* src0_y,
>-                     int interpolation);
>- 
>- #if defined(__pnacl__) || defined(__CLR_VER) || \
>--    (defined(__i386__) && !defined(__SSE2__))
>-+    (defined(__i386__) && !defined(__SSE__) && !defined(__clang__))
>- #define LIBYUV_DISABLE_X86
>- #endif
>- // MemorySanitizer does not support assembly code yet. http://crbug.com/344505
>-diff --git media/libyuv/libyuv/include/libyuv/rotate_row.h media/libyuv/libyuv/include/libyuv/rotate_row.h
>-index 2c51584eee8b..8e60a713c4cf 100644
>---- media/libyuv/libyuv/include/libyuv/rotate_row.h
>-+++ media/libyuv/libyuv/include/libyuv/rotate_row.h
>-@@ -19,7 +19,7 @@ extern "C" {
>- #endif
>- 
>- #if defined(__pnacl__) || defined(__CLR_VER) || \
>--    (defined(__i386__) && !defined(__SSE2__))
>-+    (defined(__i386__) && !defined(__SSE__) && !defined(__clang__))
>- #define LIBYUV_DISABLE_X86
>- #endif
>- // MemorySanitizer does not support assembly code yet. http://crbug.com/344505
>-diff --git media/libyuv/libyuv/include/libyuv/row.h media/libyuv/libyuv/include/libyuv/row.h
>-index f74bd9f7d17a..b8f674ba124d 100644
>---- media/libyuv/libyuv/include/libyuv/row.h
>-+++ media/libyuv/libyuv/include/libyuv/row.h
>-@@ -31,7 +31,7 @@ extern "C" {
>-   var = 0
>- 
>- #if defined(__pnacl__) || defined(__CLR_VER) || \
>--    (defined(__i386__) && !defined(__SSE2__))
>-+    (defined(__i386__) && !defined(__SSE__) && !defined(__clang__))
>- #define LIBYUV_DISABLE_X86
>- #endif
>- // MemorySanitizer does not support assembly code yet. http://crbug.com/344505
>-diff --git media/libyuv/libyuv/include/libyuv/scale_row.h media/libyuv/libyuv/include/libyuv/scale_row.h
>-index edb46cc8c647..2b2c7a0700ef 100644
>---- media/libyuv/libyuv/include/libyuv/scale_row.h
>-+++ media/libyuv/libyuv/include/libyuv/scale_row.h
>-@@ -20,7 +20,7 @@ extern "C" {
>- #endif
>- 
>- #if defined(__pnacl__) || defined(__CLR_VER) || \
>--    (defined(__i386__) && !defined(__SSE2__))
>-+    (defined(__i386__) && !defined(__SSE__) && !defined(__clang__))
>- #define LIBYUV_DISABLE_X86
>- #endif
>- // MemorySanitizer does not support assembly code yet. http://crbug.com/344505
>-diff --git media/libyuv/libyuv/linux.mk media/libyuv/libyuv/linux.mk
>-index 923345ae4d12..9e555e303913 100644
>---- media/libyuv/libyuv/linux.mk
>-+++ media/libyuv/libyuv/linux.mk
>-@@ -80,4 +80,4 @@ cpuid: util/cpuid.c libyuv.a
>- 	$(CC) $(CFLAGS) -o $@ util/cpuid.c libyuv.a
>- 
>- clean:
>--	/bin/rm -f source/*.o *.ii *.s libyuv.a convert cpuid psnr
>-+	/bin/rm -f source/*.o *.ii *.s libyuv.a yuvconvert cpuid psnr
>-diff --git media/libyuv/libyuv/source/row_gcc.cc media/libyuv/libyuv/source/row_gcc.cc
>-index 8735070b619d..9df8c6a627db 100644
>---- media/libyuv/libyuv/source/row_gcc.cc
>-+++ media/libyuv/libyuv/source/row_gcc.cc
>-@@ -5479,7 +5479,7 @@ void HalfFloatRow_SSE2(const uint16* src, uint16* dst, float scale, int width) {
>-   : "+r"(src),    // %0
>-     "+r"(dst),    // %1
>-     "+r"(width)   // %2
>--  : "x"(scale * kScaleBias)   // %3
>-+  : "mx"(scale * kScaleBias)   // %3
>-   : "memory", "cc",
>-     "xmm2", "xmm3", "xmm4", "xmm5"
>-   );
>-@@ -5515,7 +5515,7 @@ void HalfFloatRow_AVX2(const uint16* src, uint16* dst, float scale, int width) {
>-   : "+r"(src),    // %0
>-     "+r"(dst),    // %1
>-     "+r"(width)   // %2
>--  : "x"(scale * kScaleBias)   // %3
>-+  : "mx"(scale * kScaleBias)   // %3
>-   : "memory", "cc",
>-     "xmm2", "xmm3", "xmm4", "xmm5"
>-   );
>-@@ -5548,7 +5548,7 @@ void HalfFloatRow_F16C(const uint16* src, uint16* dst, float scale, int width) {
>-   : "+r"(src),   // %0
>-     "+r"(dst),   // %1
>-     "+r"(width)  // %2
>--  : "x"(scale)   // %3
>-+  : "mx"(scale)  // %3
>-   : "memory", "cc",
>-     "xmm2", "xmm3", "xmm4"
>-   );
>diff --git a/www/firefox/files/patch-bug826985 b/www/firefox/files/patch-bug826985
>index 8e9e7d24a024..69a51707c051 100644
>--- a/www/firefox/files/patch-bug826985
>+++ b/www/firefox/files/patch-bug826985
>@@ -13,32 +13,32 @@ Date:   Fri Jan 4 13:49:22 2013 +0100
>  toolkit/library/Makefile.in                             |  1 +
>  6 files changed, 52 insertions(+), 1 deletion(-)
> 
>-diff --git config/system-headers config/system-headers
>-index 55e4cd1..76567b3 100644
>---- config/system-headers
>-+++ config/system-headers
>-@@ -624,6 +624,7 @@ libgnome/libgnome.h
>- libgnomeui/gnome-icon-lookup.h
>- libgnomeui/gnome-icon-theme.h
>- libgnomeui/gnome-ui-init.h
>-+libv4l2.h
>- limits.h
>- link.h
>- #ifdef ANDROID
>+diff --git config/system-headers.mozbuild config/system-headers.mozbuild
>+index e02d381a12e9..7620b4d00623 100644
>+--- config/system-headers.mozbuild
>++++ config/system-headers.mozbuild
>+@@ -428,6 +428,7 @@ system_headers = [
>+     'libgnomeui/gnome-icon-theme.h',
>+     'libgnomeui/gnome-ui-init.h',
>+     'libutil.h',
>++    'libv4l2.h',
>+     'limits.h',
>+     'link.h',
>+     'linux/ioprio.h',
> diff --git old-configure.in configure.in
> index 55e4cd1..76567b3 100644
> --- old-configure.in
> +++ old-configure.in
>-@@ -5309,6 +5309,9 @@ if test -n "$MOZ_WEBRTC"; then
>-     MOZ_VP8_ENCODER=1
>-     MOZ_VP8_ERROR_CONCEALMENT=1
>- 
>+@@ -2558,6 +2558,9 @@ if test -n "$MOZ_WEBRTC"; then
>+     if test -n "$MOZ_X11"; then
>+       MOZ_WEBRTC_X11_LIBS="-lXext -lXdamage -lXfixes -lXcomposite"
>+     fi
>++
> +    dnl with libv4l2 we can support more cameras
> +    PKG_CHECK_MODULES(MOZ_LIBV4L2, libv4l2)
>-+
>- dnl enable once Signaling lands
>-     MOZ_WEBRTC_SIGNALING=1
>-     AC_DEFINE(MOZ_WEBRTC_SIGNALING)
>+ else
>+     MOZ_SYNTH_PICO=
>+ fi
> diff --git build/gyp.mozbuild build/gyp.mozbuild
> index b483cd1..f1dd1f0 100644
> --- build/gyp.mozbuild
>diff --git a/www/firefox/files/patch-bug847568 b/www/firefox/files/patch-bug847568
>index ed16b8d7caac..b9752599971c 100644
>--- a/www/firefox/files/patch-bug847568
>+++ b/www/firefox/files/patch-bug847568
>@@ -1,43 +1,34 @@
> # Allow building against system-wide graphite2/harfbuzz.
> 
>-diff --git config/Makefile.in config/Makefile.in
>-index e2e11dc0e27e..a6206bb0ff30 100644
>---- config/Makefile.in
>-+++ config/Makefile.in
>-@@ -41,6 +41,8 @@ export:: $(export-preqs)
>- 	$(PYTHON) -m mozbuild.action.preprocessor $(DEFINES) $(ACDEFINES) \
>- 		-DMOZ_TREE_CAIRO=$(MOZ_TREE_CAIRO) \
>- 		-DMOZ_TREE_PIXMAN=$(MOZ_TREE_PIXMAN) \
>-+		-DMOZ_SYSTEM_GRAPHITE2=$(MOZ_SYSTEM_GRAPHITE2) \
>-+		-DMOZ_SYSTEM_HARFBUZZ=$(MOZ_SYSTEM_HARFBUZZ) \
>- 		-DMOZ_SYSTEM_HUNSPELL=$(MOZ_SYSTEM_HUNSPELL) \
>- 		-DMOZ_SYSTEM_BZ2=$(MOZ_SYSTEM_BZ2) \
>- 		-DMOZ_SYSTEM_ZLIB=$(MOZ_SYSTEM_ZLIB) \
>-diff --git config/system-headers config/system-headers
>-index a0c53c651a3e..5ee7f71f9634 100644
>---- config/system-headers
>-+++ config/system-headers
>-@@ -1269,6 +1269,15 @@ libsn/sn-launcher.h
>- libsn/sn-monitor.h
>- libsn/sn-util.h
>- #endif
>-+#if MOZ_SYSTEM_GRAPHITE2==1
>-+graphite2/Font.h
>-+graphite2/Segment.h
>-+#endif
>-+#if MOZ_SYSTEM_HARFBUZZ==1
>-+harfbuzz/hb-glib.h
>-+harfbuzz/hb-ot.h
>-+harfbuzz/hb.h
>-+#endif
>- #if MOZ_SYSTEM_HUNSPELL==1
>- hunspell.hxx
>- #endif
>+diff --git config/system-headers.mozbuild config/system-headers.mozbuild
>+index 7620b4d00623..09d3db5ca8c0 100644
>+--- config/system-headers.mozbuild
>++++ config/system-headers.mozbuild
>+@@ -1312,6 +1312,19 @@ if not CONFIG['MOZ_TREE_PIXMAN']:
>+         'pixman.h',
>+     ]
>+ 
>++if CONFIG['MOZ_SYSTEM_GRAPHITE2']:
>++    system_headers += [
>++        'graphite2/Font.h',
>++        'graphite2/Segment.h',
>++    ]
>++
>++if CONFIG['MOZ_SYSTEM_HARFBUZZ']:
>++    system_headers += [
>++        'harfbuzz/hb-glib.h',
>++        'harfbuzz/hb-ot.h',
>++        'harfbuzz/hb.h',
>++    ]
>++
>+ if CONFIG['MOZ_SYSTEM_LIBVPX']:
>+     system_headers += [
>+         'vpx_mem/vpx_mem.h',
> diff --git dom/base/moz.build dom/base/moz.build
> index 8e19020315ae..2fcdbb6f7b42 100644
> --- dom/base/moz.build
> +++ dom/base/moz.build
>-@@ -464,6 +464,9 @@ if CONFIG['MOZ_BUILD_APP'] in ['browser', 'mobile/android', 'xulrunner']:
>+@@ -470,6 +470,9 @@ if CONFIG['MOZ_BUILD_APP'] in ['browser', 'mobile/android', 'xulrunner']:
>  if CONFIG['MOZ_X11']:
>      CXXFLAGS += CONFIG['TK_CFLAGS']
>  
>@@ -120,7 +111,7 @@ diff --git gfx/skia/generate_mozbuild.py gfx/skia/generate_mozbuild.py
> index e06ae3457a47..93faa61594a3 100755
> --- gfx/skia/generate_mozbuild.py
> +++ gfx/skia/generate_mozbuild.py
>-@@ -143,6 +143,9 @@ if CONFIG['CLANG_CXX'] or CONFIG['CLANG_CL']:
>+@@ -135,6 +135,9 @@ if CONFIG['CLANG_CXX'] or CONFIG['CLANG_CL']:
>          '-Wno-unused-private-field',
>      ]
>  
>@@ -134,7 +125,7 @@ diff --git gfx/skia/moz.build gfx/skia/moz.build
> index 2118677ca3a8..e4978b413784 100644
> --- gfx/skia/moz.build
> +++ gfx/skia/moz.build
>-@@ -753,6 +753,9 @@ if CONFIG['CLANG_CXX'] or CONFIG['CLANG_CL']:
>+@@ -780,6 +780,9 @@ if CONFIG['CLANG_CXX'] or CONFIG['CLANG_CL']:
>          '-Wno-unused-private-field',
>      ]
>  
>@@ -148,7 +139,7 @@ diff --git gfx/thebes/moz.build gfx/thebes/moz.build
> index 56f1b9fe3f4b..0ac1100b0df3 100644
> --- gfx/thebes/moz.build
> +++ gfx/thebes/moz.build
>-@@ -269,7 +269,13 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3'):
>+@@ -267,7 +267,13 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3'):
>  
>  LOCAL_INCLUDES += CONFIG['SKIA_INCLUDES']
>  
>@@ -167,9 +158,9 @@ 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
>-@@ -29,4 +29,7 @@ if CONFIG['ENABLE_INTL_API']:
>-         'ICUUtils.cpp',
>-     ]
>+@@ -25,4 +25,7 @@ UNIFIED_SOURCES += [
>+     'nsUnicodeProperties.cpp',
>+ ]
>  
> +if CONFIG['MOZ_SYSTEM_HARFBUZZ']:
> +    CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS']
>@@ -179,24 +170,22 @@ diff --git netwerk/dns/moz.build netwerk/dns/moz.build
> index 79c26e3e7001..c4d93bc5f7dc 100644
> --- netwerk/dns/moz.build
> +++ netwerk/dns/moz.build
>-@@ -69,6 +69,9 @@ LOCAL_INCLUDES += [
>-     '/netwerk/base',
>- ]
>+@@ -73,3 +73,6 @@ USE_LIBS += ['icu']
>  
>+ if CONFIG['GNU_CXX']:
>+     CXXFLAGS += ['-Wno-error=shadow']
>++
> +if CONFIG['MOZ_SYSTEM_HARFBUZZ']:
> +    CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS']
>-+
>- if CONFIG['ENABLE_INTL_API']:
>-     DEFINES['IDNA2008'] = True
>-     USE_LIBS += ['icu']
> diff --git old-configure.in old-configure.in
> index 95a58b634593..b614eef85c89 100644
> --- old-configure.in
> +++ old-configure.in
>-@@ -4888,6 +4888,27 @@ dnl ========================================================
>+@@ -4333,6 +4333,27 @@ dnl ========================================================
>+ 
>  AC_SUBST(MOZ_LINUX_32_SSE2_STARTUP_ERROR)
>  
>- dnl ========================================================
>++dnl ========================================================
> +dnl Check for graphite2
> +dnl ========================================================
> +if test -n "$MOZ_SYSTEM_GRAPHITE2"; then
>@@ -217,15 +206,14 @@ index 95a58b634593..b614eef85c89 100644
> +    CFLAGS=$_SAVE_CFLAGS
> +fi
> +
>-+dnl ========================================================
>+ dnl ========================================================
>  dnl Check for pixman and cairo
>  dnl ========================================================
>- 
> diff --git toolkit/library/moz.build toolkit/library/moz.build
> index 24f940e1ed7e..079a575adec3 100644
> --- toolkit/library/moz.build
> +++ toolkit/library/moz.build
>-@@ -224,6 +224,12 @@ if CONFIG['MOZ_SYSTEM_JPEG']:
>+@@ -231,6 +231,12 @@ if CONFIG['MOZ_SYSTEM_JPEG']:
>  if CONFIG['MOZ_SYSTEM_PNG']:
>      OS_LIBS += CONFIG['MOZ_PNG_LIBS']
>  
>@@ -242,9 +230,9 @@ diff --git toolkit/moz.configure toolkit/moz.configure
> index 9297e4d6f501..d8e273887e4b 100644
> --- toolkit/moz.configure
> +++ toolkit/moz.configure
>-@@ -356,6 +356,26 @@ add_old_configure_assignment('FT2_LIBS',
>+@@ -1065,6 +1065,26 @@ add_old_configure_assignment('FT2_LIBS',
>  add_old_configure_assignment('FT2_CFLAGS',
>-                              delayed_getattr(ft2_info, 'cflags'))
>+                              ft2_info.cflags)
>  
> +# Graphite2
> +# ==============================================================
>@@ -261,11 +249,11 @@ index 9297e4d6f501..d8e273887e4b 100644
> +option('--with-system-harfbuzz',
> +       help="Use system harfbuzz (located with pkgconfig)")
> +
>-+system_harfbuzz = pkg_check_modules('MOZ_HARFBUZZ', 'harfbuzz >= 1.5.1',
>++system_harfbuzz = pkg_check_modules('MOZ_HARFBUZZ', 'harfbuzz >= 1.7.2',
> +                                    when='--with-system-harfbuzz')
> +
> +set_config('MOZ_SYSTEM_HARFBUZZ', depends_if(system_harfbuzz)(lambda _: True))
> +
>- # Apple platform decoder support
>+ # Mortar
>  # ==============================================================
>- @depends(toolkit)
>+ option('--enable-mortar', help='Enable mortar extension')
>diff --git a/www/firefox/files/patch-dom_media_flac_FlacDecoder.cpp b/www/firefox/files/patch-dom_media_flac_FlacDecoder.cpp
>new file mode 100644
>index 000000000000..1df3736c2211
>--- /dev/null
>+++ b/www/firefox/files/patch-dom_media_flac_FlacDecoder.cpp
>@@ -0,0 +1,25 @@
>+Enable FLAC on platforms without ffvpx like powerpc*
>+
>+diff --git dom/media/flac/FlacDecoder.cpp dom/media/flac/FlacDecoder.cpp
>+index 53fc3c9937f7..b23771ab80fa 100644
>+--- dom/media/flac/FlacDecoder.cpp
>++++ dom/media/flac/FlacDecoder.cpp
>+@@ -7,6 +7,7 @@
>+ #include "FlacDecoder.h"
>+ #include "MediaContainerType.h"
>+ #include "MediaPrefs.h"
>++#include "PDMFactory.h"
>+ 
>+ namespace mozilla {
>+ 
>+@@ -15,6 +16,10 @@ FlacDecoder::IsEnabled()
>+ {
>+ #ifdef MOZ_FFVPX
>+   return MediaPrefs::FlacEnabled();
>++#elif defined(MOZ_FFMPEG)
>++  RefPtr<PDMFactory> platform = new PDMFactory();
>++  return MediaPrefs::FlacEnabled() && platform->SupportsMimeType(NS_LITERAL_CSTRING("audio/flac"),
>++                                    /* DecoderDoctorDiagnostics* */ nullptr);
>+ #else
>+   // Until bug 1295886 is fixed.
>+   return false;
>diff --git a/www/firefox/files/patch-toolkit_moz.configure b/www/firefox/files/patch-toolkit_moz.configure
>new file mode 100644
>index 000000000000..6927df0b3ce5
>--- /dev/null
>+++ b/www/firefox/files/patch-toolkit_moz.configure
>@@ -0,0 +1,15 @@
>+diff --git toolkit/moz.configure toolkit/moz.configure
>+index 1befea00c485..7999b7acd5bd 100644
>+--- toolkit/moz.configure
>++++ toolkit/moz.configure
>+@@ -842,8 +842,8 @@ def webrender(value, milestone):
>+     enable_webrender = None
>+ 
>+     if value.origin == 'default':
>+-        # if nothing is specified, default to just building on Nightly
>+-        build_webrender = milestone.is_nightly
>++        # build by default downstream
>++        build_webrender = True
>+     elif len(value) and value[0] == 'build':
>+         # if explicitly set to 'build', then we build but don't enable
>+         build_webrender = True
>diff --git a/www/firefox/files/patch-z-bug517422 b/www/firefox/files/patch-z-bug517422
>index debf8d5a7afd..3e37f43324e7 100644
>--- a/www/firefox/files/patch-z-bug517422
>+++ b/www/firefox/files/patch-z-bug517422
>@@ -4,7 +4,7 @@ diff --git build/moz.configure/old.configure build/moz.configure/old.configure
> index d0fe7accffe6..c46bdd023225 100644
> --- build/moz.configure/old.configure
> +++ build/moz.configure/old.configure
>-@@ -288,7 +288,12 @@ def old_configure_options(*options):
>+@@ -285,7 +285,12 @@ def old_configure_options(*options):
>      '--with-system-libvpx',
>      '--with-system-nspr',
>      '--with-system-nss',
>@@ -17,29 +17,13 @@ index d0fe7accffe6..c46bdd023225 100644
>      '--with-system-zlib',
>      '--with-thumb',
>      '--with-thumb-interwork',
>-diff --git config/Makefile.in config/Makefile.in
>-index a6206bb0ff30..f20987c61754 100644
>---- config/Makefile.in
>-+++ config/Makefile.in
>-@@ -51,6 +51,11 @@ export:: $(export-preqs)
>- 		-DMOZ_SYSTEM_LIBEVENT=$(MOZ_SYSTEM_LIBEVENT) \
>- 		-DMOZ_SYSTEM_LIBVPX=$(MOZ_SYSTEM_LIBVPX) \
>- 		-DMOZ_SYSTEM_ICU=$(MOZ_SYSTEM_ICU) \
>-+		-DMOZ_SYSTEM_OGG=$(MOZ_SYSTEM_OGG) \
>-+		-DMOZ_SYSTEM_THEORA=$(MOZ_SYSTEM_THEORA) \
>-+		-DMOZ_SYSTEM_VORBIS=$(MOZ_SYSTEM_VORBIS) \
>-+		-DMOZ_SYSTEM_TREMOR=$(MOZ_SYSTEM_TREMOR) \
>-+		-DMOZ_SYSTEM_SOUNDTOUCH=$(MOZ_SYSTEM_SOUNDTOUCH) \
>- 		$(srcdir)/system-headers $(srcdir)/stl-headers | $(PERL) $(topsrcdir)/nsprpub/config/make-system-wrappers.pl system_wrappers
>- 	$(INSTALL) system_wrappers $(DIST)
>- 
> diff --git config/external/moz.build config/external/moz.build
> index 029ff8504795..2c3a40caa1ba 100644
> --- config/external/moz.build
> +++ config/external/moz.build
>-@@ -21,12 +21,21 @@ if CONFIG['MOZ_UPDATER']:
>- external_dirs += ['modules/brotli']
>- external_dirs += ['modules/woff2']
>+@@ -23,12 +23,21 @@ external_dirs += ['modules/woff2']
>+ 
>+ external_dirs += ['modules/xz-embedded']
>  
> -if CONFIG['MOZ_VORBIS']:
> +if not CONFIG['MOZ_SYSTEM_OGG']:
>@@ -61,7 +45,7 @@ index 029ff8504795..2c3a40caa1ba 100644
>  if CONFIG['MOZ_WEBM_ENCODER']:
>      external_dirs += ['media/libmkv']
>  
>-@@ -52,12 +61,9 @@ external_dirs += [
>+@@ -51,12 +60,9 @@ external_dirs += [
>      'media/kiss_fft',
>      'media/libcubeb',
>      'media/libnestegg',
>@@ -74,33 +58,44 @@ index 029ff8504795..2c3a40caa1ba 100644
>      'media/psshparser'
>  ]
>  
>-diff --git config/system-headers config/system-headers
>-index 5ee7f71f9634..13178ac3b3ab 100644
>---- config/system-headers
>-+++ config/system-headers
>-@@ -1348,3 +1348,17 @@ unicode/utypes.h
>- libutil.h
>- unwind.h
>- fenv.h
>-+#if MOZ_SYSTEM_OGG==1
>-+ogg/ogg.h
>-+ogg/os_types.h
>-+#endif
>-+#if MOZ_SYSTEM_THEORA==1
>-+theora/theoradec.h
>-+#endif
>-+#if MOZ_SYSTEM_VORBIS==1
>-+vorbis/codec.h
>-+vorbis/vorbisenc.h
>-+#endif
>-+#if MOZ_SYSTEM_TREMOR==1
>-+tremor/ivorbiscodec.h
>-+#endif
>+diff --git config/system-headers.mozbuild config/system-headers.mozbuild
>+index 09d3db5ca8c0..c6533b84c470 100644
>+--- config/system-headers.mozbuild
>++++ config/system-headers.mozbuild
>+@@ -1325,6 +1325,28 @@ if CONFIG['MOZ_SYSTEM_HARFBUZZ']:
>+         'harfbuzz/hb.h',
>+     ]
>+ 
>++if CONFIG['MOZ_SYSTEM_OGG']:
>++    system_headers += [
>++        'ogg/ogg.h',
>++        'ogg/os_types.h',
>++    ]
>++
>++if CONFIG['MOZ_SYSTEM_THEORA']:
>++    system_headers += [
>++        'theora/theoradec.h',
>++    ]
>++
>++if CONFIG['MOZ_SYSTEM_VORBIS']:
>++    system_headers += [
>++        'vorbis/codec.h',
>++        'vorbis/vorbisenc.h',
>++    ]
>++
>++if CONFIG['MOZ_SYSTEM_TREMOR']:
>++    system_headers += [
>++        'tremor/ivorbiscodec.h',
>++    ]
>++
>+ if CONFIG['MOZ_SYSTEM_LIBVPX']:
>+     system_headers += [
>+         'vpx_mem/vpx_mem.h',
> diff --git dom/media/AudioStream.cpp dom/media/AudioStream.cpp
> index 93ecda4319af..ff674c64ea07 100644
> --- dom/media/AudioStream.cpp
> +++ dom/media/AudioStream.cpp
>-@@ -115,7 +115,9 @@ AudioStream::AudioStream(DataSource& aSource)
>+@@ -121,7 +121,9 @@ AudioStream::AudioStream(DataSource& aSource)
>    : mMonitor("AudioStream")
>    , mChannels(0)
>    , mOutChannels(0)
>@@ -110,7 +105,7 @@ index 93ecda4319af..ff674c64ea07 100644
>    , mDumpFile(nullptr)
>    , mState(INITIALIZED)
>    , mDataSource(aSource)
>-@@ -135,9 +137,11 @@ AudioStream::~AudioStream()
>+@@ -142,9 +144,11 @@ AudioStream::~AudioStream()
>    if (mDumpFile) {
>      fclose(mDumpFile);
>    }
>@@ -122,7 +117,7 @@ index 93ecda4319af..ff674c64ea07 100644
>  #if defined(XP_WIN)
>    if (XRE_IsContentProcess()) {
>      audio::AudioNotificationReceiver::Unregister(this);
>-@@ -151,7 +155,11 @@ nsresult AudioStream::EnsureTimeStretcherInitializedUnlocked()
>+@@ -168,7 +172,11 @@ nsresult AudioStream::EnsureTimeStretcherInitializedUnlocked()
>  {
>    mMonitor.AssertCurrentThreadOwns();
>    if (!mTimeStretcher) {
>@@ -138,7 +133,7 @@ diff --git dom/media/AudioStream.h dom/media/AudioStream.h
> index 7dc1f60f95cc..67d402a4117f 100644
> --- dom/media/AudioStream.h
> +++ dom/media/AudioStream.h
>-@@ -16,7 +16,11 @@
>+@@ -15,7 +15,11 @@
>  #include "mozilla/TimeStamp.h"
>  #include "mozilla/UniquePtr.h"
>  #include "CubebUtils.h"
>@@ -148,9 +143,9 @@ index 7dc1f60f95cc..67d402a4117f 100644
>  #include "soundtouch/SoundTouchFactory.h"
> +#endif
>  
>- namespace mozilla {
>- 
>-@@ -287,7 +291,11 @@ private:
>+ #if defined(XP_WIN)
>+ #include "mozilla/audio/AudioNotificationReceiver.h"
>+@@ -297,7 +301,11 @@ private:
>    uint32_t mChannels;
>    uint32_t mOutChannels;
>    AudioClock mAudioClock;
>@@ -166,7 +161,7 @@ diff --git dom/media/moz.build dom/media/moz.build
> index 86b051c58d33..fb6186dce78b 100644
> --- dom/media/moz.build
> +++ dom/media/moz.build
>-@@ -308,6 +308,21 @@ if CONFIG['MOZ_WEBRTC']:
>+@@ -318,6 +318,21 @@ if CONFIG['MOZ_WEBRTC']:
>  
>  DEFINES['MOZILLA_INTERNAL_API'] = True
>  
>@@ -185,9 +180,9 @@ index 86b051c58d33..fb6186dce78b 100644
> +if CONFIG['MOZ_SYSTEM_SOUNDTOUCH']:
> +    CXXFLAGS += CONFIG['MOZ_SOUNDTOUCH_CFLAGS']
> +
>- if CONFIG['OS_TARGET'] == 'WINNT':
>-     DEFINES['WEBRTC_WIN'] = True
>- else:
>+ if CONFIG['MOZ_ANDROID_HLS_SUPPORT']:
>+     DEFINES['MOZ_ANDROID_HLS_SUPPORT'] = True
>+ 
> diff --git dom/media/platforms/ffmpeg/ffvpx/FFVPXRuntimeLinker.cpp dom/media/platforms/ffmpeg/ffvpx/FFVPXRuntimeLinker.cpp
> index 078f6ea5ef60..c600db067539 100644
> --- dom/media/platforms/ffmpeg/ffvpx/FFVPXRuntimeLinker.cpp
>@@ -206,7 +201,7 @@ index 078f6ea5ef60..c600db067539 100644
>  
>  namespace mozilla {
>  
>-@@ -50,6 +54,12 @@ FFVPXRuntimeLinker::Init()
>+@@ -54,6 +58,12 @@ FFVPXRuntimeLinker::Init()
>  
>    sLinkStatus = LinkStatus_FAILED;
>  
>@@ -219,7 +214,7 @@ index 078f6ea5ef60..c600db067539 100644
>    // We retrieve the path of the lgpllibs library as this is where mozavcodec
>    // and mozavutil libs are located.
>    char* lgpllibsname = PR_GetLibraryName(nullptr, "lgpllibs");
>-@@ -60,6 +70,7 @@ FFVPXRuntimeLinker::Init()
>+@@ -64,6 +74,7 @@ FFVPXRuntimeLinker::Init()
>      PR_GetLibraryFilePathname(lgpllibsname,
>                                (PRFuncPtr)&soundtouch::SoundTouch::getVersionId);
>    PR_FreeLibraryName(lgpllibsname);
>@@ -312,7 +307,7 @@ diff --git media/libvorbis/README_MOZILLA media/libvorbis/README_MOZILLA
> index 1211ac074b33..eb31084aed25 100644
> --- media/libvorbis/README_MOZILLA
> +++ media/libvorbis/README_MOZILLA
>-@@ -8,3 +8,6 @@ https://svn.xiph.org/tags/vorbis/libvorbis-1.3.5@19464
>+@@ -8,3 +8,6 @@ from https://git.xiph.org/vorbis.git
>  
>  Some files are renamed during the copy to prevent clashes with object
>  file names with other Mozilla libraries.
>@@ -334,9 +329,9 @@ diff --git old-configure.in old-configure.in
> index b614eef85c89..85f9099dba4d 100644
> --- old-configure.in
> +++ old-configure.in
>-@@ -2941,6 +2941,111 @@ if test -n "$MOZ_OMX_PLUGIN"; then
>-     fi
>+@@ -2627,6 +2627,111 @@ if test -n "$MOZ_APPLEMEDIA"; then
>  fi
>+ fi # COMPILE_ENVIRONMENT
>  
> +dnl ========================================================
> +dnl Check for libogg
>@@ -450,7 +445,7 @@ diff --git toolkit/library/moz.build toolkit/library/moz.build
> index 079a575adec3..514d901195de 100644
> --- toolkit/library/moz.build
> +++ toolkit/library/moz.build
>-@@ -237,6 +237,21 @@ if CONFIG['MOZ_SYSTEM_HARFBUZZ']:
>+@@ -240,6 +240,21 @@ if CONFIG['MOZ_SYSTEM_HARFBUZZ']:
>  if CONFIG['MOZ_SYSTEM_HUNSPELL']:
>      OS_LIBS += CONFIG['MOZ_HUNSPELL_LIBS']
>  
>@@ -476,7 +471,7 @@ diff --git xpcom/build/XPCOMInit.cpp xpcom/build/XPCOMInit.cpp
> index c083ab4bc4f3..62b917043a2c 100644
> --- xpcom/build/XPCOMInit.cpp
> +++ xpcom/build/XPCOMInit.cpp
>-@@ -154,7 +154,9 @@ extern nsresult nsStringInputStreamConstructor(nsISupports*, REFNSIID, void**);
>+@@ -132,7 +132,9 @@ extern nsresult nsStringInputStreamConstructor(nsISupports*, REFNSIID, void**);
>  
>  #include "mozilla/ipc/GeckoChildProcessHost.h"
>  
>@@ -486,7 +481,7 @@ index c083ab4bc4f3..62b917043a2c 100644
>  #if defined(MOZ_VPX) && !defined(MOZ_VPX_NO_MEM_REPORTING)
>  #if defined(HAVE_STDINT_H)
>  // mozilla-config.h defines HAVE_STDINT_H, and then it's defined *again* in
>-@@ -664,11 +666,13 @@ NS_InitXPCOM2(nsIServiceManager** aResult,
>+@@ -639,11 +641,13 @@ NS_InitXPCOM2(nsIServiceManager** aResult,
>    // this oddness.
>    mozilla::SetICUMemoryFunctions();
>

Actions: View | Diff

Attachments on bug 223425: 187726 | 187811 | 187899 | 187969 | 187978 | 188017 | 188018 | 188147 | 188228 | 188325 | 188326 | 188330 | 188405 | 188437 | 188572 | 188618 | 188773 | 188948 | 189115 | 189120 | 189383 | 189443 | 189560 | 189625