svn commit: r459712 - in branches/2018Q1: Mk Mk/Uses www/firefox www/firefox-i18n www/firefox/files

Jan Beich jbeich at FreeBSD.org
Tue Jan 23 00:03:01 UTC 2018 

Author: jbeich
Date: Tue Jan 23 00:02:59 2018
New Revision: 459712
URL: https://svnweb.freebsd.org/changeset/ports/459712

Log:
  MFH: r459118 r459392
  
  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
  Approved by:	ports-secteam (swills)

Added:
  branches/2018Q1/www/firefox/files/patch-dom_media_flac_FlacDecoder.cpp
     - copied unchanged from r459118, head/www/firefox/files/patch-dom_media_flac_FlacDecoder.cpp
  branches/2018Q1/www/firefox/files/patch-toolkit_moz.configure
     - copied unchanged from r459118, head/www/firefox/files/patch-toolkit_moz.configure
Deleted:
  branches/2018Q1/www/firefox/files/patch-bug1186967
  branches/2018Q1/www/firefox/files/patch-bug1366201
  branches/2018Q1/www/firefox/files/patch-bug1412558
  branches/2018Q1/www/firefox/files/patch-bug1414440
Modified:
  branches/2018Q1/Mk/Uses/gecko.mk
  branches/2018Q1/Mk/bsd.gecko.mk
  branches/2018Q1/www/firefox-i18n/Makefile
  branches/2018Q1/www/firefox-i18n/Makefile.lang
  branches/2018Q1/www/firefox-i18n/Makefile.option
  branches/2018Q1/www/firefox-i18n/distinfo
  branches/2018Q1/www/firefox/Makefile
  branches/2018Q1/www/firefox/distinfo
  branches/2018Q1/www/firefox/files/patch-bug826985
  branches/2018Q1/www/firefox/files/patch-bug847568
  branches/2018Q1/www/firefox/files/patch-z-bug517422
Directory Properties:
  branches/2018Q1/   (props changed)

Modified: branches/2018Q1/Mk/Uses/gecko.mk
==============================================================================
--- branches/2018Q1/Mk/Uses/gecko.mk	Tue Jan 23 00:01:36 2018	(r459711)
+++ branches/2018Q1/Mk/Uses/gecko.mk	Tue Jan 23 00:02:59 2018	(r459712)
@@ -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

Modified: branches/2018Q1/Mk/bsd.gecko.mk
==============================================================================
--- branches/2018Q1/Mk/bsd.gecko.mk	Tue Jan 23 00:01:36 2018	(r459711)
+++ branches/2018Q1/Mk/bsd.gecko.mk	Tue Jan 23 00:02:59 2018	(r459712)
@@ -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/
 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} \
@@ -396,7 +398,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

Modified: branches/2018Q1/www/firefox-i18n/Makefile
==============================================================================
--- branches/2018Q1/www/firefox-i18n/Makefile	Tue Jan 23 00:01:36 2018	(r459711)
+++ branches/2018Q1/www/firefox-i18n/Makefile	Tue Jan 23 00:02:59 2018	(r459712)
@@ -2,10 +2,11 @@
 # $FreeBSD$
 
 PORTNAME=	firefox-i18n
-PORTVERSION=	57.0.4
+PORTVERSION=	58.0
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	MOZILLA/${PORTNAME:S|-i18n||}/releases/${DISTVERSION}/linux-i686/xpi \
-		MOZILLA/${PORTNAME:S|-i18n||}/candidates/${DISTVERSION}-candidates/build1/linux-i686/xpi
+		MOZILLA/${PORTNAME:S|-i18n||}/candidates/${DISTVERSION}-candidates/build6/linux-i686/xpi
 PKGNAMEPREFIX=
 DISTFILES=	${FIREFOX_I18N_:S/$/.xpi/}
 DIST_SUBDIR=	xpi/${DISTNAME}
@@ -15,7 +16,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

Modified: branches/2018Q1/www/firefox-i18n/Makefile.lang
==============================================================================
--- branches/2018Q1/www/firefox-i18n/Makefile.lang	Tue Jan 23 00:01:36 2018	(r459711)
+++ branches/2018Q1/www/firefox-i18n/Makefile.lang	Tue Jan 23 00:02:59 2018	(r459712)
@@ -5,7 +5,7 @@ FIREFOX_I18N_ALL_=	ach af an ar as ast az be bg bn-BD 
 			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
 
@@ -212,6 +212,9 @@ FIREFOX_I18N+=  my
 .endif
 .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

Modified: branches/2018Q1/www/firefox-i18n/Makefile.option
==============================================================================
--- branches/2018Q1/www/firefox-i18n/Makefile.option	Tue Jan 23 00:01:36 2018	(r459711)
+++ branches/2018Q1/www/firefox-i18n/Makefile.option	Tue Jan 23 00:02:59 2018	(r459712)
@@ -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

