Attachment 188228 Details for Bug 223425 – beta6

[patch] beta6

ff58.diff (text/plain), 66.68 KB, created by Jan Beich on 2017-11-23 23:53:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Beich

Created: 2017-11-23 23:53:19 UTC

Size: 66.68 KB

patch

obsolete

>From 5608bfb6caa8452eba179928a72872f49a1aa74f 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
>Security:	a891c5b4-3d7a-4de9-9c71-eef3fd698c77
>MFH:		2018Q1
>---
> Mk/Uses/gecko.mk                                   |   4 +-
> Mk/bsd.gecko.mk                                    |   9 +-
> 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                               |   9 +-
> 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                  | 100 +++---
> .../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, 373 insertions(+), 623 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 934a49eb8ee0..7819d9daf28f 100644
>--- a/Mk/bsd.gecko.mk
>+++ b/Mk/bsd.gecko.mk
>@@ -109,14 +109,6 @@ USE_XORG+=	xcb
> MESA_LLVM_VER?=	40
> BUILD_DEPENDS+=	llvm${MESA_LLVM_VER}>0:devel/llvm${MESA_LLVM_VER}
> MOZ_EXPORT+=	LLVM_CONFIG=llvm-config${MESA_LLVM_VER}
>-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
> 
> .if ${OPSYS} == FreeBSD && ${OSREL} == 11.1
>@@ -144,6 +136,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} \
>diff --git a/www/firefox-i18n/Makefile b/www/firefox-i18n/Makefile
>index 7e6498de06eb..a54a79b5d42f 100644
>--- a/www/firefox-i18n/Makefile
>+++ b/www/firefox-i18n/Makefile
>@@ -2,10 +2,10 @@
> # $FreeBSD$
> 
> PORTNAME=	firefox-i18n
>-PORTVERSION=	57.0
>+PORTVERSION=	58.0b6
> CATEGORIES=	www
> MASTER_SITES=	MOZILLA/${PORTNAME:S|-i18n||}/releases/${DISTVERSION}/linux-i686/xpi \
>-		MOZILLA/${PORTNAME:S|-i18n||}/candidates/${DISTVERSION}-candidates/build4/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 0e05e1500cfa..496c928269fb 100644
>--- a/www/firefox-i18n/distinfo
>+++ b/www/firefox-i18n/distinfo
>@@ -1,191 +1,193 @@
>-TIMESTAMP = 1510498738
>-SHA256 (xpi/firefox-i18n-57.0/ach.xpi) = ff5bbdfcca5270cf978173eb13ce10bfb4b51dbd1faeb9b69c50f689a1eb3dc4
>-SIZE (xpi/firefox-i18n-57.0/ach.xpi) = 441112
>-SHA256 (xpi/firefox-i18n-57.0/af.xpi) = 65459a5914dba1de876bee7d867699ff033a9722a957675f973b5cf1213366b9
>-SIZE (xpi/firefox-i18n-57.0/af.xpi) = 442205
>-SHA256 (xpi/firefox-i18n-57.0/an.xpi) = d24b77cfdf3d5badd492c04f5984171bedbafcee31fb447930925e2c911e5261
>-SIZE (xpi/firefox-i18n-57.0/an.xpi) = 462777
>-SHA256 (xpi/firefox-i18n-57.0/ar.xpi) = 06b0d8f7f34eb661f8f4944c26ddeee81e84bb00dd07dec4f1f06e54f1cdbe6f
>-SIZE (xpi/firefox-i18n-57.0/ar.xpi) = 488159
>-SHA256 (xpi/firefox-i18n-57.0/as.xpi) = 8229d02b5f8b88dea2a6e8f83db6c335c951ebf786f4d73fe28dde8457ae4d59
>-SIZE (xpi/firefox-i18n-57.0/as.xpi) = 491074
>-SHA256 (xpi/firefox-i18n-57.0/ast.xpi) = 0f46b1d36c23ec86656208241e692f2f4fef6338285dd54621939a53672d497d
>-SIZE (xpi/firefox-i18n-57.0/ast.xpi) = 455503
>-SHA256 (xpi/firefox-i18n-57.0/az.xpi) = 68db90d2cc24227407dc20cb8721b5f89ae875fc3e0248981bf5349b2348030d
>-SIZE (xpi/firefox-i18n-57.0/az.xpi) = 466042
>-SHA256 (xpi/firefox-i18n-57.0/be.xpi) = 9e9c151874180d2ccf6ac1e7e7a59a5d2e72f9543bb6c128416fad177a2f01cb
>-SIZE (xpi/firefox-i18n-57.0/be.xpi) = 516091
>-SHA256 (xpi/firefox-i18n-57.0/bg.xpi) = 10c386468c1d34676a7d4e3992f14d853cd29f61bd1d12b04f3f1b66ebb8993b
>-SIZE (xpi/firefox-i18n-57.0/bg.xpi) = 510349
>-SHA256 (xpi/firefox-i18n-57.0/bn-BD.xpi) = 11b541a18a34fee16337dd8648a36e45b6c5371e9c17a845985120e6a7b1997d
>-SIZE (xpi/firefox-i18n-57.0/bn-BD.xpi) = 527188
>-SHA256 (xpi/firefox-i18n-57.0/bn-IN.xpi) = f8c912705b760607456a140506f3120e9d7c9f0ee17508d4cbd1eb3e18bc895d
>-SIZE (xpi/firefox-i18n-57.0/bn-IN.xpi) = 516175
>-SHA256 (xpi/firefox-i18n-57.0/br.xpi) = 4c76bf9c4b39dac467de391527072ca6d81c83a9ccbead46dbbbb76a8ab7c252
>-SIZE (xpi/firefox-i18n-57.0/br.xpi) = 451865
>-SHA256 (xpi/firefox-i18n-57.0/bs.xpi) = 4d3c483b4e3a20a852ddb5fe6a0d1f447366310dee446317017ebdf332e129c1
>-SIZE (xpi/firefox-i18n-57.0/bs.xpi) = 459649
>-SHA256 (xpi/firefox-i18n-57.0/ca.xpi) = 21fc2934acb751e89badbf215aad67085c310cbb627e44277d9592aaf213a837
>-SIZE (xpi/firefox-i18n-57.0/ca.xpi) = 466640
>-SHA256 (xpi/firefox-i18n-57.0/cak.xpi) = 95c3cff1bd43dc2f14e99a0c10d8f101beb4e940f810279a2912571ddeff6326
>-SIZE (xpi/firefox-i18n-57.0/cak.xpi) = 475934
>-SHA256 (xpi/firefox-i18n-57.0/cs.xpi) = c579929028397c8f93ed7193cc4f2a6511a5b503d59d02d6599701d7fab393db
>-SIZE (xpi/firefox-i18n-57.0/cs.xpi) = 469456
>-SHA256 (xpi/firefox-i18n-57.0/cy.xpi) = 3442262d271a47173226ae327be47524ab0237b0ebaea73c61c61177463f81fa
>-SIZE (xpi/firefox-i18n-57.0/cy.xpi) = 455787
>-SHA256 (xpi/firefox-i18n-57.0/da.xpi) = 538e9cce1e72af3ce6c6bbfe0a310529099dc95100546974e8b0a228860854a3
>-SIZE (xpi/firefox-i18n-57.0/da.xpi) = 448415
>-SHA256 (xpi/firefox-i18n-57.0/de.xpi) = bb4c883efe6f393ed47d91712901ca0bff04951db9e83ab5c981811e60512461
>-SIZE (xpi/firefox-i18n-57.0/de.xpi) = 460812
>-SHA256 (xpi/firefox-i18n-57.0/dsb.xpi) = 51ef0a8a83770dab060779d6b34478a60d080e743b8c446b791a89236161f29e
>-SIZE (xpi/firefox-i18n-57.0/dsb.xpi) = 479506
>-SHA256 (xpi/firefox-i18n-57.0/el.xpi) = 2009672fb40a593061fba725ad6fb5c6b52b330a7724e3e5203c8885df5fce81
>-SIZE (xpi/firefox-i18n-57.0/el.xpi) = 534482
>-SHA256 (xpi/firefox-i18n-57.0/en-GB.xpi) = 404f4dd5d724ceacdd49b63f303ceeae4608f8e989992ebca71198251023fc7f
>-SIZE (xpi/firefox-i18n-57.0/en-GB.xpi) = 435622
>-SHA256 (xpi/firefox-i18n-57.0/en-US.xpi) = ac8b76c6ad2f10b62c784cb97b30b7c8cf0b466102a3732199a2ce5f355aa0db
>-SIZE (xpi/firefox-i18n-57.0/en-US.xpi) = 441879
>-SHA256 (xpi/firefox-i18n-57.0/en-ZA.xpi) = f1d21809cccea7d4bc649b7337ebde96f3b42185d154e603dbae241e5d8876d1
>-SIZE (xpi/firefox-i18n-57.0/en-ZA.xpi) = 432019
>-SHA256 (xpi/firefox-i18n-57.0/eo.xpi) = 599314153f217433a53671ac0c118be5a6953094bcd94fe8230f192ca5d8995a
>-SIZE (xpi/firefox-i18n-57.0/eo.xpi) = 454908
>-SHA256 (xpi/firefox-i18n-57.0/es-AR.xpi) = 6f6d9805f9bba0fac0afce20bdfb1116c1c441cb5463fc271e8a3cec2cfe2bfe
>-SIZE (xpi/firefox-i18n-57.0/es-AR.xpi) = 462978
>-SHA256 (xpi/firefox-i18n-57.0/es-CL.xpi) = 141b2502ed61b7ac439910c252c6de9388ab6a6783fb290e77208367317b4fdc
>-SIZE (xpi/firefox-i18n-57.0/es-CL.xpi) = 465514
>-SHA256 (xpi/firefox-i18n-57.0/es-ES.xpi) = 73409303fc344d642f2343fd683694b534291c6ca5a8f8c63ee27b13e2ffe8ab
>-SIZE (xpi/firefox-i18n-57.0/es-ES.xpi) = 353623
>-SHA256 (xpi/firefox-i18n-57.0/es-MX.xpi) = dd136cbdbe64a77341d8345c388f6ca63e5acbf65ba2f7ef7d61af52bdbcbf61
>-SIZE (xpi/firefox-i18n-57.0/es-MX.xpi) = 468760
>-SHA256 (xpi/firefox-i18n-57.0/et.xpi) = e5683bf2280fd070dad6855af2f60bd433d9200af66ec0976f5045d5d44e8e30
>-SIZE (xpi/firefox-i18n-57.0/et.xpi) = 447277
>-SHA256 (xpi/firefox-i18n-57.0/eu.xpi) = 562f0ad72e23e6b37969c6b75fd7343cbceb67cfb3db570525b796c3a214b2b2
>-SIZE (xpi/firefox-i18n-57.0/eu.xpi) = 454671
>-SHA256 (xpi/firefox-i18n-57.0/fa.xpi) = 39891a98174cdf50dfea0a69e896049ef8aa66be1c694149eb7da3ff421045a2
>-SIZE (xpi/firefox-i18n-57.0/fa.xpi) = 510827
>-SHA256 (xpi/firefox-i18n-57.0/ff.xpi) = 0b9a56e8b6378b13db3011957c9e040c3b2e74afe8de34d0333b9029b15d3f38
>-SIZE (xpi/firefox-i18n-57.0/ff.xpi) = 454014
>-SHA256 (xpi/firefox-i18n-57.0/fi.xpi) = b81be3f2dd15873dae20b4eced377e3e8d3b40de59d7735c72444e87dc7f476e
>-SIZE (xpi/firefox-i18n-57.0/fi.xpi) = 446242
>-SHA256 (xpi/firefox-i18n-57.0/fr.xpi) = 59578e90b9832f216d01755cd52bc5956fa646bc420131f3b00ce09faa8d6271
>-SIZE (xpi/firefox-i18n-57.0/fr.xpi) = 472720
>-SHA256 (xpi/firefox-i18n-57.0/fy-NL.xpi) = 529719f9de24ed1a1573d8a55f91d2cbafdaa37d06c65ced206815622668fe8f
>-SIZE (xpi/firefox-i18n-57.0/fy-NL.xpi) = 465907
>-SHA256 (xpi/firefox-i18n-57.0/ga-IE.xpi) = 563933a54d94fa031fb309157d806b50e694ae42e6723d9a5b6e442fd5d53f21
>-SIZE (xpi/firefox-i18n-57.0/ga-IE.xpi) = 475962
>-SHA256 (xpi/firefox-i18n-57.0/gd.xpi) = 69089bd588762270bd6592b544ed7886b4d092b915cdabb4ffee6c9c499ed924
>-SIZE (xpi/firefox-i18n-57.0/gd.xpi) = 465121
>-SHA256 (xpi/firefox-i18n-57.0/gl.xpi) = ca5195dad2f043d4b530b414061c92f835fe0f9c2f0e8a64de0e3a73079e4e6d
>-SIZE (xpi/firefox-i18n-57.0/gl.xpi) = 452030
>-SHA256 (xpi/firefox-i18n-57.0/gn.xpi) = a118e4b81c47da417fe79af3d95788e04aaf42d433e8984d026851c41cd5ee11
>-SIZE (xpi/firefox-i18n-57.0/gn.xpi) = 471954
>-SHA256 (xpi/firefox-i18n-57.0/gu-IN.xpi) = 0cf3579447aa63d495d5ee744d7b7dcd16eb6779c8e398f75a3c12841c1f2461
>-SIZE (xpi/firefox-i18n-57.0/gu-IN.xpi) = 511989
>-SHA256 (xpi/firefox-i18n-57.0/he.xpi) = a2c770fab1787623f9a62a5579e7e2f5e8561ba38f8223ef11c75227abd5c7f3
>-SIZE (xpi/firefox-i18n-57.0/he.xpi) = 471920
>-SHA256 (xpi/firefox-i18n-57.0/hi-IN.xpi) = a07ecdd23d74ea5ae916b4a94ad513696e4000f703ea3e06cdff9c579748e1c2
>-SIZE (xpi/firefox-i18n-57.0/hi-IN.xpi) = 526109
>-SHA256 (xpi/firefox-i18n-57.0/hr.xpi) = f88a0964a4e55a4b904e3e466d78f853b58f99007f920277651b4176f48c1cbd
>-SIZE (xpi/firefox-i18n-57.0/hr.xpi) = 460720
>-SHA256 (xpi/firefox-i18n-57.0/hsb.xpi) = bbdb24808af0f07be665ffc8cadf687ef30c47075d0b1ef78a58311ddbf99f7f
>-SIZE (xpi/firefox-i18n-57.0/hsb.xpi) = 476500
>-SHA256 (xpi/firefox-i18n-57.0/hu.xpi) = 23767b357e4ae9a470605a7bf5e5231301ffe3d65fea8e11c07f82f53e1fd9c2
>-SIZE (xpi/firefox-i18n-57.0/hu.xpi) = 476603
>-SHA256 (xpi/firefox-i18n-57.0/hy-AM.xpi) = 8106177a21fbfb382dfe26b6106ba35128a03fc25d06b492f948c7a661303add
>-SIZE (xpi/firefox-i18n-57.0/hy-AM.xpi) = 510824
>-SHA256 (xpi/firefox-i18n-57.0/id.xpi) = a3cce07b6c2369bfed1c47af5fd3de8254603efe8b7d3e3929ddba32d824237a
>-SIZE (xpi/firefox-i18n-57.0/id.xpi) = 444040
>-SHA256 (xpi/firefox-i18n-57.0/is.xpi) = b608ebb8f34a93968fcef85d1c463e32489e999b92197f9b21b094d76db29767
>-SIZE (xpi/firefox-i18n-57.0/is.xpi) = 452655
>-SHA256 (xpi/firefox-i18n-57.0/it.xpi) = b035b10133444b23fbef2c66c8548fdd6703ec304d8a854c5fbec42e79f9778a
>-SIZE (xpi/firefox-i18n-57.0/it.xpi) = 347170
>-SHA256 (xpi/firefox-i18n-57.0/ja.xpi) = a7e3af1bbc6bdf3ec139e77e3cc1e39b072dd68b0a434ef96cc288e7424eea8c
>-SIZE (xpi/firefox-i18n-57.0/ja.xpi) = 508551
>-SHA256 (xpi/firefox-i18n-57.0/ka.xpi) = 09dd38e2f51b0228dd0302e4afcc6ee6f6f2d89956172c27518cb9c7423e155e
>-SIZE (xpi/firefox-i18n-57.0/ka.xpi) = 492355
>-SHA256 (xpi/firefox-i18n-57.0/kab.xpi) = f673912bcc909e9046008803886cf4322653871e7b5b121645566c2b92b5fc39
>-SIZE (xpi/firefox-i18n-57.0/kab.xpi) = 462530
>-SHA256 (xpi/firefox-i18n-57.0/kk.xpi) = 4d93c3e6f982f4b10d614f6d237f8fac8887c347f1ce11aa6728d0918d552a87
>-SIZE (xpi/firefox-i18n-57.0/kk.xpi) = 519248
>-SHA256 (xpi/firefox-i18n-57.0/km.xpi) = 11cb79e402ba96e678fa27bdbd39bb7ec48533eac89f884334b65ad9335eef54
>-SIZE (xpi/firefox-i18n-57.0/km.xpi) = 530079
>-SHA256 (xpi/firefox-i18n-57.0/kn.xpi) = 1230fe7d27fbc3af7196b7258bee255b4d85dd232c117a0a4d515ddef74328c9
>-SIZE (xpi/firefox-i18n-57.0/kn.xpi) = 531315
>-SHA256 (xpi/firefox-i18n-57.0/ko.xpi) = 1d992cbc4f30bff88b40d46c55ceef223f7b66ad489e073a859655461edacb28
>-SIZE (xpi/firefox-i18n-57.0/ko.xpi) = 487304
>-SHA256 (xpi/firefox-i18n-57.0/lij.xpi) = 4e9e6e0661c4bea860128dd870596154e68c3367624fd6cbc690e2c341157f21
>-SIZE (xpi/firefox-i18n-57.0/lij.xpi) = 452340
>-SHA256 (xpi/firefox-i18n-57.0/lt.xpi) = ce3bdff82d4f6baef44d2913e4da76b83e50dd0c9e3102e444425d379e2347f7
>-SIZE (xpi/firefox-i18n-57.0/lt.xpi) = 474955
>-SHA256 (xpi/firefox-i18n-57.0/lv.xpi) = 25bb6e484402d0c7909544031c2fe84f04b8cb0d563c902427542ca8b0f0a996
>-SIZE (xpi/firefox-i18n-57.0/lv.xpi) = 465242
>-SHA256 (xpi/firefox-i18n-57.0/mai.xpi) = 7f3dafefb77ef7d5e73dd9a762b9d51f05c7c739933561b3a0d53c7798fff9d9
>-SIZE (xpi/firefox-i18n-57.0/mai.xpi) = 507395
>-SHA256 (xpi/firefox-i18n-57.0/mk.xpi) = ac348da0f832916715da5111083a4e2b72a7d16b9c96c04a1cc4d5d3e6c862a7
>-SIZE (xpi/firefox-i18n-57.0/mk.xpi) = 490852
>-SHA256 (xpi/firefox-i18n-57.0/ml.xpi) = a4be2963a72230143283d674ddcc3c28c5f09636524af145f5f53ecce0322572
>-SIZE (xpi/firefox-i18n-57.0/ml.xpi) = 528255
>-SHA256 (xpi/firefox-i18n-57.0/mr.xpi) = 410200d49c82a8ba5a0ecae914e1da3f04798506d9625acbc10c5ed3b99cec9d
>-SIZE (xpi/firefox-i18n-57.0/mr.xpi) = 521289
>-SHA256 (xpi/firefox-i18n-57.0/ms.xpi) = c1b61b1325581a5c2d927a675b19e9d2e34c708bbc45ce5f6c03f386de5b33e5
>-SIZE (xpi/firefox-i18n-57.0/ms.xpi) = 451254
>-SHA256 (xpi/firefox-i18n-57.0/my.xpi) = 512cb14ae373275c4755c478ac1dce4c51be15cde0b2aaaca5b29c3e45df0a5b
>-SIZE (xpi/firefox-i18n-57.0/my.xpi) = 517702
>-SHA256 (xpi/firefox-i18n-57.0/nb-NO.xpi) = a57311847934d5dcff18066ff7bd323f2c2406fa3df4c8e258b8d9d0939b1be8
>-SIZE (xpi/firefox-i18n-57.0/nb-NO.xpi) = 451556
>-SHA256 (xpi/firefox-i18n-57.0/nl.xpi) = 303f6a0b8379bbbd6db4ac45e6eb5397d725259ac67eec50a15b32686916d000
>-SIZE (xpi/firefox-i18n-57.0/nl.xpi) = 458317
>-SHA256 (xpi/firefox-i18n-57.0/nn-NO.xpi) = eb127fad8c44a4721fc1cf1d901d0c2aff16041b8bc54d2d3951b03bfac94600
>-SIZE (xpi/firefox-i18n-57.0/nn-NO.xpi) = 452003
>-SHA256 (xpi/firefox-i18n-57.0/or.xpi) = dc0f59099e8d0592b3e61d8d5c88ae22b9a1067fd89911b7799f8b43d13a2f6b
>-SIZE (xpi/firefox-i18n-57.0/or.xpi) = 500863
>-SHA256 (xpi/firefox-i18n-57.0/pa-IN.xpi) = 33348a739ae6b01c3629def78a855ea6ea816e0253b696e58ba9ccbff3fa37d6
>-SIZE (xpi/firefox-i18n-57.0/pa-IN.xpi) = 495270
>-SHA256 (xpi/firefox-i18n-57.0/pl.xpi) = fff4c80385e9eec79ec93d4fc35f84301fa28c8a527591196d719f675c9ffe2b
>-SIZE (xpi/firefox-i18n-57.0/pl.xpi) = 364229
>-SHA256 (xpi/firefox-i18n-57.0/pt-BR.xpi) = d50347c7a26681e87fe6b5978a8fc05f8d7a885ba440cc51da03b66875fbd76a
>-SIZE (xpi/firefox-i18n-57.0/pt-BR.xpi) = 457153
>-SHA256 (xpi/firefox-i18n-57.0/pt-PT.xpi) = b77f50f7b02a78dc24dc32e9bff82b46bf2e37a62f978c1fe5ac172f6bf63f26
>-SIZE (xpi/firefox-i18n-57.0/pt-PT.xpi) = 459998
>-SHA256 (xpi/firefox-i18n-57.0/rm.xpi) = 695b5483ecc003296cd25b0b441c73c73c475457466fd7cff3f39a8491a44910
>-SIZE (xpi/firefox-i18n-57.0/rm.xpi) = 451057
>-SHA256 (xpi/firefox-i18n-57.0/ro.xpi) = 591ecab4f6e3869da69e612f847a832a802050471655565d29aa8c76febe7b7e
>-SIZE (xpi/firefox-i18n-57.0/ro.xpi) = 455509
>-SHA256 (xpi/firefox-i18n-57.0/ru.xpi) = 3b7355af69378f3bf0642d8f93c2c1fb6a9665ddd5a2b6aec4865baa8cd7713f
>-SIZE (xpi/firefox-i18n-57.0/ru.xpi) = 527005
>-SHA256 (xpi/firefox-i18n-57.0/si.xpi) = 3392da245426ca4480b478455b61b6d53fe5741e7c0c3772a610e622b0248715
>-SIZE (xpi/firefox-i18n-57.0/si.xpi) = 498323
>-SHA256 (xpi/firefox-i18n-57.0/sk.xpi) = 5ac2035fdb85fb5bb789b6f2723e69bd23e6a15f6a4dfb184c08100aafead6ba
>-SIZE (xpi/firefox-i18n-57.0/sk.xpi) = 480395
>-SHA256 (xpi/firefox-i18n-57.0/sl.xpi) = 6c55623bb30635ac67abcd3fab3b4cc30de5fefea2ae0bbb99f15be7c7843245
>-SIZE (xpi/firefox-i18n-57.0/sl.xpi) = 459376
>-SHA256 (xpi/firefox-i18n-57.0/son.xpi) = ac13a973cacd9e4c84401cd11095c0a0f307d07ebb0719174adcfcf957188316
>-SIZE (xpi/firefox-i18n-57.0/son.xpi) = 450929
>-SHA256 (xpi/firefox-i18n-57.0/sq.xpi) = 2b999472e0e6550b63782d15aa713bac47b3ddcf8a212673a30fd6e55090215c
>-SIZE (xpi/firefox-i18n-57.0/sq.xpi) = 465050
>-SHA256 (xpi/firefox-i18n-57.0/sr.xpi) = 75849a57f9b44b73445b302279dcb626389670a20dc3a404ad5db774c3ceaa00
>-SIZE (xpi/firefox-i18n-57.0/sr.xpi) = 487002
>-SHA256 (xpi/firefox-i18n-57.0/sv-SE.xpi) = 87ec5cbe45db203cfd1fd49ab7d2fb78df72fdcd4867e2dcc16727463100bb06
>-SIZE (xpi/firefox-i18n-57.0/sv-SE.xpi) = 459664
>-SHA256 (xpi/firefox-i18n-57.0/ta.xpi) = 74382122b90dbd76d128d5a860d40ddc839f315ee7cecbcdb73c2fbf20169199
>-SIZE (xpi/firefox-i18n-57.0/ta.xpi) = 513225
>-SHA256 (xpi/firefox-i18n-57.0/te.xpi) = a40de1d2174392d96bda8cfe65c8e374f4c833add0e1719d6c44616b571e6855
>-SIZE (xpi/firefox-i18n-57.0/te.xpi) = 530692
>-SHA256 (xpi/firefox-i18n-57.0/th.xpi) = 9d7cff5544312d33d44a2728f095e095e646ae2cd904e014fe69ca8016440884
>-SIZE (xpi/firefox-i18n-57.0/th.xpi) = 502450
>-SHA256 (xpi/firefox-i18n-57.0/tr.xpi) = fa1e8613954cae82fa460eb840af561df5857320a33ec5a1f8b032e3ed558dee
>-SIZE (xpi/firefox-i18n-57.0/tr.xpi) = 465580
>-SHA256 (xpi/firefox-i18n-57.0/uk.xpi) = b477818ae7061f7523625380e93fbe9bdfc385279e7e96cb06e98e6ed5915d86
>-SIZE (xpi/firefox-i18n-57.0/uk.xpi) = 518137
>-SHA256 (xpi/firefox-i18n-57.0/ur.xpi) = d9b3f9e18241a5abb31906792bae33c6b6b579631678c97236291e388e8bc195
>-SIZE (xpi/firefox-i18n-57.0/ur.xpi) = 511133
>-SHA256 (xpi/firefox-i18n-57.0/uz.xpi) = 4d4fe1f56e5c86f779753eed44f1b5d3f1cceb3a6f46950d175ed31c9f7ff39d
>-SIZE (xpi/firefox-i18n-57.0/uz.xpi) = 461693
>-SHA256 (xpi/firefox-i18n-57.0/vi.xpi) = ce81dbf85ddd901acb8c9cf7cfd331d2dfe6f4a7f5e4d799d664ff867bd5d40b
>-SIZE (xpi/firefox-i18n-57.0/vi.xpi) = 471319
>-SHA256 (xpi/firefox-i18n-57.0/xh.xpi) = be4d359e06a8a10cfda658a6e7c1e13ff857fd767d76882bedfd1aada3a6900c
>-SIZE (xpi/firefox-i18n-57.0/xh.xpi) = 464460
>-SHA256 (xpi/firefox-i18n-57.0/zh-CN.xpi) = 040736b596b614e55ac09aefa3e9f04211f16cb257ea0c2d274ca0df99b787b6
>-SIZE (xpi/firefox-i18n-57.0/zh-CN.xpi) = 483624
>-SHA256 (xpi/firefox-i18n-57.0/zh-TW.xpi) = fa5cf52246a289bc91d60519697977cbd6f999f5bda7eb715cb8303af543b752
>-SIZE (xpi/firefox-i18n-57.0/zh-TW.xpi) = 482346
>+TIMESTAMP = 1511460654
>+SHA256 (xpi/firefox-i18n-58.0b6/ach.xpi) = 2bfcb39475a1985cb87ff455bf80c16067f5cca7d660f99510d3ab04bbb43ee0
>+SIZE (xpi/firefox-i18n-58.0b6/ach.xpi) = 441869
>+SHA256 (xpi/firefox-i18n-58.0b6/af.xpi) = 3933c0f1307d35d3e00523fa3e2367a810988c87c79fdee8f6eeb564bf258836
>+SIZE (xpi/firefox-i18n-58.0b6/af.xpi) = 442097
>+SHA256 (xpi/firefox-i18n-58.0b6/an.xpi) = cb6d4b7347f90f3e0509288da294b33efa9216090563bb41f5f3075220b9ed15
>+SIZE (xpi/firefox-i18n-58.0b6/an.xpi) = 463250
>+SHA256 (xpi/firefox-i18n-58.0b6/ar.xpi) = 68c94dbf4890c966ea732303183537ac0cece357506a6e4b036fbbad1d14f9f2
>+SIZE (xpi/firefox-i18n-58.0b6/ar.xpi) = 488257
>+SHA256 (xpi/firefox-i18n-58.0b6/as.xpi) = 5f9b32371d30861a6f2c306114dc95bb3106ab15ac77a6c437ec57e7b738de72
>+SIZE (xpi/firefox-i18n-58.0b6/as.xpi) = 490348
>+SHA256 (xpi/firefox-i18n-58.0b6/ast.xpi) = 662530e7cc9e9b1b0c73d671e8e1a1c17b5b896f9fb7bcc779ec376b085aab84
>+SIZE (xpi/firefox-i18n-58.0b6/ast.xpi) = 457041
>+SHA256 (xpi/firefox-i18n-58.0b6/az.xpi) = fac6b60bfa2e98b76d5a164bd7d9aced1e36743a6c757af9c14a6f209323320c
>+SIZE (xpi/firefox-i18n-58.0b6/az.xpi) = 466148
>+SHA256 (xpi/firefox-i18n-58.0b6/be.xpi) = 257c8500db48d0a7b646199ce0856fda3877671b0f0edbe91a75fc3fa3a64c6c
>+SIZE (xpi/firefox-i18n-58.0b6/be.xpi) = 515408
>+SHA256 (xpi/firefox-i18n-58.0b6/bg.xpi) = 9e2f28cafa70a2b4d8763d9f4a044f3b06f09d42fdd3636bac2d803f63af69d4
>+SIZE (xpi/firefox-i18n-58.0b6/bg.xpi) = 509515
>+SHA256 (xpi/firefox-i18n-58.0b6/bn-BD.xpi) = 113c3112a0f3ec483b037718958cf6de33698e21e90d92403b6dc5a16e6acc6e
>+SIZE (xpi/firefox-i18n-58.0b6/bn-BD.xpi) = 525630
>+SHA256 (xpi/firefox-i18n-58.0b6/bn-IN.xpi) = cc8a16d06b0790e23f3227f06630747e7a3b31a34cc67f87168668701cecf00c
>+SIZE (xpi/firefox-i18n-58.0b6/bn-IN.xpi) = 516033
>+SHA256 (xpi/firefox-i18n-58.0b6/br.xpi) = 70d2bad18e7935a5ca4c374123a9ca5fa54da835760de198cc7dcd4d9897ce1c
>+SIZE (xpi/firefox-i18n-58.0b6/br.xpi) = 452228
>+SHA256 (xpi/firefox-i18n-58.0b6/bs.xpi) = 58797f9ec93287540ad3a914d1b7c1d27a9d3502fa191462ecea11b77d988940
>+SIZE (xpi/firefox-i18n-58.0b6/bs.xpi) = 459226
>+SHA256 (xpi/firefox-i18n-58.0b6/ca.xpi) = ed63fcb7bc8ffae1003a423071bc48908103037b02627dadb5a223f035558897
>+SIZE (xpi/firefox-i18n-58.0b6/ca.xpi) = 467338
>+SHA256 (xpi/firefox-i18n-58.0b6/cak.xpi) = 94b23c8491e497daa01d05eac35136a7034e10d69f863a10c659cf5d088a2f15
>+SIZE (xpi/firefox-i18n-58.0b6/cak.xpi) = 475410
>+SHA256 (xpi/firefox-i18n-58.0b6/cs.xpi) = 168cb55f13c07db38559ebbd88d557c590b7d5658eaa1320edbb2b68e54e7425
>+SIZE (xpi/firefox-i18n-58.0b6/cs.xpi) = 471789
>+SHA256 (xpi/firefox-i18n-58.0b6/cy.xpi) = d19c393c5deb9debe7aa200047543268ce7eaf304a7a3ffcba886c24d7d9e315
>+SIZE (xpi/firefox-i18n-58.0b6/cy.xpi) = 455303
>+SHA256 (xpi/firefox-i18n-58.0b6/da.xpi) = 67006bc89ad431bcbe90d2ba43debc4ad5518b3f8992cc5c017845668c9142cd
>+SIZE (xpi/firefox-i18n-58.0b6/da.xpi) = 448052
>+SHA256 (xpi/firefox-i18n-58.0b6/de.xpi) = fc72b3cc6d07df4956e7eb241e59ec990135c40fcd784bf5c720d229f44b2e53
>+SIZE (xpi/firefox-i18n-58.0b6/de.xpi) = 462216
>+SHA256 (xpi/firefox-i18n-58.0b6/dsb.xpi) = e873efc1ba2e31f54d9b8120b11f4a5d51896100f6683e163b53221542a40815
>+SIZE (xpi/firefox-i18n-58.0b6/dsb.xpi) = 478943
>+SHA256 (xpi/firefox-i18n-58.0b6/el.xpi) = 6cf583ba018519bda946eadedf10f1ffcab95479f0e75cdccb008af42a7b4443
>+SIZE (xpi/firefox-i18n-58.0b6/el.xpi) = 534671
>+SHA256 (xpi/firefox-i18n-58.0b6/en-GB.xpi) = 638854db0a6814c21bf8819dc83128d0236c1a5ec7ad014083b96e3f6f76c3b7
>+SIZE (xpi/firefox-i18n-58.0b6/en-GB.xpi) = 436592
>+SHA256 (xpi/firefox-i18n-58.0b6/en-US.xpi) = 358e2b8f71915195b75f1721531a2e3ba322249ad240c7835b02fe957f3ae331
>+SIZE (xpi/firefox-i18n-58.0b6/en-US.xpi) = 440011
>+SHA256 (xpi/firefox-i18n-58.0b6/en-ZA.xpi) = 461a9d8e1718af8a0f3cc8692cd109859c338a4bf22fbacb639cc474365ebc68
>+SIZE (xpi/firefox-i18n-58.0b6/en-ZA.xpi) = 432336
>+SHA256 (xpi/firefox-i18n-58.0b6/eo.xpi) = 8b25ebcb930b98fc0b3c6ba77213deef9135ca5a4f02a10ea302fa4cfdf2d54a
>+SIZE (xpi/firefox-i18n-58.0b6/eo.xpi) = 454429
>+SHA256 (xpi/firefox-i18n-58.0b6/es-AR.xpi) = 2cdbbebc0159c858e2125cdb7885d8a3cff7a0738515c8e8364f034305d0cde3
>+SIZE (xpi/firefox-i18n-58.0b6/es-AR.xpi) = 462393
>+SHA256 (xpi/firefox-i18n-58.0b6/es-CL.xpi) = 80a5a78f054d5d21e355f11cd90d1c214b51a94fd59018f246a8d85c844bbcbc
>+SIZE (xpi/firefox-i18n-58.0b6/es-CL.xpi) = 465113
>+SHA256 (xpi/firefox-i18n-58.0b6/es-ES.xpi) = 7539c54749bc04fcf82e49d6e51acebb1bd0c48d77a2f0bc3ff61ca51f0ebab9
>+SIZE (xpi/firefox-i18n-58.0b6/es-ES.xpi) = 353186
>+SHA256 (xpi/firefox-i18n-58.0b6/es-MX.xpi) = 30aa6c395cd4d892b90a364258a53c6183d935037d68daf793410f5e9d2297ef
>+SIZE (xpi/firefox-i18n-58.0b6/es-MX.xpi) = 468201
>+SHA256 (xpi/firefox-i18n-58.0b6/et.xpi) = e0cab097f72566e6e65357ec842b9b75d742d19341403c8abebbcf66edd328f9
>+SIZE (xpi/firefox-i18n-58.0b6/et.xpi) = 447974
>+SHA256 (xpi/firefox-i18n-58.0b6/eu.xpi) = fd7d67687aad4dbfb538466485e65977c412f38671285d7b215e8539671315e1
>+SIZE (xpi/firefox-i18n-58.0b6/eu.xpi) = 455299
>+SHA256 (xpi/firefox-i18n-58.0b6/fa.xpi) = 98038cbc344b6004139abc72ed80f039a6edb2e0f7b5216009e88ef73c95000f
>+SIZE (xpi/firefox-i18n-58.0b6/fa.xpi) = 510291
>+SHA256 (xpi/firefox-i18n-58.0b6/ff.xpi) = c9ad8785de953ec5b617bd1893619f686c2509a733f46a921383c102a30aa24f
>+SIZE (xpi/firefox-i18n-58.0b6/ff.xpi) = 456026
>+SHA256 (xpi/firefox-i18n-58.0b6/fi.xpi) = 072327346e8b9ea76b475d0aab2d6f599baedee1d329a1298476ce1926184902
>+SIZE (xpi/firefox-i18n-58.0b6/fi.xpi) = 446766
>+SHA256 (xpi/firefox-i18n-58.0b6/fr.xpi) = 7568600130b36c1ff0ebd007627ac416009dc640bb2d616b9e76adc96cffae49
>+SIZE (xpi/firefox-i18n-58.0b6/fr.xpi) = 472306
>+SHA256 (xpi/firefox-i18n-58.0b6/fy-NL.xpi) = c7296e62e66609cb37379ca575b5e44499b74b97b8e16999f0d05fd5af0f9e9a
>+SIZE (xpi/firefox-i18n-58.0b6/fy-NL.xpi) = 465323
>+SHA256 (xpi/firefox-i18n-58.0b6/ga-IE.xpi) = e705d5afb549e91a6ff84b2cc47037b918a06870adeda0e3978d4df7dd96a3b5
>+SIZE (xpi/firefox-i18n-58.0b6/ga-IE.xpi) = 476817
>+SHA256 (xpi/firefox-i18n-58.0b6/gd.xpi) = 38baade0b92a73356aef7a8045ce7ff1665249b750180641f00d70da24100b73
>+SIZE (xpi/firefox-i18n-58.0b6/gd.xpi) = 464508
>+SHA256 (xpi/firefox-i18n-58.0b6/gl.xpi) = 7e5f4f39692f3be85eada6778cc4310c0dad2e214f49bd9ebe90bea6c3be6ab3
>+SIZE (xpi/firefox-i18n-58.0b6/gl.xpi) = 451714
>+SHA256 (xpi/firefox-i18n-58.0b6/gn.xpi) = 8442f3781003a8e2ca27b056d386d0ee5e1f49124fece5cbdd84937352bdcabf
>+SIZE (xpi/firefox-i18n-58.0b6/gn.xpi) = 472922
>+SHA256 (xpi/firefox-i18n-58.0b6/gu-IN.xpi) = 05ee1a46cd38ebeadc9089afa6f4df202f00dd247c21ce1766a10c487f0f53db
>+SIZE (xpi/firefox-i18n-58.0b6/gu-IN.xpi) = 512558
>+SHA256 (xpi/firefox-i18n-58.0b6/he.xpi) = 6563fa08bff5bc6fc1ff7144b0b241896e0972509e0a65bb92f78e11522de189
>+SIZE (xpi/firefox-i18n-58.0b6/he.xpi) = 473148
>+SHA256 (xpi/firefox-i18n-58.0b6/hi-IN.xpi) = fbbff4bfe185811a66ad2a1cd732fcad8e7decdc4bdbfea679c367a8df5f9fdb
>+SIZE (xpi/firefox-i18n-58.0b6/hi-IN.xpi) = 525453
>+SHA256 (xpi/firefox-i18n-58.0b6/hr.xpi) = 3040adde5b5796ef413c62db5e191819e78ef0a3c57f03045137796bd0f2bb46
>+SIZE (xpi/firefox-i18n-58.0b6/hr.xpi) = 462727
>+SHA256 (xpi/firefox-i18n-58.0b6/hsb.xpi) = e0d40af925096c2ad17d72a3c1a560c6d912f975b178074be505f59f4ea9dbc7
>+SIZE (xpi/firefox-i18n-58.0b6/hsb.xpi) = 475963
>+SHA256 (xpi/firefox-i18n-58.0b6/hu.xpi) = b6f29d945e8936e0460319cee198f612f5a87c4f4af647e3b822cdc0428fd828
>+SIZE (xpi/firefox-i18n-58.0b6/hu.xpi) = 476149
>+SHA256 (xpi/firefox-i18n-58.0b6/hy-AM.xpi) = 947853183c856365c2cca2fcde56482cd87cd17b3b1c4d2d88c4879e63564326
>+SIZE (xpi/firefox-i18n-58.0b6/hy-AM.xpi) = 511284
>+SHA256 (xpi/firefox-i18n-58.0b6/id.xpi) = 252e1ca9f68256e5479e5bf8928d5eebf85cbf971a3810176ec8fb3c9802f02e
>+SIZE (xpi/firefox-i18n-58.0b6/id.xpi) = 443531
>+SHA256 (xpi/firefox-i18n-58.0b6/is.xpi) = 57738b955d036842d710e9606d2da77f74b5f2c0e4b323e6a4fc1958f0eec2c6
>+SIZE (xpi/firefox-i18n-58.0b6/is.xpi) = 453474
>+SHA256 (xpi/firefox-i18n-58.0b6/it.xpi) = 41ac8d789c90aaedb28c12c7d5d93ee734856cec28e6241fcdc74953ef83b3f7
>+SIZE (xpi/firefox-i18n-58.0b6/it.xpi) = 345976
>+SHA256 (xpi/firefox-i18n-58.0b6/ja.xpi) = b39cd4ae764484f732d11cfcd445114f4de3eaa89e6e87b75370e826392720f9
>+SIZE (xpi/firefox-i18n-58.0b6/ja.xpi) = 509825
>+SHA256 (xpi/firefox-i18n-58.0b6/ka.xpi) = dd2118960ebb5e8e901b75ca48a3132181388491e00ac190aec84cb3b2644c3b
>+SIZE (xpi/firefox-i18n-58.0b6/ka.xpi) = 491535
>+SHA256 (xpi/firefox-i18n-58.0b6/kab.xpi) = b30665d18327636d02a203d95ef7abbe546cd583dc757196a1c86f699751967a
>+SIZE (xpi/firefox-i18n-58.0b6/kab.xpi) = 461943
>+SHA256 (xpi/firefox-i18n-58.0b6/kk.xpi) = 619eeae195fe1986b54852ff75f08c7d11f4f8264dc5f425d3525bc2512ca4dd
>+SIZE (xpi/firefox-i18n-58.0b6/kk.xpi) = 518524
>+SHA256 (xpi/firefox-i18n-58.0b6/km.xpi) = 58528208c2c02fc27c4b17b2943ad78f2eae3680ffd6b230fdd2970fca178d56
>+SIZE (xpi/firefox-i18n-58.0b6/km.xpi) = 529770
>+SHA256 (xpi/firefox-i18n-58.0b6/kn.xpi) = f0576d374f9f34fee86726d17c60deaf39bc8bcb29ba7853e31dacb96d6a87c3
>+SIZE (xpi/firefox-i18n-58.0b6/kn.xpi) = 531210
>+SHA256 (xpi/firefox-i18n-58.0b6/ko.xpi) = 41a6b7512fbcb01e8c45a8e0e01cf4426735c0da83367e3c605c698ad80373b2
>+SIZE (xpi/firefox-i18n-58.0b6/ko.xpi) = 486932
>+SHA256 (xpi/firefox-i18n-58.0b6/lij.xpi) = cf147824ddd262b12815be5b0c27879f204b1e1dcad716f97548734c118a6007
>+SIZE (xpi/firefox-i18n-58.0b6/lij.xpi) = 452925
>+SHA256 (xpi/firefox-i18n-58.0b6/lt.xpi) = 8956053a63f22eac46afcb309232d7abcf767e884e039246b95d86c3a132afc5
>+SIZE (xpi/firefox-i18n-58.0b6/lt.xpi) = 474318
>+SHA256 (xpi/firefox-i18n-58.0b6/lv.xpi) = 08f65e4f7ca1d7eb42ad84b4dd0fced3846b17d8d3ec51ac7939fb9d181074bc
>+SIZE (xpi/firefox-i18n-58.0b6/lv.xpi) = 466057
>+SHA256 (xpi/firefox-i18n-58.0b6/mai.xpi) = a15ec95331d0de1f1504b52099c926242b06ba72acc6797aec311c1abfd0f02d
>+SIZE (xpi/firefox-i18n-58.0b6/mai.xpi) = 507029
>+SHA256 (xpi/firefox-i18n-58.0b6/mk.xpi) = 3f9f002793a23691265583d7f02ddfed04882316ccc881518aaccd2ecc66a214
>+SIZE (xpi/firefox-i18n-58.0b6/mk.xpi) = 489714
>+SHA256 (xpi/firefox-i18n-58.0b6/ml.xpi) = 265e5e3ca2dfbd0ab0873a062f75a637077971681c369bdce20f7253909faa8a
>+SIZE (xpi/firefox-i18n-58.0b6/ml.xpi) = 528398
>+SHA256 (xpi/firefox-i18n-58.0b6/mr.xpi) = a0013db4b525f3517f536beadf63b31f14cbf3c9ed47ecbda30b75fabbebaa92
>+SIZE (xpi/firefox-i18n-58.0b6/mr.xpi) = 520641
>+SHA256 (xpi/firefox-i18n-58.0b6/ms.xpi) = e2d8e3a4511d81ee37080508e6c4f873e2296c65fcc9125e269c970100762db1
>+SIZE (xpi/firefox-i18n-58.0b6/ms.xpi) = 450754
>+SHA256 (xpi/firefox-i18n-58.0b6/my.xpi) = 33ed16e5454cf7c5665ccac85a8fdba39eb7b905e2ad9965838b9a3631459754
>+SIZE (xpi/firefox-i18n-58.0b6/my.xpi) = 516281
>+SHA256 (xpi/firefox-i18n-58.0b6/nb-NO.xpi) = d1dbc2086a83a2c5313adad1b7d37daa1166aa526b967952f3f5e9b3992d58ee
>+SIZE (xpi/firefox-i18n-58.0b6/nb-NO.xpi) = 450952
>+SHA256 (xpi/firefox-i18n-58.0b6/ne-NP.xpi) = 9f8def738641de3cb201f16e56efe08d40d5e2231d6964578d0e5d166fac4951
>+SIZE (xpi/firefox-i18n-58.0b6/ne-NP.xpi) = 513866
>+SHA256 (xpi/firefox-i18n-58.0b6/nl.xpi) = 59055e0ae4eda4009a47e0378c785894bbe6cd1db7c35cd19be35b29ccaf3299
>+SIZE (xpi/firefox-i18n-58.0b6/nl.xpi) = 457920
>+SHA256 (xpi/firefox-i18n-58.0b6/nn-NO.xpi) = 6de104f24486c4aa585215698b1feae2b9245b4f3367ca1ffc5421a543387e9c
>+SIZE (xpi/firefox-i18n-58.0b6/nn-NO.xpi) = 451358
>+SHA256 (xpi/firefox-i18n-58.0b6/or.xpi) = ed660f0d5263f410c2206297703c97f3eb4e8c7508147f72c717e9943719c841
>+SIZE (xpi/firefox-i18n-58.0b6/or.xpi) = 500120
>+SHA256 (xpi/firefox-i18n-58.0b6/pa-IN.xpi) = 9304d145515d888243999699aabe7aca29fe2e7d3178d99f8290d6b9ba2f8d56
>+SIZE (xpi/firefox-i18n-58.0b6/pa-IN.xpi) = 495033
>+SHA256 (xpi/firefox-i18n-58.0b6/pl.xpi) = a8b29db802fafca938544e3bd9e64ede8ca13d1649610bde17f768318996b3ad
>+SIZE (xpi/firefox-i18n-58.0b6/pl.xpi) = 362848
>+SHA256 (xpi/firefox-i18n-58.0b6/pt-BR.xpi) = 28b4bd5549a7adf9713fd438a4fea7872b67b95e6c8cdeeedf4b4a0838e075ca
>+SIZE (xpi/firefox-i18n-58.0b6/pt-BR.xpi) = 456513
>+SHA256 (xpi/firefox-i18n-58.0b6/pt-PT.xpi) = 9e998ba17af7cd5b7f7c19b54787218a237226e1c8c2595aabfe6f277d39b70c
>+SIZE (xpi/firefox-i18n-58.0b6/pt-PT.xpi) = 459403
>+SHA256 (xpi/firefox-i18n-58.0b6/rm.xpi) = 3d642f50c71bb2e135c739b87184aae6eb8c72b53b0de0f6d87c704c11aa306d
>+SIZE (xpi/firefox-i18n-58.0b6/rm.xpi) = 452476
>+SHA256 (xpi/firefox-i18n-58.0b6/ro.xpi) = a1c806b4d6149a5b91b6cabe4fbc4fade3c6bc05173b5c94e1120f6f17205f8f
>+SIZE (xpi/firefox-i18n-58.0b6/ro.xpi) = 456037
>+SHA256 (xpi/firefox-i18n-58.0b6/ru.xpi) = a2c1d93e82dbd642290c903988b44175870d8fd2be852ac8924f02f1768c51de
>+SIZE (xpi/firefox-i18n-58.0b6/ru.xpi) = 526135
>+SHA256 (xpi/firefox-i18n-58.0b6/si.xpi) = 336dd28ed4d7ed3a4f8cee0cf832411155325a3380db1ce3f0bb3de9ebb8d6bb
>+SIZE (xpi/firefox-i18n-58.0b6/si.xpi) = 497900
>+SHA256 (xpi/firefox-i18n-58.0b6/sk.xpi) = 3596a0caf930ee5282c2c0e4e9ae8125635ccf6010455cb1dfdba14f9e9eb6db
>+SIZE (xpi/firefox-i18n-58.0b6/sk.xpi) = 479898
>+SHA256 (xpi/firefox-i18n-58.0b6/sl.xpi) = 082ab7ae6513b730f973b95237016f69931857d6e25f0ae5f74c747db536c4e4
>+SIZE (xpi/firefox-i18n-58.0b6/sl.xpi) = 459207
>+SHA256 (xpi/firefox-i18n-58.0b6/son.xpi) = 5c99d721dcb5873ea46cf307557520511a2cbcbd308e978dcbac653ac615d64d
>+SIZE (xpi/firefox-i18n-58.0b6/son.xpi) = 451480
>+SHA256 (xpi/firefox-i18n-58.0b6/sq.xpi) = bb5396c789a92bf1aab0ab771cadd4632d4c0682c258ed52e7b6e8d7144fb6ac
>+SIZE (xpi/firefox-i18n-58.0b6/sq.xpi) = 465297
>+SHA256 (xpi/firefox-i18n-58.0b6/sr.xpi) = 4ffe01cbd53e4c3ac62bb1017284b61286d23f594f5a8089393fd506471d8d0d
>+SIZE (xpi/firefox-i18n-58.0b6/sr.xpi) = 486326
>+SHA256 (xpi/firefox-i18n-58.0b6/sv-SE.xpi) = df1358334e43a8fd2c6335cac02eda71f26a5705607341e0ae4646d2a66f498f
>+SIZE (xpi/firefox-i18n-58.0b6/sv-SE.xpi) = 459101
>+SHA256 (xpi/firefox-i18n-58.0b6/ta.xpi) = e563fba3489ad210ac3e710b825db7be3aa107016e724dc7525b7476498d8313
>+SIZE (xpi/firefox-i18n-58.0b6/ta.xpi) = 513221
>+SHA256 (xpi/firefox-i18n-58.0b6/te.xpi) = c15d762f073f99d0562754a391e6c6f29b46308260f18d7820f0bed32af3074f
>+SIZE (xpi/firefox-i18n-58.0b6/te.xpi) = 530523
>+SHA256 (xpi/firefox-i18n-58.0b6/th.xpi) = 6ae4403abb4a7db21f2b3212ce01b39893cbfc650459cd3e42a200beaacacd33
>+SIZE (xpi/firefox-i18n-58.0b6/th.xpi) = 502310
>+SHA256 (xpi/firefox-i18n-58.0b6/tr.xpi) = c79665c4a8f3cab2ef5908ceff6fad2e45e4dc088698bd7be5bed9efd394222e
>+SIZE (xpi/firefox-i18n-58.0b6/tr.xpi) = 465013
>+SHA256 (xpi/firefox-i18n-58.0b6/uk.xpi) = 979a4625eeba33f98120a3a3d15b3897a28b6faa7be925dcfe02d2a2cbc76805
>+SIZE (xpi/firefox-i18n-58.0b6/uk.xpi) = 517420
>+SHA256 (xpi/firefox-i18n-58.0b6/ur.xpi) = 059fa8e7422bdac93836ab6a34c771b4a00499ed39640c8a6976a894728beb59
>+SIZE (xpi/firefox-i18n-58.0b6/ur.xpi) = 511282
>+SHA256 (xpi/firefox-i18n-58.0b6/uz.xpi) = 65943d8be65caf7ef44ece68978554af61be486a9da7156cef10d696899a6d49
>+SIZE (xpi/firefox-i18n-58.0b6/uz.xpi) = 462046
>+SHA256 (xpi/firefox-i18n-58.0b6/vi.xpi) = 009f9fdb444b45b4a683c5df361afeebe7ba781aa1ac1cad914cda14a5019eea
>+SIZE (xpi/firefox-i18n-58.0b6/vi.xpi) = 470021
>+SHA256 (xpi/firefox-i18n-58.0b6/xh.xpi) = 6af885ea970fd868b4d62be1f030ce2f2252d55a701b812d980929b6b29e2030
>+SIZE (xpi/firefox-i18n-58.0b6/xh.xpi) = 464808
>+SHA256 (xpi/firefox-i18n-58.0b6/zh-CN.xpi) = c8ed670051cc1135184087036cd5844b5d6c3a9bc569ad244819c6367b20f41a
>+SIZE (xpi/firefox-i18n-58.0b6/zh-CN.xpi) = 482859
>+SHA256 (xpi/firefox-i18n-58.0b6/zh-TW.xpi) = 31153a6f5cfbee4889bdf2486b9f082794824fb8a7be06cdd691b5320cbac61c
>+SIZE (xpi/firefox-i18n-58.0b6/zh-TW.xpi) = 480463
>diff --git a/www/firefox/Makefile b/www/firefox/Makefile
>index 4d9877f16278..b736fc4c1ce2 100644
>--- a/www/firefox/Makefile
>+++ b/www/firefox/Makefile
>@@ -2,24 +2,23 @@
> # $FreeBSD$
> 
> PORTNAME=	firefox
>-DISTVERSION=	57.0
>-PORTREVISION=	1
>+DISTVERSION=	58.0b6
> PORTEPOCH=	1
> CATEGORIES=	www ipv6
> MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \
>-		MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build4/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:security/nss \
> 		icu>=59.1,1:devel/icu \
> 		libevent>=2.1.8:devel/libevent \
> 		harfbuzz>=1.5.1: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 75a618aa0883..4f563c91cc88 100644
>--- a/www/firefox/distinfo
>+++ b/www/firefox/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1510498738
>-SHA256 (firefox-57.0.source.tar.xz) = 603af00155be87f2c9c58047dd0072971f1cdab1f632695aae6ad072efefbb8f
>-SIZE (firefox-57.0.source.tar.xz) = 250728772
>+TIMESTAMP = 1511460654
>+SHA256 (firefox-58.0b6.source.tar.xz) = b5b4d9f34a95debe2cca585d995198c0b97cef81669fa68d0b90103a5dcca20a
>+SIZE (firefox-58.0b6.source.tar.xz) = 248460040
>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..e1c130cefa17 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
> +# ==============================================================
>@@ -266,6 +254,6 @@ index 9297e4d6f501..d8e273887e4b 100644
> +
> +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