Modified: branches/2018Q1/www/firefox-i18n/distinfo
==============================================================================
--- branches/2018Q1/www/firefox-i18n/distinfo	Tue Jan 23 00:01:36 2018	(r459711)
+++ branches/2018Q1/www/firefox-i18n/distinfo	Tue Jan 23 00:02:59 2018	(r459712)
@@ -1,191 +1,193 @@
-TIMESTAMP = 1515099818
-SHA256 (xpi/firefox-i18n-57.0.4/ach.xpi) = 0db61e82a56775653e8863cf46e92d7791ad855b789c326ad58dfbbf996a3880
-SIZE (xpi/firefox-i18n-57.0.4/ach.xpi) = 441113
-SHA256 (xpi/firefox-i18n-57.0.4/af.xpi) = 018e8ca7b2ac1ca55f53bded94cb979d0872986ee494864330b97457d9efd7e0
-SIZE (xpi/firefox-i18n-57.0.4/af.xpi) = 442206
-SHA256 (xpi/firefox-i18n-57.0.4/an.xpi) = 2a536acaa8efa972b4a74bd8a786607eee939f97ea6c5aa5773f7132f42638fa
-SIZE (xpi/firefox-i18n-57.0.4/an.xpi) = 462778
-SHA256 (xpi/firefox-i18n-57.0.4/ar.xpi) = cba589fa5e88446edf0d051e80c02f1a06224ad0b8d66a2de81cde615b78f01d
-SIZE (xpi/firefox-i18n-57.0.4/ar.xpi) = 488160
-SHA256 (xpi/firefox-i18n-57.0.4/as.xpi) = 758d4830417c3fff4cef797c12afac34d915e8940061e907ac68083f1c46c592
-SIZE (xpi/firefox-i18n-57.0.4/as.xpi) = 491075
-SHA256 (xpi/firefox-i18n-57.0.4/ast.xpi) = fb8b1c0c67bacf1cadafb43ffc639038a32fc5318be0dd691f8929ee2bd2b01e
-SIZE (xpi/firefox-i18n-57.0.4/ast.xpi) = 455504
-SHA256 (xpi/firefox-i18n-57.0.4/az.xpi) = 17f7ac16870d6ce48ca02d45ba9a35bc42b58e85f2e86767f211fb956d2a83c6
-SIZE (xpi/firefox-i18n-57.0.4/az.xpi) = 466045
-SHA256 (xpi/firefox-i18n-57.0.4/be.xpi) = b55f05cbb024c897a1f648cbc111a1802ad60b83531ebe3f9f5453606bed471c
-SIZE (xpi/firefox-i18n-57.0.4/be.xpi) = 516092
-SHA256 (xpi/firefox-i18n-57.0.4/bg.xpi) = b715180f7c48239b8d3404f1cfc102c0142e22f2aa7ac19877177e7a7f08d46a
-SIZE (xpi/firefox-i18n-57.0.4/bg.xpi) = 510351
-SHA256 (xpi/firefox-i18n-57.0.4/bn-BD.xpi) = da35dcf4bad2ec7484a4c9f0ddcb1424190e564e69801fbf2bbd94ee1d0c2a56
-SIZE (xpi/firefox-i18n-57.0.4/bn-BD.xpi) = 527189
-SHA256 (xpi/firefox-i18n-57.0.4/bn-IN.xpi) = 9093099dbb01f46e6b1aac94f401d1417985233dba072cfdbefecf7031756e81
-SIZE (xpi/firefox-i18n-57.0.4/bn-IN.xpi) = 516180
-SHA256 (xpi/firefox-i18n-57.0.4/br.xpi) = 198aead2f677fe5185edfc2abf3c83735e5b7f1cd19a2aaf7362b57003974eb4
-SIZE (xpi/firefox-i18n-57.0.4/br.xpi) = 451866
-SHA256 (xpi/firefox-i18n-57.0.4/bs.xpi) = 6ba5d0950dc28aa070f32b2d613ce0913420ce2022004b1c189f253b2b17847a
-SIZE (xpi/firefox-i18n-57.0.4/bs.xpi) = 459650
-SHA256 (xpi/firefox-i18n-57.0.4/ca.xpi) = 6ef787d51d1bcd2426d3426ea57d0cdab244fc49b93f19226291cb6b7c06b30e
-SIZE (xpi/firefox-i18n-57.0.4/ca.xpi) = 466641
-SHA256 (xpi/firefox-i18n-57.0.4/cak.xpi) = 099d5847c14fdf22dc81c1bb581d136d292b01714d99de2cdadeac3c2988e561
-SIZE (xpi/firefox-i18n-57.0.4/cak.xpi) = 475935
-SHA256 (xpi/firefox-i18n-57.0.4/cs.xpi) = ec2f172874be86e1c3950998e26cc77535ca8121db63c96d34068c58c3179d99
-SIZE (xpi/firefox-i18n-57.0.4/cs.xpi) = 469457
-SHA256 (xpi/firefox-i18n-57.0.4/cy.xpi) = 71f431a351e93c74c10f569601bb32ec990ea2a16b6bfb5f724966d0d7520bc6
-SIZE (xpi/firefox-i18n-57.0.4/cy.xpi) = 455788
-SHA256 (xpi/firefox-i18n-57.0.4/da.xpi) = 5a4a0a5aa93c19c4f5fb5aab3f83765ddfd2f993d1cb8278de1366f5626fc925
-SIZE (xpi/firefox-i18n-57.0.4/da.xpi) = 448416
-SHA256 (xpi/firefox-i18n-57.0.4/de.xpi) = 4370210b943ebbf8b814a6e04be9c7e99416c2ff4c54c31748f781f44309e36c
-SIZE (xpi/firefox-i18n-57.0.4/de.xpi) = 460813
-SHA256 (xpi/firefox-i18n-57.0.4/dsb.xpi) = 5170e4e0e160405dd3ed5515e35fe36dae70aec8f48102345619e5c75bd1488a
-SIZE (xpi/firefox-i18n-57.0.4/dsb.xpi) = 479509
-SHA256 (xpi/firefox-i18n-57.0.4/el.xpi) = 9d2e01e55e1fd7d39b8a0a923088334dc00dca0547fd5985aaeed6319cce5095
-SIZE (xpi/firefox-i18n-57.0.4/el.xpi) = 534484
-SHA256 (xpi/firefox-i18n-57.0.4/en-GB.xpi) = ae4e8350e6a36cdeb8bfb31341bef5bba1eb48b6915b99a34a6cde2fd838651e
-SIZE (xpi/firefox-i18n-57.0.4/en-GB.xpi) = 435623
-SHA256 (xpi/firefox-i18n-57.0.4/en-US.xpi) = 3afb8de6b06406aa92c2b7c353286823c06cdb45218af798278c04ab67d85032
-SIZE (xpi/firefox-i18n-57.0.4/en-US.xpi) = 441879
-SHA256 (xpi/firefox-i18n-57.0.4/en-ZA.xpi) = 92c5c01f2b5513d49aca2c453721026ac006cda7b1ed260083b8f101197dd9ea
-SIZE (xpi/firefox-i18n-57.0.4/en-ZA.xpi) = 432020
-SHA256 (xpi/firefox-i18n-57.0.4/eo.xpi) = b71b76d3a61b243bcdb71e02ed3e1752adf35301d45a441c21faa770799ce196
-SIZE (xpi/firefox-i18n-57.0.4/eo.xpi) = 454910
-SHA256 (xpi/firefox-i18n-57.0.4/es-AR.xpi) = 0c9ffc8db2fba0359bf69b6bf82b3be15b939dc834bb021cfaef88646abc9e3e
-SIZE (xpi/firefox-i18n-57.0.4/es-AR.xpi) = 462980
-SHA256 (xpi/firefox-i18n-57.0.4/es-CL.xpi) = 3f3af7c94265797b7947a6ca5b3868eab036dc2562777ff9a9c65cfcda9a5648
-SIZE (xpi/firefox-i18n-57.0.4/es-CL.xpi) = 465514
-SHA256 (xpi/firefox-i18n-57.0.4/es-ES.xpi) = 04edd799bfeb4a7433a80320abafc7d0c1c7c24982e1d53976638e5f2ac243f9
-SIZE (xpi/firefox-i18n-57.0.4/es-ES.xpi) = 353625
-SHA256 (xpi/firefox-i18n-57.0.4/es-MX.xpi) = 7bfee1ac67c2a50fca910ecd21aa54592774aa49ce11f58ddc64de1ccbdcc5c6
-SIZE (xpi/firefox-i18n-57.0.4/es-MX.xpi) = 468761
-SHA256 (xpi/firefox-i18n-57.0.4/et.xpi) = 37ac8824f08bfd6d931bb6d325226a970adcf4a8b3fb9ad651ef6d965f8784bd
-SIZE (xpi/firefox-i18n-57.0.4/et.xpi) = 447279
-SHA256 (xpi/firefox-i18n-57.0.4/eu.xpi) = 7b6df791d0390b4cdbe92811c5bd5e374958ad242a3bbc7a49f1cbf963aa5b36
-SIZE (xpi/firefox-i18n-57.0.4/eu.xpi) = 454673
-SHA256 (xpi/firefox-i18n-57.0.4/fa.xpi) = 7be55f40579f970e2682472fbb66e8f182c14491f67127991684e45968fbf3ed
-SIZE (xpi/firefox-i18n-57.0.4/fa.xpi) = 510829
-SHA256 (xpi/firefox-i18n-57.0.4/ff.xpi) = f3321f6ecaad8d0171741fe91420492d09515b25cc9f7be764dc258b06dc7db7
-SIZE (xpi/firefox-i18n-57.0.4/ff.xpi) = 454015
-SHA256 (xpi/firefox-i18n-57.0.4/fi.xpi) = 71f29805ebe1f46242d4e01846880f42f310a42fbba22872014d8d45ceee29ea
-SIZE (xpi/firefox-i18n-57.0.4/fi.xpi) = 446244
-SHA256 (xpi/firefox-i18n-57.0.4/fr.xpi) = a959c6f196e6a26d0941a336cb6b1183a8e5af789380f249f7a2e75510bc2610
-SIZE (xpi/firefox-i18n-57.0.4/fr.xpi) = 472722
-SHA256 (xpi/firefox-i18n-57.0.4/fy-NL.xpi) = f4e9632af6d1850a8079b12e2652de3af69fdcc2c9db06f79c94b3ef5d1de0c2
-SIZE (xpi/firefox-i18n-57.0.4/fy-NL.xpi) = 465911
-SHA256 (xpi/firefox-i18n-57.0.4/ga-IE.xpi) = 665ce3c813e280e821a1311c8ad3a7744583fbed821bb23240354163bed13ff1
-SIZE (xpi/firefox-i18n-57.0.4/ga-IE.xpi) = 475963
-SHA256 (xpi/firefox-i18n-57.0.4/gd.xpi) = 20388643eececf3e1687b7deec855ff5ae094bf852c0d22c9bb805f344a7404b
-SIZE (xpi/firefox-i18n-57.0.4/gd.xpi) = 465122
-SHA256 (xpi/firefox-i18n-57.0.4/gl.xpi) = dc3bba2acaa91c3cbb9a137d4ba76ea321447f1a935de45c81e9a7ac9310e2c6
-SIZE (xpi/firefox-i18n-57.0.4/gl.xpi) = 452032
-SHA256 (xpi/firefox-i18n-57.0.4/gn.xpi) = 6138f2080bab839e83a709307f443b765daa8654a2bd40a8b93c1db9e94793bf
-SIZE (xpi/firefox-i18n-57.0.4/gn.xpi) = 471956
-SHA256 (xpi/firefox-i18n-57.0.4/gu-IN.xpi) = 651fbcff0b9b94071695bcfc2517ef2a151235ebd609fe55cf7433771103e6de
-SIZE (xpi/firefox-i18n-57.0.4/gu-IN.xpi) = 511990
-SHA256 (xpi/firefox-i18n-57.0.4/he.xpi) = 004f5c836c007157851e70e27b9afe690b83ab6cc3358d5a406961fc504b62e7
-SIZE (xpi/firefox-i18n-57.0.4/he.xpi) = 471921
-SHA256 (xpi/firefox-i18n-57.0.4/hi-IN.xpi) = 2355ad6a0d3ed332068e619d2f159111b80327989c6a4ca7cb4eff87ff77f753
-SIZE (xpi/firefox-i18n-57.0.4/hi-IN.xpi) = 526111
-SHA256 (xpi/firefox-i18n-57.0.4/hr.xpi) = aa836c086e743f90807db62eb66c911a8ed2d48e52b99b649c446832d399cd96
-SIZE (xpi/firefox-i18n-57.0.4/hr.xpi) = 460722
-SHA256 (xpi/firefox-i18n-57.0.4/hsb.xpi) = 49ec24fff47910b9249037f72e14252284c51cd0e171259128ea7365bbe68844
-SIZE (xpi/firefox-i18n-57.0.4/hsb.xpi) = 476505
-SHA256 (xpi/firefox-i18n-57.0.4/hu.xpi) = 606bfacd3bc3ffceb3b431378f66c49db6b6a37c5eedc84128dd00b15a8fb3d2
-SIZE (xpi/firefox-i18n-57.0.4/hu.xpi) = 476607
-SHA256 (xpi/firefox-i18n-57.0.4/hy-AM.xpi) = de5d81269f2293eedb3146150e49a2b48a5729d1a09f092be4c66bf4712fe267
-SIZE (xpi/firefox-i18n-57.0.4/hy-AM.xpi) = 510825
-SHA256 (xpi/firefox-i18n-57.0.4/id.xpi) = 5c3af12deb175399c67878856850eb7a1794bb6836dd1f3b072489dd8b3a6e1d
-SIZE (xpi/firefox-i18n-57.0.4/id.xpi) = 444041
-SHA256 (xpi/firefox-i18n-57.0.4/is.xpi) = 7fcbefb0ef86f4416097042a20a9ff5ebb08cab09e8efeea1d446fc436bbeee8
-SIZE (xpi/firefox-i18n-57.0.4/is.xpi) = 452660
-SHA256 (xpi/firefox-i18n-57.0.4/it.xpi) = 6dae24cb5e0d562f6521d5ceea3f79beca5ad4f7800a6883cb32429ee02e4bec
-SIZE (xpi/firefox-i18n-57.0.4/it.xpi) = 347172
-SHA256 (xpi/firefox-i18n-57.0.4/ja.xpi) = 8e861ab62866d82798722c433accbd94a7a20ca7701fa05ccc2458c7d2026f8e
-SIZE (xpi/firefox-i18n-57.0.4/ja.xpi) = 508553
-SHA256 (xpi/firefox-i18n-57.0.4/ka.xpi) = 162acea7cd9df51ff0481d90dc239682f8cf834ec37f51a714b9e38d4ffa338e
-SIZE (xpi/firefox-i18n-57.0.4/ka.xpi) = 492356
-SHA256 (xpi/firefox-i18n-57.0.4/kab.xpi) = 8c7f6ece7b746c37a407bbbb22c79961a9e0762e7aabc8f945390e1bec515ebc
-SIZE (xpi/firefox-i18n-57.0.4/kab.xpi) = 462530
-SHA256 (xpi/firefox-i18n-57.0.4/kk.xpi) = f003d5f0db4c94c793b0327f3ca5040d9a420cbcd03d6c717558c936c6aaa4a3
-SIZE (xpi/firefox-i18n-57.0.4/kk.xpi) = 519249
-SHA256 (xpi/firefox-i18n-57.0.4/km.xpi) = 438f20f6ff1f24066c91679dcbb570ed814ddd3090cbba06e1d975d542916931
-SIZE (xpi/firefox-i18n-57.0.4/km.xpi) = 530080
-SHA256 (xpi/firefox-i18n-57.0.4/kn.xpi) = 21e92623823811b62852a14a61985151d2a4dfa1c2d97592b63338eb63b354c2
-SIZE (xpi/firefox-i18n-57.0.4/kn.xpi) = 531316
-SHA256 (xpi/firefox-i18n-57.0.4/ko.xpi) = 9e26a3960988d1c79a60dfe1cbd9221f754f3e9cc54984f28660ea729012cc4b
-SIZE (xpi/firefox-i18n-57.0.4/ko.xpi) = 487305
-SHA256 (xpi/firefox-i18n-57.0.4/lij.xpi) = 6bb35ffb667d942c548086c82717eb29b6a9c18933346d0f47278e44fe68ef76
-SIZE (xpi/firefox-i18n-57.0.4/lij.xpi) = 452343
-SHA256 (xpi/firefox-i18n-57.0.4/lt.xpi) = 63b12574a6bbb97619f1aa0e0d585dbd57df3a2582989eaacd7520c1cbd13adc
-SIZE (xpi/firefox-i18n-57.0.4/lt.xpi) = 474957
-SHA256 (xpi/firefox-i18n-57.0.4/lv.xpi) = a15d7e0641a84b914257545ae422b24476bcc536378fe15626e750ebdbddfa95
-SIZE (xpi/firefox-i18n-57.0.4/lv.xpi) = 465243
-SHA256 (xpi/firefox-i18n-57.0.4/mai.xpi) = e990c82a2b92081fc064813db8d73da71ed0f9bc611a79e767a0d3a88928e9c0
-SIZE (xpi/firefox-i18n-57.0.4/mai.xpi) = 507396
-SHA256 (xpi/firefox-i18n-57.0.4/mk.xpi) = 8f15d51c621e877314c68e4f11559b57556a22ea74e18b40bdbad2c906b2d110
-SIZE (xpi/firefox-i18n-57.0.4/mk.xpi) = 490853
-SHA256 (xpi/firefox-i18n-57.0.4/ml.xpi) = ac1b73452a2818a80958de7122e9f653bc62de3408ac3207f60cf1ad6f033063
-SIZE (xpi/firefox-i18n-57.0.4/ml.xpi) = 528255
-SHA256 (xpi/firefox-i18n-57.0.4/mr.xpi) = fdc5bbf4e8b4ce6bb2039c57bd28a2737765a97995794a338e123e31e64d763d
-SIZE (xpi/firefox-i18n-57.0.4/mr.xpi) = 521290
-SHA256 (xpi/firefox-i18n-57.0.4/ms.xpi) = 64dbc7ccca7adaceb6b960ddad0d03b3b5cd220c691c79dceef5f89c0f3e6ba4
-SIZE (xpi/firefox-i18n-57.0.4/ms.xpi) = 451255
-SHA256 (xpi/firefox-i18n-57.0.4/my.xpi) = 9dc539ef7641fb881f66d7b98b6bc0a76972d8e8734499ba6309d904436dc684
-SIZE (xpi/firefox-i18n-57.0.4/my.xpi) = 517703
-SHA256 (xpi/firefox-i18n-57.0.4/nb-NO.xpi) = efe347ea92a21c9e1f9acd34eb0e05f19ccafd62b10a21ffa09febcc7584e8ef
-SIZE (xpi/firefox-i18n-57.0.4/nb-NO.xpi) = 451557
-SHA256 (xpi/firefox-i18n-57.0.4/nl.xpi) = 0d8ab0fdda99f63ab21b482b7351409715a2cd2f41cddf6bbe5b1b272da74bcd
-SIZE (xpi/firefox-i18n-57.0.4/nl.xpi) = 458319
-SHA256 (xpi/firefox-i18n-57.0.4/nn-NO.xpi) = 223d3ef52c3820258b49df7f42d9d861ad56f756860778b0ffd01cb13c453f1b
-SIZE (xpi/firefox-i18n-57.0.4/nn-NO.xpi) = 452004
-SHA256 (xpi/firefox-i18n-57.0.4/or.xpi) = 0e72f2fcaacc58de0031c4f4410e5b5f2cc0eabe931a26f23e74407b63b27aaa
-SIZE (xpi/firefox-i18n-57.0.4/or.xpi) = 500867
-SHA256 (xpi/firefox-i18n-57.0.4/pa-IN.xpi) = 870ee04109bceda64f6097eb64d57dae741cae1b3f327515a6ecac6c87253974
-SIZE (xpi/firefox-i18n-57.0.4/pa-IN.xpi) = 495272
-SHA256 (xpi/firefox-i18n-57.0.4/pl.xpi) = 0d91f5bdc4dfaa9fb6daa20f771148e38f2d9e4399bf30fe244030e276c9ac89
-SIZE (xpi/firefox-i18n-57.0.4/pl.xpi) = 364230
-SHA256 (xpi/firefox-i18n-57.0.4/pt-BR.xpi) = 4b2d43c3b949a37cccf71b71b45080792e2885d834a4e276fa7df5cf6a74dcc6
-SIZE (xpi/firefox-i18n-57.0.4/pt-BR.xpi) = 457154
-SHA256 (xpi/firefox-i18n-57.0.4/pt-PT.xpi) = 2ef8b8664011c26508cb09b136c45d9c9a1900a2300e097a5f230ca814a79780
-SIZE (xpi/firefox-i18n-57.0.4/pt-PT.xpi) = 460000
-SHA256 (xpi/firefox-i18n-57.0.4/rm.xpi) = 37e0a1fff509be32a6cc359eed53f56e06f207c8c2e85d4e1e6faede3bb3b4ac
-SIZE (xpi/firefox-i18n-57.0.4/rm.xpi) = 451059
-SHA256 (xpi/firefox-i18n-57.0.4/ro.xpi) = 9c5669d219007a5a09fc0b9f813edb63f152a85329698e534a18799dbc8e9b68
-SIZE (xpi/firefox-i18n-57.0.4/ro.xpi) = 455510
-SHA256 (xpi/firefox-i18n-57.0.4/ru.xpi) = 4a392e7dfa9cc7e28f3e9a0d4ce5de24f6531d12bca17254d86043c8172acc1a
-SIZE (xpi/firefox-i18n-57.0.4/ru.xpi) = 527005
-SHA256 (xpi/firefox-i18n-57.0.4/si.xpi) = d124a90746df53a94b6dfd0f74b7a0e365ce8a36d8b5ff6b5022d557be801651
-SIZE (xpi/firefox-i18n-57.0.4/si.xpi) = 498324
-SHA256 (xpi/firefox-i18n-57.0.4/sk.xpi) = beabdded23f975d25273b4179933d8bfe618cc49de46a356bbd8a8d8a0b632dc
-SIZE (xpi/firefox-i18n-57.0.4/sk.xpi) = 480397
-SHA256 (xpi/firefox-i18n-57.0.4/sl.xpi) = d0c419d071c43f139c0467f643a7619a333bfc28733b2c5c4df3bba1e1aa94bc
-SIZE (xpi/firefox-i18n-57.0.4/sl.xpi) = 459377
-SHA256 (xpi/firefox-i18n-57.0.4/son.xpi) = f0b8b5450dcd145148ae5fa4f4c446a623014ddc0f8c8a69b7990db667d5c32d
-SIZE (xpi/firefox-i18n-57.0.4/son.xpi) = 450930
-SHA256 (xpi/firefox-i18n-57.0.4/sq.xpi) = 2f08696a618b027f3b5b866abe42bba53c1f37d89b0b2948aa4c3f893795f537
-SIZE (xpi/firefox-i18n-57.0.4/sq.xpi) = 465051
-SHA256 (xpi/firefox-i18n-57.0.4/sr.xpi) = d1418c1a1de6b9958917d3ae288eb794a463139c947d2af7d8f758f37b8865ff
-SIZE (xpi/firefox-i18n-57.0.4/sr.xpi) = 487004
-SHA256 (xpi/firefox-i18n-57.0.4/sv-SE.xpi) = 452278c7f1e5ee9f23d126de8f3659750ad5a8f5c87235fc089ffacf19348e53
-SIZE (xpi/firefox-i18n-57.0.4/sv-SE.xpi) = 459665
-SHA256 (xpi/firefox-i18n-57.0.4/ta.xpi) = 642a0c33076fa02ddb624c5aaaa7f4892151e902585d6b6f72460db5923f1548
-SIZE (xpi/firefox-i18n-57.0.4/ta.xpi) = 513228
-SHA256 (xpi/firefox-i18n-57.0.4/te.xpi) = 8e2fd00f5eb274f8dd8fb51101ddeccce2c755d85cb4054d682ae2c5981a48c9
-SIZE (xpi/firefox-i18n-57.0.4/te.xpi) = 530693
-SHA256 (xpi/firefox-i18n-57.0.4/th.xpi) = f50f501e4eecd612b4946d9db620009012b3ccef5bc7ba87b3bf47c92204068b
-SIZE (xpi/firefox-i18n-57.0.4/th.xpi) = 502452
-SHA256 (xpi/firefox-i18n-57.0.4/tr.xpi) = 5706cc11ad164057b7122829d15d3fbed85a76fab1f6ac398191711084663e95
-SIZE (xpi/firefox-i18n-57.0.4/tr.xpi) = 465581
-SHA256 (xpi/firefox-i18n-57.0.4/uk.xpi) = 163417dd79a964730dfd1e5e673679d70d0537089934a8ef4c72ef305becb830
-SIZE (xpi/firefox-i18n-57.0.4/uk.xpi) = 518138
-SHA256 (xpi/firefox-i18n-57.0.4/ur.xpi) = 4782235ccb58b4910eb41d9e40e09e596cda1028cf250006d6baca96abc2231e
-SIZE (xpi/firefox-i18n-57.0.4/ur.xpi) = 511138
-SHA256 (xpi/firefox-i18n-57.0.4/uz.xpi) = a07005793b45fa437374f28007d2e2cd38a87c3c143932f33c9e015450fa7b2d
-SIZE (xpi/firefox-i18n-57.0.4/uz.xpi) = 461694
-SHA256 (xpi/firefox-i18n-57.0.4/vi.xpi) = 5579932fc28c8032a48a5a0bf79dc0c53e73455037e8e1263f7bb0601522b18a
-SIZE (xpi/firefox-i18n-57.0.4/vi.xpi) = 471320
-SHA256 (xpi/firefox-i18n-57.0.4/xh.xpi) = b311b001e941a9e4065037b77b846132482ad711de4f214a4bfe8e8619a77d49
-SIZE (xpi/firefox-i18n-57.0.4/xh.xpi) = 464461
-SHA256 (xpi/firefox-i18n-57.0.4/zh-CN.xpi) = eb826002503363424f93a516623382b887b1a5fcee96ef0e610d9aed53c744cf
-SIZE (xpi/firefox-i18n-57.0.4/zh-CN.xpi) = 483625
-SHA256 (xpi/firefox-i18n-57.0.4/zh-TW.xpi) = e24b8dd7a5953bbbf0dcbadbd370d2153fb9050da02acd0709a6ea7b629dbd87
-SIZE (xpi/firefox-i18n-57.0.4/zh-TW.xpi) = 482348
+TIMESTAMP = 1516319766
+SHA256 (xpi/firefox-i18n-58.0/ach.xpi) = 2927ffaed1c67d844e36c61a735508341b4da5ae062e87ef6bb728ea6252c120
+SIZE (xpi/firefox-i18n-58.0/ach.xpi) = 445610
+SHA256 (xpi/firefox-i18n-58.0/af.xpi) = 56398a4ea260c26c5d1a5722a17e3ae4946a25aca36bc21e7f8146f56078b31f
+SIZE (xpi/firefox-i18n-58.0/af.xpi) = 445013
+SHA256 (xpi/firefox-i18n-58.0/an.xpi) = eb772b7256e31da01472bfef779a47767e9e7ec95a6b577d8e6ec354a759eaa8
+SIZE (xpi/firefox-i18n-58.0/an.xpi) = 469441
+SHA256 (xpi/firefox-i18n-58.0/ar.xpi) = 754c5c35470b100ce707407c134a3bd2d8a42c0b3da557b4f49f83d415e064e2
+SIZE (xpi/firefox-i18n-58.0/ar.xpi) = 494893
+SHA256 (xpi/firefox-i18n-58.0/as.xpi) = 1bef07d2815d4964016df69f78c6114ee5f62109cc11021147cb0161b06ca83b
+SIZE (xpi/firefox-i18n-58.0/as.xpi) = 492795
+SHA256 (xpi/firefox-i18n-58.0/ast.xpi) = f46615482b9b3a34e2fd11554c3170d8622e6ff7ce95c0c79b5af599f450b4c4
+SIZE (xpi/firefox-i18n-58.0/ast.xpi) = 462086
+SHA256 (xpi/firefox-i18n-58.0/az.xpi) = 0151c39c10b75a251394dd102a77e0275b7c427ecfdcf6515e66d863246b7d3b
+SIZE (xpi/firefox-i18n-58.0/az.xpi) = 470906
+SHA256 (xpi/firefox-i18n-58.0/be.xpi) = df24d17bed26e712cf6c71219898104b99ff923672dbcb686f90fb638ab353fa
+SIZE (xpi/firefox-i18n-58.0/be.xpi) = 524435
+SHA256 (xpi/firefox-i18n-58.0/bg.xpi) = 64cceff752fda7766d405361d10748def5e1ff82773e944a6f08691eb6ccb3df
+SIZE (xpi/firefox-i18n-58.0/bg.xpi) = 517351
+SHA256 (xpi/firefox-i18n-58.0/bn-BD.xpi) = b87404168c03170dc43d423e01ebc7a557f83a8e713e71bf393656ab9b4c6dd2
+SIZE (xpi/firefox-i18n-58.0/bn-BD.xpi) = 533457
+SHA256 (xpi/firefox-i18n-58.0/bn-IN.xpi) = 7d4b4ff1b94684f9dd4e25a323ab78114ada914ef1d159131332ed45152ac806
+SIZE (xpi/firefox-i18n-58.0/bn-IN.xpi) = 518928
+SHA256 (xpi/firefox-i18n-58.0/br.xpi) = 54ecc3a8ead5ae71615e617114e286daebf6277d7b688bef9c4cccf07d558257
+SIZE (xpi/firefox-i18n-58.0/br.xpi) = 457659
+SHA256 (xpi/firefox-i18n-58.0/bs.xpi) = 9fb0ff7811fb5d970f47eaea32bb87affebf23da24b0ef1b0470cf00630d6e2c
+SIZE (xpi/firefox-i18n-58.0/bs.xpi) = 466548
+SHA256 (xpi/firefox-i18n-58.0/ca.xpi) = 12582056284c6d0212ba3cd20b71d26775058ede4c2f876fe4600db7ae82a95a
+SIZE (xpi/firefox-i18n-58.0/ca.xpi) = 472767
+SHA256 (xpi/firefox-i18n-58.0/cak.xpi) = af4d9eb9e9d1197d6461407cf7461a1c1c6598917618be1ee8c958ce1e1687bf
+SIZE (xpi/firefox-i18n-58.0/cak.xpi) = 483418
+SHA256 (xpi/firefox-i18n-58.0/cs.xpi) = f8ae5c3876c2a4ecadcb1a88760a912652c02a894e43a40140f6eefa4a552e6f
+SIZE (xpi/firefox-i18n-58.0/cs.xpi) = 479561
+SHA256 (xpi/firefox-i18n-58.0/cy.xpi) = 255551e0f07da13f57ac8aa3e6aa81e57f2e9cc5646d9e1d71cfb3be640e5a65
+SIZE (xpi/firefox-i18n-58.0/cy.xpi) = 462228
+SHA256 (xpi/firefox-i18n-58.0/da.xpi) = 6a19b3654ef1045fa8d3c49e23a49747397b260233159df00aaf4e58dd1cb8c1
+SIZE (xpi/firefox-i18n-58.0/da.xpi) = 455554
+SHA256 (xpi/firefox-i18n-58.0/de.xpi) = 215a5aa0947719613a2aeba9f3189b2bc17d123740b48d74548c27043cc5bd7d
+SIZE (xpi/firefox-i18n-58.0/de.xpi) = 467224
+SHA256 (xpi/firefox-i18n-58.0/dsb.xpi) = de549c997832ee2a6f7305d64a08f8b283c14455df667a6b5a6e30e496cb3072
+SIZE (xpi/firefox-i18n-58.0/dsb.xpi) = 486454
+SHA256 (xpi/firefox-i18n-58.0/el.xpi) = 321b7f69e2db2f794604fa5dd085e4deccec1c67c97e454176bac478142600a2
+SIZE (xpi/firefox-i18n-58.0/el.xpi) = 540701
+SHA256 (xpi/firefox-i18n-58.0/en-GB.xpi) = c969f4e459b719e292fd1674ae90191b0e6b1262c86fcd26d9a96d12673c3abe
+SIZE (xpi/firefox-i18n-58.0/en-GB.xpi) = 443432
+SHA256 (xpi/firefox-i18n-58.0/en-US.xpi) = fcf9498e7303362fae71ae7848b806503ae598e70ad9c55e5045ced0cff76acf
+SIZE (xpi/firefox-i18n-58.0/en-US.xpi) = 440002
+SHA256 (xpi/firefox-i18n-58.0/en-ZA.xpi) = 21ff6c58a514b0b05b137196096f2711105f4b15c27a9dbadeff6ad111e14747
+SIZE (xpi/firefox-i18n-58.0/en-ZA.xpi) = 434818
+SHA256 (xpi/firefox-i18n-58.0/eo.xpi) = 628b4c660141ab9c6056e087c200929d2d850668d7d8b625aee2413be1f70120
+SIZE (xpi/firefox-i18n-58.0/eo.xpi) = 461029
+SHA256 (xpi/firefox-i18n-58.0/es-AR.xpi) = fbf852bf97714001e49643856a86f331683b1b87dc52b186eeefa95eb46a3945
+SIZE (xpi/firefox-i18n-58.0/es-AR.xpi) = 470707
+SHA256 (xpi/firefox-i18n-58.0/es-CL.xpi) = 301a981d1b576c21f18ea7991108bbf5bc868181a1b0b473f1374e5a1abe621c
+SIZE (xpi/firefox-i18n-58.0/es-CL.xpi) = 473175
+SHA256 (xpi/firefox-i18n-58.0/es-ES.xpi) = c7ab2fe066aecb5984754c99a405c9ea2d3739e534fc3dfb811c7a6cf544ffef
+SIZE (xpi/firefox-i18n-58.0/es-ES.xpi) = 357313
+SHA256 (xpi/firefox-i18n-58.0/es-MX.xpi) = 56bcdcd3638ba5a9aaa2af356aae110b8d0a7d8539f1f22ad9d21490cefa251c
+SIZE (xpi/firefox-i18n-58.0/es-MX.xpi) = 474513
+SHA256 (xpi/firefox-i18n-58.0/et.xpi) = acbe50d069b4465737523924e93c6cd8cf74e177734652955cbdaddfac5578f9
+SIZE (xpi/firefox-i18n-58.0/et.xpi) = 450939
+SHA256 (xpi/firefox-i18n-58.0/eu.xpi) = 5fe6143e1e8fc642c6b5f845b74466523e5c0296ca7db50a233216d711986ef1
+SIZE (xpi/firefox-i18n-58.0/eu.xpi) = 462882
+SHA256 (xpi/firefox-i18n-58.0/fa.xpi) = 35f2cde36f4424665c4bca5df7082d21173d29a11558fccb7e99997c769eca5a
+SIZE (xpi/firefox-i18n-58.0/fa.xpi) = 517077
+SHA256 (xpi/firefox-i18n-58.0/ff.xpi) = 191419293850fee8c149ca525e161ce6fc37104169003db158d7d24a1385082f
+SIZE (xpi/firefox-i18n-58.0/ff.xpi) = 462447
+SHA256 (xpi/firefox-i18n-58.0/fi.xpi) = 68d00d05faeccff23052eec2d1a2d9b8485084a0f1e847630bc04167396ecda9
+SIZE (xpi/firefox-i18n-58.0/fi.xpi) = 454069
+SHA256 (xpi/firefox-i18n-58.0/fr.xpi) = feecacfbf31bf7993efdca1f60433db3a718ce22579165c2462004738ffdfd14
+SIZE (xpi/firefox-i18n-58.0/fr.xpi) = 479100
+SHA256 (xpi/firefox-i18n-58.0/fy-NL.xpi) = 3cdba94d7f31134f5a4228e1fe81c2b9ae71ac694a51c00d611204c35f18e2d2
+SIZE (xpi/firefox-i18n-58.0/fy-NL.xpi) = 472088
+SHA256 (xpi/firefox-i18n-58.0/ga-IE.xpi) = c062cb09191d908796c098f405f9dabe6b4990c95ea0d92a1ad54f0403eac7c5
+SIZE (xpi/firefox-i18n-58.0/ga-IE.xpi) = 479798
+SHA256 (xpi/firefox-i18n-58.0/gd.xpi) = cb352cec2c477f6e74aacbd55e27b71b975ba56b2bfe49c1b9c77dc70cbae1be
+SIZE (xpi/firefox-i18n-58.0/gd.xpi) = 467538
+SHA256 (xpi/firefox-i18n-58.0/gl.xpi) = 96792d343d328d2586b9ba02362ee7c72b4b7683b7396915e38973b1f73a9a79
+SIZE (xpi/firefox-i18n-58.0/gl.xpi) = 454324
+SHA256 (xpi/firefox-i18n-58.0/gn.xpi) = e52cf21bbc06962868019c132ae7e9f1893dad3f58abf49f38624f3e804620f0
+SIZE (xpi/firefox-i18n-58.0/gn.xpi) = 477174
+SHA256 (xpi/firefox-i18n-58.0/gu-IN.xpi) = bb67ed994122eb42ebb037b3afeb55e2660e7afdf21a7d471a2c8ef9fdb5d016
+SIZE (xpi/firefox-i18n-58.0/gu-IN.xpi) = 523534
+SHA256 (xpi/firefox-i18n-58.0/he.xpi) = 12a44ecccb5c11fe58e24dcd23e70527b222d0e92269aaea150e59cf92898a3f
+SIZE (xpi/firefox-i18n-58.0/he.xpi) = 480618
+SHA256 (xpi/firefox-i18n-58.0/hi-IN.xpi) = c5bf19090e30ff30f5ab36dbb93fda8c003051cd7efc17d3c84c2ae6496a4361
+SIZE (xpi/firefox-i18n-58.0/hi-IN.xpi) = 532362
+SHA256 (xpi/firefox-i18n-58.0/hr.xpi) = 0797ebeb8bfda35e4fc3e908244e9292ec00b6e9b648b03fa1077e833bb07e7d
+SIZE (xpi/firefox-i18n-58.0/hr.xpi) = 467250
+SHA256 (xpi/firefox-i18n-58.0/hsb.xpi) = b8b1bcda275d19db6393d2c42feae30c231ab5c80b7868fe8ce696625e1b2ce0
+SIZE (xpi/firefox-i18n-58.0/hsb.xpi) = 483711
+SHA256 (xpi/firefox-i18n-58.0/hu.xpi) = dc5d146555ef1d3032e0636dc8c060c13e8cbd2cc235cfab4cb037e41ab3cf22
+SIZE (xpi/firefox-i18n-58.0/hu.xpi) = 482700
+SHA256 (xpi/firefox-i18n-58.0/hy-AM.xpi) = 679aab0a53133815ca2190f84f1258c66830e30a0f0985cb5469196a617f6cfe
+SIZE (xpi/firefox-i18n-58.0/hy-AM.xpi) = 515593
+SHA256 (xpi/firefox-i18n-58.0/id.xpi) = 9bc516279669509397ca4110cc9cd1f296afb6c5fdc56c4ddad862aba455966d
+SIZE (xpi/firefox-i18n-58.0/id.xpi) = 449309
+SHA256 (xpi/firefox-i18n-58.0/is.xpi) = 79cd15ed28fe52e68980a43f3ba7361577ba067750241e65fa9bde2c56eee5d6
+SIZE (xpi/firefox-i18n-58.0/is.xpi) = 460731
+SHA256 (xpi/firefox-i18n-58.0/it.xpi) = c08681d7b81a8723e523bd10eecbce12881c9568883537e1799fd98c9eea8deb
+SIZE (xpi/firefox-i18n-58.0/it.xpi) = 350639
+SHA256 (xpi/firefox-i18n-58.0/ja.xpi) = 93a1818321deb22721d097ef1d07e7a934bb345da563a140f4a215c4ce1965b3
+SIZE (xpi/firefox-i18n-58.0/ja.xpi) = 514623
+SHA256 (xpi/firefox-i18n-58.0/ka.xpi) = be27b0b319473d05e123c268fe5a870d06d5d0f70910746d3f017530ce4b652e
+SIZE (xpi/firefox-i18n-58.0/ka.xpi) = 500996
+SHA256 (xpi/firefox-i18n-58.0/kab.xpi) = f1498eb19efd50ea028459f8d6ed662615812538565bfa926b9954c95321ed30
+SIZE (xpi/firefox-i18n-58.0/kab.xpi) = 469448
+SHA256 (xpi/firefox-i18n-58.0/kk.xpi) = 7f857dfff53577a51673270c12f99511cf7c8178a151107b9b9770c59422ef2a
+SIZE (xpi/firefox-i18n-58.0/kk.xpi) = 527150
+SHA256 (xpi/firefox-i18n-58.0/km.xpi) = e9ec76e291103587055186e48ad8c189b48c9c680f860bbcdde6b8d8cd9ebbd7
+SIZE (xpi/firefox-i18n-58.0/km.xpi) = 535391
+SHA256 (xpi/firefox-i18n-58.0/kn.xpi) = edafb9e39d01c5bb257c68dbf91315e3dfe0a8d2c31a52cbb0c9a96e9972c652
+SIZE (xpi/firefox-i18n-58.0/kn.xpi) = 537159
+SHA256 (xpi/firefox-i18n-58.0/ko.xpi) = f5f40c625f666927ec035fb8c119ebe103cf25b438db3223ac858aa2ba509e53
+SIZE (xpi/firefox-i18n-58.0/ko.xpi) = 494834
+SHA256 (xpi/firefox-i18n-58.0/lij.xpi) = 4d35c9c5eed73a23a21b0acc3fc9d56cb438d86eb1f611ca145aca0904a5171f
+SIZE (xpi/firefox-i18n-58.0/lij.xpi) = 455541
+SHA256 (xpi/firefox-i18n-58.0/lt.xpi) = cdab9353ae0b3fe9d697d6d39fbb960acfa50c311e6cc278ba2a19043e1b79ff
+SIZE (xpi/firefox-i18n-58.0/lt.xpi) = 482157
+SHA256 (xpi/firefox-i18n-58.0/lv.xpi) = 909e3bfa6c849d8212999f5b6b4df745cbaed50ef2f70923cc9b934d39014f92
+SIZE (xpi/firefox-i18n-58.0/lv.xpi) = 471211
+SHA256 (xpi/firefox-i18n-58.0/mai.xpi) = ae9f9390adb8ea8e9df3a9e805ba5149e65db7ac44ea3a955dde3a2fbab341ec
+SIZE (xpi/firefox-i18n-58.0/mai.xpi) = 509069
+SHA256 (xpi/firefox-i18n-58.0/mk.xpi) = b10ae273eea89b520a1f96b60279707bf5ca41f1607a8dd0bf23f76db50a8067
+SIZE (xpi/firefox-i18n-58.0/mk.xpi) = 492513
+SHA256 (xpi/firefox-i18n-58.0/ml.xpi) = baea3818789e68b888797ebe5b1c317b3443d25d453fad41b5f4ad20369a13d5
+SIZE (xpi/firefox-i18n-58.0/ml.xpi) = 547684
+SHA256 (xpi/firefox-i18n-58.0/mr.xpi) = d1f544fd567985280daa09b9c1cedf5fa848df2db3260ff3d98875a3dff3a09c
+SIZE (xpi/firefox-i18n-58.0/mr.xpi) = 525038
+SHA256 (xpi/firefox-i18n-58.0/ms.xpi) = 6fcfde9562efac654e7b8151e11d3d141b5ea9d5f38dc69e53e741b8a1b5f1ef
+SIZE (xpi/firefox-i18n-58.0/ms.xpi) = 458425
+SHA256 (xpi/firefox-i18n-58.0/my.xpi) = d8a309b641915532ce098cee4181d893c747ea58b73171a1967bf77cb3d6add7
+SIZE (xpi/firefox-i18n-58.0/my.xpi) = 520422
+SHA256 (xpi/firefox-i18n-58.0/nb-NO.xpi) = 4b8c5ce7b80bd4d4a48f5ec98f5fcd28d84f9496353a925a88f07e5781e5f217
+SIZE (xpi/firefox-i18n-58.0/nb-NO.xpi) = 457989
+SHA256 (xpi/firefox-i18n-58.0/ne-NP.xpi) = 4042ce43ff583a104703c09ef32ef9465d5de3a8f4b7287322ed3bf08a4d20d3
+SIZE (xpi/firefox-i18n-58.0/ne-NP.xpi) = 517682
+SHA256 (xpi/firefox-i18n-58.0/nl.xpi) = 9e6fc901b49c666796ff2fd1dd1cbd7d536eebae09ec350f8185aad792741fb3
+SIZE (xpi/firefox-i18n-58.0/nl.xpi) = 465557
+SHA256 (xpi/firefox-i18n-58.0/nn-NO.xpi) = 627ec9b8a42f0d5c8bde791642bb1a3b8aa99d2e0f391176d37a6da6d86ae50f
+SIZE (xpi/firefox-i18n-58.0/nn-NO.xpi) = 458437
+SHA256 (xpi/firefox-i18n-58.0/or.xpi) = 02b420331fd283f381440edf189fd95d5b0dcbf4970c944c17138908164c3102
+SIZE (xpi/firefox-i18n-58.0/or.xpi) = 502794
+SHA256 (xpi/firefox-i18n-58.0/pa-IN.xpi) = 627b3dc246f4abccba6096f1931208d90517201c934f6f1c7918d67f85e3ddd1
+SIZE (xpi/firefox-i18n-58.0/pa-IN.xpi) = 500540
+SHA256 (xpi/firefox-i18n-58.0/pl.xpi) = 046511fc3966d0e5ac4e6e1dfe836e212024cec0a43a0ef975583db8cc2ed471
+SIZE (xpi/firefox-i18n-58.0/pl.xpi) = 365868
+SHA256 (xpi/firefox-i18n-58.0/pt-BR.xpi) = 845810f1585a41f4ba1acb70644e1df4899c4c67fea8c1fa9e17ff8b7a0edb9d
+SIZE (xpi/firefox-i18n-58.0/pt-BR.xpi) = 463581
+SHA256 (xpi/firefox-i18n-58.0/pt-PT.xpi) = 1e391e4236a6bd9af4ab7edf6264b861e3adc151c149b70a71b6a471c07a17b3
+SIZE (xpi/firefox-i18n-58.0/pt-PT.xpi) = 466900
+SHA256 (xpi/firefox-i18n-58.0/rm.xpi) = 58fc13c2b8fc8853129062ddfc66c2e807a0a6dbab2be0c203a16b05f6b24798
+SIZE (xpi/firefox-i18n-58.0/rm.xpi) = 458781
+SHA256 (xpi/firefox-i18n-58.0/ro.xpi) = 40a679c02a8d62d2aa267944994e06f4107f46e8033690bb9b88aaac3a32ab33
+SIZE (xpi/firefox-i18n-58.0/ro.xpi) = 462429
+SHA256 (xpi/firefox-i18n-58.0/ru.xpi) = d03470d5518d1a8929ac1b15bd2bfdc9af5e91447140067e70b3356e53b93b83
+SIZE (xpi/firefox-i18n-58.0/ru.xpi) = 535052
+SHA256 (xpi/firefox-i18n-58.0/si.xpi) = bafb94e21c1c48687b7802952a5e1d322b49a272ee15d8e2526bbb5237d98a13
+SIZE (xpi/firefox-i18n-58.0/si.xpi) = 500876
+SHA256 (xpi/firefox-i18n-58.0/sk.xpi) = 0c2c9b13a844b3658a6e1ee1341da1cbbce03f8de42629ef3e737bc5975441a0
+SIZE (xpi/firefox-i18n-58.0/sk.xpi) = 487581
+SHA256 (xpi/firefox-i18n-58.0/sl.xpi) = ffce054d93228c124bb346ba5f5fac2149f5d202f11fd3e4e1b3c9c986717364
+SIZE (xpi/firefox-i18n-58.0/sl.xpi) = 463913
+SHA256 (xpi/firefox-i18n-58.0/son.xpi) = 0b6275f2fca13c105f7857c74a1b67745a4ce0eba648ce30b4aaf86a4b2183da
+SIZE (xpi/firefox-i18n-58.0/son.xpi) = 453958
+SHA256 (xpi/firefox-i18n-58.0/sq.xpi) = 47e8c7147281fc75c428bf980076d5407dcee6ce4e65c1f6aa59ce3699d7984b
+SIZE (xpi/firefox-i18n-58.0/sq.xpi) = 472462
+SHA256 (xpi/firefox-i18n-58.0/sr.xpi) = a6dfa6487490cdeb54c45ee63a19530e9e181813795864db9966469a0111b7af
+SIZE (xpi/firefox-i18n-58.0/sr.xpi) = 493459
+SHA256 (xpi/firefox-i18n-58.0/sv-SE.xpi) = 457310083072dbddbc7dd4569abd4ea6602aceb95cc715e1f107f19b48370630
+SIZE (xpi/firefox-i18n-58.0/sv-SE.xpi) = 466361
+SHA256 (xpi/firefox-i18n-58.0/ta.xpi) = c346fd857bace161a3bc27ce86aef7d59802a2691946b6beac6462d6666473b7
+SIZE (xpi/firefox-i18n-58.0/ta.xpi) = 519413
+SHA256 (xpi/firefox-i18n-58.0/te.xpi) = 0a5ced6fe21bad735fa003d7c5b9309a61f259b6f5331419a45d5eb1a7175908
+SIZE (xpi/firefox-i18n-58.0/te.xpi) = 535339
+SHA256 (xpi/firefox-i18n-58.0/th.xpi) = 628d31deeff3033328d91d8afa8f83f0f612b74dc4ad39d63d7f30be0e9d7761
+SIZE (xpi/firefox-i18n-58.0/th.xpi) = 506269
+SHA256 (xpi/firefox-i18n-58.0/tr.xpi) = 0f77a1204fc13c2a74e464d767e6a252e8ad8f0b477d668fe028c015677cd23f
+SIZE (xpi/firefox-i18n-58.0/tr.xpi) = 471864
+SHA256 (xpi/firefox-i18n-58.0/uk.xpi) = 12f4c0b33ceb09d2b842844350146dae3f0683fa509cd469196c737dce0c7a81
+SIZE (xpi/firefox-i18n-58.0/uk.xpi) = 525888
+SHA256 (xpi/firefox-i18n-58.0/ur.xpi) = 39f005a19eef6f6d4efecc5fef6169c3c414fc3aad5e2368942fd1a095e00776
+SIZE (xpi/firefox-i18n-58.0/ur.xpi) = 515328
+SHA256 (xpi/firefox-i18n-58.0/uz.xpi) = 2b6cf0ae2087227427bb0b2c7a2a0d736d6b64f236e88dc08c94185a1ba015c9
+SIZE (xpi/firefox-i18n-58.0/uz.xpi) = 464526
+SHA256 (xpi/firefox-i18n-58.0/vi.xpi) = afd216752da3f18f77fb78d8e629e32ccc5730b37ee7e4e88fc194c0168f084a
+SIZE (xpi/firefox-i18n-58.0/vi.xpi) = 476700
+SHA256 (xpi/firefox-i18n-58.0/xh.xpi) = ddf454d3517a9fd42c164a5d56330bf17e0c039c4c2ac05149f822b1ef4bdbcb
+SIZE (xpi/firefox-i18n-58.0/xh.xpi) = 467878
+SHA256 (xpi/firefox-i18n-58.0/zh-CN.xpi) = 19cca01a1d0f641954e1d4ac305018f6f05add784d3b564ea5f161b156660884
+SIZE (xpi/firefox-i18n-58.0/zh-CN.xpi) = 490104
+SHA256 (xpi/firefox-i18n-58.0/zh-TW.xpi) = 26c3322bb2469310601737d8589687f3cf27b0f06b2dd96041d123ae4f4d658b
+SIZE (xpi/firefox-i18n-58.0/zh-TW.xpi) = 488337

Modified: branches/2018Q1/www/firefox/Makefile
==============================================================================
--- branches/2018Q1/www/firefox/Makefile	Tue Jan 23 00:01:36 2018	(r459711)
+++ branches/2018Q1/www/firefox/Makefile	Tue Jan 23 00:02:59 2018	(r459712)
@@ -2,24 +2,24 @@
 # $FreeBSD$
 
 PORTNAME=	firefox
-DISTVERSION=	57.0.4
+DISTVERSION=	58.0
 PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	www ipv6
 MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \
-		MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source
+		MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build6/source
 DISTFILES=	${DISTNAME}.source${EXTRACT_SUFX}
 
 MAINTAINER=	gecko at 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 \

Modified: branches/2018Q1/www/firefox/distinfo
==============================================================================
--- branches/2018Q1/www/firefox/distinfo	Tue Jan 23 00:01:36 2018	(r459711)
+++ branches/2018Q1/www/firefox/distinfo	Tue Jan 23 00:02:59 2018	(r459712)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1515099518
-SHA256 (firefox-57.0.4.source.tar.xz) = 97cced69abfd5c57d968f0095631f86beff4f7b61883edd5a4f207e7f9c43b33
-SIZE (firefox-57.0.4.source.tar.xz) = 250217612
+TIMESTAMP = 1516319766
+SHA256 (firefox-58.0.source.tar.xz) = 0e0a39caabf94d7467d8bb4008fa9e7340a7be57b8c78ccf0cf98791a3bfaaff
+SIZE (firefox-58.0.source.tar.xz) = 247185892

Modified: branches/2018Q1/www/firefox/files/patch-bug826985
==============================================================================
--- branches/2018Q1/www/firefox/files/patch-bug826985	Tue Jan 23 00:01:36 2018	(r459711)
+++ branches/2018Q1/www/firefox/files/patch-bug826985	Tue Jan 23 00:02:59 2018	(r459712)
@@ -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

Modified: branches/2018Q1/www/firefox/files/patch-bug847568
==============================================================================
--- branches/2018Q1/www/firefox/files/patch-bug847568	Tue Jan 23 00:01:36 2018	(r459711)
+++ branches/2018Q1/www/firefox/files/patch-bug847568	Tue Jan 23 00:02:59 2018	(r459712)
@@ -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/gene
 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/unicha
 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')

Copied: branches/2018Q1/www/firefox/files/patch-dom_media_flac_FlacDecoder.cpp (from r459118, head/www/firefox/files/patch-dom_media_flac_FlacDecoder.cpp)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2018Q1/www/firefox/files/patch-dom_media_flac_FlacDecoder.cpp	Tue Jan 23 00:02:59 2018	(r459712, copy of r459118, head/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;

Copied: branches/2018Q1/www/firefox/files/patch-toolkit_moz.configure (from r459118, head/www/firefox/files/patch-toolkit_moz.configure)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2018Q1/www/firefox/files/patch-toolkit_moz.configure	Tue Jan 23 00:02:59 2018	(r459712, copy of r459118, head/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

Modified: branches/2018Q1/www/firefox/files/patch-z-bug517422
==============================================================================
--- branches/2018Q1/www/firefox/files/patch-z-bug517422	Tue Jan 23 00:01:36 2018	(r459711)
+++ branches/2018Q1/www/firefox/files/patch-z-bug517422	Tue Jan 23 00:02:59 2018	(r459712)
@@ -4,7 +4,7 @@ diff --git build/moz.configure/old.configure build/moz
 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,30 +17,14 @@ 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']:
 +    external_dirs += ['media/libogg']
@@ -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/AudioStre
 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

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***

More information about the svn-ports-branches mailing list