Attachment #188326 for bug #223425




.elif ${gecko_ARGS:Mfirefox}

_GECKO_DEFAULT_VERSION=	52
_GECKO_VERSIONS=		52 58
_GECKO_TYPE=	firefox

# Dependence lines for different Firefox versions
52_DEPENDS=		${LOCALBASE}/lib/firefox/firefox:www/firefox-esr
58_DEPENDS=		${LOCALBASE}/lib/firefox/firefox:www/firefox

.if exists(${LOCALBASE}/bin/firefox)
_GECKO_INSTALLED_VER!=	${LOCALBASE}/bin/firefox --version 2>/dev/null




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}"
.if ${MOZILLA_VER:R:R} < 58
. 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

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} \

.endif

.if ${PORT_OPTIONS:MRUST} || ${MOZILLA_VER:R:R} >= 54
BUILD_DEPENDS+=	${RUST_PORT:T}>=1.21.0:${RUST_PORT}
RUST_PORT?=		lang/rust
. if ${MOZILLA_VER:R:R} < 54
MOZ_OPTIONS+=	--enable-rust




# $FreeBSD$

PORTNAME=	firefox-i18n
PORTVERSION=	58.0b7
CATEGORIES=	www
MASTER_SITES=	MOZILLA/${PORTNAME:S|-i18n||}/releases/${DISTVERSION}/linux-i686/xpi \
		MOZILLA/${PORTNAME:S|-i18n||}/candidates/${DISTVERSION}-candidates/build1/linux-i686/xpi
PKGNAMEPREFIX=
DISTFILES=	${FIREFOX_I18N_:S/$/.xpi/}
DIST_SUBDIR=	xpi/${DISTNAME}


EXTRACT_DEPENDS=	zip:archivers/zip

USES=		zip:infozip gecko:firefox,58,build
USE_XPI=	firefox

NO_ARCH=	yes

Lines 5-11 FIREFOX_I18N_ALL_= ach af an ar as ast az be bg bn-BD bn-IN br bs ca cak \ Link Here

(-)b/www/firefox-i18n/Makefile.lang (-1 / +4 lines)
5	cs cy da de dsb el en-GB en-US en-ZA eo es-AR es-CL \	5	cs cy da de dsb el en-GB en-US en-ZA eo es-AR es-CL \
6	es-ES es-MX et eu fa ff fi fr fy-NL ga-IE gd gl gn \	6	es-ES es-MX et eu fa ff fi fr fy-NL ga-IE gd gl gn \
7	gu-IN he hi-IN hr hsb hu hy-AM id is it ja ka kab \	7	gu-IN he hi-IN hr hsb hu hy-AM id is it ja ka kab \
8	kk km kn ko lij lt lv mai mk ml mr ms my nb-NO nl \	8	kk km kn ko lij lt lv mai mk ml mr ms my nb-NO ne-NP nl \
9	nn-NO or pa-IN pl pt-BR pt-PT rm ro ru si sk sl son \	9	nn-NO or pa-IN pl pt-BR pt-PT rm ro ru si sk sl son \
10	sq sr sv-SE ta te th tr uk ur uz vi xh zh-CN zh-TW	10	sq sr sv-SE ta te th tr uk ur uz vi xh zh-CN zh-TW
11		11
Lines 213-218 FIREFOX_I18N+= my Link Here
213	.if ${PORT_OPTIONS:MLANG_NB}	213	.if ${PORT_OPTIONS:MLANG_NB}
214	FIREFOX_I18N+= nb-NO	214	FIREFOX_I18N+= nb-NO
215	.endif	215	.endif
		216	.if ${PORT_OPTIONS:MLANG_NE}
		217	FIREFOX_I18N+= ne-NP
		218	.endif
216	.if ${PORT_OPTIONS:MLANG_NL}	219	.if ${PORT_OPTIONS:MLANG_NL}
217	FIREFOX_I18N+= nl	220	FIREFOX_I18N+= nl
218	.endif	221	.endif

Lines 69-74 OPTIONS_DEFINE= LANG_ACH \ Link Here

(-)b/www/firefox-i18n/Makefile.option (+2 lines)
69	LANG_MS \	69	LANG_MS \
70	LANG_MY \	70	LANG_MY \
71	LANG_NB \	71	LANG_NB \
		72	LANG_NE \
72	LANG_NL \	73	LANG_NL \
73	LANG_NN \	74	LANG_NN \
74	LANG_OR \	75	LANG_OR \
Lines 118-123 LANG_KM_DESC?= Khmer language support Link Here
118	LANG_LIJ_DESC?= Ligurian (Genoa) language support	119	LANG_LIJ_DESC?= Ligurian (Genoa) language support
119	LANG_MS_DESC?= Malay language support	120	LANG_MS_DESC?= Malay language support
120	LANG_MY_DESC?= Burmese language support	121	LANG_MY_DESC?= Burmese language support
		122	LANG_NE_DESC?= Nepali language support
121	LANG_SW_DESC?= Swahili language support	123	LANG_SW_DESC?= Swahili language support
122	LANG_UR_DESC?= Urdu (Pakistan) language support	124	LANG_UR_DESC?= Urdu (Pakistan) language support
123	LANG_UZ_DESC?= Uzbek language support	125	LANG_UZ_DESC?= Uzbek language support




TIMESTAMP = 1511798418
SHA256 (xpi/firefox-i18n-58.0b7/ach.xpi) = 604e9995c607dd75b8545cc39b673cfd5c3cb19b534f7169149e621c2a2fe59c
SIZE (xpi/firefox-i18n-58.0b7/ach.xpi) = 441429
SHA256 (xpi/firefox-i18n-58.0b7/af.xpi) = 3933c0f1307d35d3e00523fa3e2367a810988c87c79fdee8f6eeb564bf258836
SIZE (xpi/firefox-i18n-58.0b7/af.xpi) = 442097
SHA256 (xpi/firefox-i18n-58.0b7/an.xpi) = 3b8418728d70e2d3682d49b464ff19e4304c57f67e471189e2f79dee84c655f7
SIZE (xpi/firefox-i18n-58.0b7/an.xpi) = 463227
SHA256 (xpi/firefox-i18n-58.0b7/ar.xpi) = 8fb31f04647597dd91d41dbba860865b9b7a8a289846628af7ea78044b5778fc
SIZE (xpi/firefox-i18n-58.0b7/ar.xpi) = 488258
SHA256 (xpi/firefox-i18n-58.0b7/as.xpi) = 5f9b32371d30861a6f2c306114dc95bb3106ab15ac77a6c437ec57e7b738de72
SIZE (xpi/firefox-i18n-58.0b7/as.xpi) = 490348
SHA256 (xpi/firefox-i18n-58.0b7/ast.xpi) = 525b32e4f2db2c8f99dd999689468091581c4ce02084f48c36e3d38533d05ad1
SIZE (xpi/firefox-i18n-58.0b7/ast.xpi) = 458881
SHA256 (xpi/firefox-i18n-58.0b7/az.xpi) = 6f3dcb7d7271c16fd5e7795c0a6cc7690b911b0d74f03b43fe10aa3d6f965cc7
SIZE (xpi/firefox-i18n-58.0b7/az.xpi) = 466130
SHA256 (xpi/firefox-i18n-58.0b7/be.xpi) = ef4d921fa5e941add4c8dc43e9044b1531bd9de2533df36cfe932f8b4ec0b1ed
SIZE (xpi/firefox-i18n-58.0b7/be.xpi) = 515402
SHA256 (xpi/firefox-i18n-58.0b7/bg.xpi) = 5665275930efa225a35ea95ad2a59551e01a03d5ca9403f463f761ae96b95d67
SIZE (xpi/firefox-i18n-58.0b7/bg.xpi) = 509518
SHA256 (xpi/firefox-i18n-58.0b7/bn-BD.xpi) = b37c3b4686cb85c254917d24270e8a6cdc6a4332369d988adecff537f2e8659d
SIZE (xpi/firefox-i18n-58.0b7/bn-BD.xpi) = 525635
SHA256 (xpi/firefox-i18n-58.0b7/bn-IN.xpi) = cc8a16d06b0790e23f3227f06630747e7a3b31a34cc67f87168668701cecf00c
SIZE (xpi/firefox-i18n-58.0b7/bn-IN.xpi) = 516033
SHA256 (xpi/firefox-i18n-58.0b7/br.xpi) = abe948966978c76af8a9d12b0f3484de686fa412ab085a90fbf8e19ea40cbdad
SIZE (xpi/firefox-i18n-58.0b7/br.xpi) = 452232
SHA256 (xpi/firefox-i18n-58.0b7/bs.xpi) = c4f401dacedb2e3e7e9deeb9276c7f2c6e363c4131c4841745a9a637483c7022
SIZE (xpi/firefox-i18n-58.0b7/bs.xpi) = 459205
SHA256 (xpi/firefox-i18n-58.0b7/ca.xpi) = ed63fcb7bc8ffae1003a423071bc48908103037b02627dadb5a223f035558897
SIZE (xpi/firefox-i18n-58.0b7/ca.xpi) = 467338
SHA256 (xpi/firefox-i18n-58.0b7/cak.xpi) = 94b23c8491e497daa01d05eac35136a7034e10d69f863a10c659cf5d088a2f15
SIZE (xpi/firefox-i18n-58.0b7/cak.xpi) = 475410
SHA256 (xpi/firefox-i18n-58.0b7/cs.xpi) = 131a1cc6758a0ddfe23364f3d1283e484378140da2e81a561daee14071d9234a
SIZE (xpi/firefox-i18n-58.0b7/cs.xpi) = 471790
SHA256 (xpi/firefox-i18n-58.0b7/cy.xpi) = b98fedb7fc8d4d84a329a48ec256102a51ace11269c5fde18af5cf656d61c789
SIZE (xpi/firefox-i18n-58.0b7/cy.xpi) = 455303
SHA256 (xpi/firefox-i18n-58.0b7/da.xpi) = 67006bc89ad431bcbe90d2ba43debc4ad5518b3f8992cc5c017845668c9142cd
SIZE (xpi/firefox-i18n-58.0b7/da.xpi) = 448052
SHA256 (xpi/firefox-i18n-58.0b7/de.xpi) = fc72b3cc6d07df4956e7eb241e59ec990135c40fcd784bf5c720d229f44b2e53
SIZE (xpi/firefox-i18n-58.0b7/de.xpi) = 462216
SHA256 (xpi/firefox-i18n-58.0b7/dsb.xpi) = d9fa5360cf7da534efa682c6feaccc9929ba3a38668587c67cd7ccb1fc22bee9
SIZE (xpi/firefox-i18n-58.0b7/dsb.xpi) = 478923
SHA256 (xpi/firefox-i18n-58.0b7/el.xpi) = 6cf583ba018519bda946eadedf10f1ffcab95479f0e75cdccb008af42a7b4443
SIZE (xpi/firefox-i18n-58.0b7/el.xpi) = 534671
SHA256 (xpi/firefox-i18n-58.0b7/en-GB.xpi) = 638854db0a6814c21bf8819dc83128d0236c1a5ec7ad014083b96e3f6f76c3b7
SIZE (xpi/firefox-i18n-58.0b7/en-GB.xpi) = 436592
SHA256 (xpi/firefox-i18n-58.0b7/en-US.xpi) = e89b6eb659a592c61e697a053f7d0704fd149b79782ffe5d3671d006592b3736
SIZE (xpi/firefox-i18n-58.0b7/en-US.xpi) = 440011
SHA256 (xpi/firefox-i18n-58.0b7/en-ZA.xpi) = 461a9d8e1718af8a0f3cc8692cd109859c338a4bf22fbacb639cc474365ebc68
SIZE (xpi/firefox-i18n-58.0b7/en-ZA.xpi) = 432336
SHA256 (xpi/firefox-i18n-58.0b7/eo.xpi) = fccad893c56d266767a9fef68c6b89541b59fb0bda23a2a16bf48160ebfe06c0
SIZE (xpi/firefox-i18n-58.0b7/eo.xpi) = 454427
SHA256 (xpi/firefox-i18n-58.0b7/es-AR.xpi) = 33cb2c44d0e4f5fd8d988a0970291354291f8e7bfa2d305dc0eaa068312364f2
SIZE (xpi/firefox-i18n-58.0b7/es-AR.xpi) = 462392
SHA256 (xpi/firefox-i18n-58.0b7/es-CL.xpi) = dac90ca0a7754c24fa1c1fdcdff4d8e50fef5d30e9ad375dd44808dda6dbd8cb
SIZE (xpi/firefox-i18n-58.0b7/es-CL.xpi) = 465399
SHA256 (xpi/firefox-i18n-58.0b7/es-ES.xpi) = 7539c54749bc04fcf82e49d6e51acebb1bd0c48d77a2f0bc3ff61ca51f0ebab9
SIZE (xpi/firefox-i18n-58.0b7/es-ES.xpi) = 353186
SHA256 (xpi/firefox-i18n-58.0b7/es-MX.xpi) = 30aa6c395cd4d892b90a364258a53c6183d935037d68daf793410f5e9d2297ef
SIZE (xpi/firefox-i18n-58.0b7/es-MX.xpi) = 468201
SHA256 (xpi/firefox-i18n-58.0b7/et.xpi) = e0cab097f72566e6e65357ec842b9b75d742d19341403c8abebbcf66edd328f9
SIZE (xpi/firefox-i18n-58.0b7/et.xpi) = 447974
SHA256 (xpi/firefox-i18n-58.0b7/eu.xpi) = fd7d67687aad4dbfb538466485e65977c412f38671285d7b215e8539671315e1
SIZE (xpi/firefox-i18n-58.0b7/eu.xpi) = 455299
SHA256 (xpi/firefox-i18n-58.0b7/fa.xpi) = a3e600aa42c091fc788b520629c0c676645a0913d358a62ad34c6c1bd9e60a1e
SIZE (xpi/firefox-i18n-58.0b7/fa.xpi) = 510290
SHA256 (xpi/firefox-i18n-58.0b7/ff.xpi) = 75b512815903afd1e58aa2f0e23edf17ec07ca0ee8adcdb695a96339f1137f71
SIZE (xpi/firefox-i18n-58.0b7/ff.xpi) = 456022
SHA256 (xpi/firefox-i18n-58.0b7/fi.xpi) = 21dbe002e3deef96dd35ff3fdad7176014173c5073b21a081be48efe733a5154
SIZE (xpi/firefox-i18n-58.0b7/fi.xpi) = 446768
SHA256 (xpi/firefox-i18n-58.0b7/fr.xpi) = 5039103d742faf6c63b4b93adf677cc9eeb201caec5732bb5206e97c330e8765
SIZE (xpi/firefox-i18n-58.0b7/fr.xpi) = 472309
SHA256 (xpi/firefox-i18n-58.0b7/fy-NL.xpi) = 4351a6794aac7eb83e1c73b1964030635bef9ff13fcbec4e6b7d0cd15b6d31bc
SIZE (xpi/firefox-i18n-58.0b7/fy-NL.xpi) = 465325
SHA256 (xpi/firefox-i18n-58.0b7/ga-IE.xpi) = 7e9b076340e8f7f44b7fb5dfaa5804c25b18576b7f3560554f14921f0ac4a281
SIZE (xpi/firefox-i18n-58.0b7/ga-IE.xpi) = 476788
SHA256 (xpi/firefox-i18n-58.0b7/gd.xpi) = a36c73d5b97d5ec6ddf4a2e120408903139a1e92be462cee36886f587c88efae
SIZE (xpi/firefox-i18n-58.0b7/gd.xpi) = 464504
SHA256 (xpi/firefox-i18n-58.0b7/gl.xpi) = b942d4c767f47feee14f266674c3119b1f25aff4478903ddde16c30b2cb207a3
SIZE (xpi/firefox-i18n-58.0b7/gl.xpi) = 451732
SHA256 (xpi/firefox-i18n-58.0b7/gn.xpi) = 8442f3781003a8e2ca27b056d386d0ee5e1f49124fece5cbdd84937352bdcabf
SIZE (xpi/firefox-i18n-58.0b7/gn.xpi) = 472922
SHA256 (xpi/firefox-i18n-58.0b7/gu-IN.xpi) = 70b6791e5a2e357d28d0f7a9e9cf477b59ea02c9e4004baa07d6836e0e6b8cf8
SIZE (xpi/firefox-i18n-58.0b7/gu-IN.xpi) = 513143
SHA256 (xpi/firefox-i18n-58.0b7/he.xpi) = 7cb2255febf95e7f4e525da53a12c0d4fc9a615957a747f1c81bda398f32902a
SIZE (xpi/firefox-i18n-58.0b7/he.xpi) = 473120
SHA256 (xpi/firefox-i18n-58.0b7/hi-IN.xpi) = fbbff4bfe185811a66ad2a1cd732fcad8e7decdc4bdbfea679c367a8df5f9fdb
SIZE (xpi/firefox-i18n-58.0b7/hi-IN.xpi) = 525453
SHA256 (xpi/firefox-i18n-58.0b7/hr.xpi) = 44e0f3a3573d54cb895982ad62b5f3c7971979942998dce3c87d59e318837f61
SIZE (xpi/firefox-i18n-58.0b7/hr.xpi) = 462702
SHA256 (xpi/firefox-i18n-58.0b7/hsb.xpi) = 568c4a71e34a7b88b1229c05fe63550d0a4f96debd1351368ab12584c2e1e5fd
SIZE (xpi/firefox-i18n-58.0b7/hsb.xpi) = 475942
SHA256 (xpi/firefox-i18n-58.0b7/hu.xpi) = 1bdd101cf2e9805328bbde15c00f87ed82b29a0afe2a0745db743b2d621045d6
SIZE (xpi/firefox-i18n-58.0b7/hu.xpi) = 476132
SHA256 (xpi/firefox-i18n-58.0b7/hy-AM.xpi) = 947853183c856365c2cca2fcde56482cd87cd17b3b1c4d2d88c4879e63564326
SIZE (xpi/firefox-i18n-58.0b7/hy-AM.xpi) = 511284
SHA256 (xpi/firefox-i18n-58.0b7/id.xpi) = 8ff79169c648b9719554385f8010212468305b06c3b8f05ed6935d678cd8946c
SIZE (xpi/firefox-i18n-58.0b7/id.xpi) = 443537
SHA256 (xpi/firefox-i18n-58.0b7/is.xpi) = 3673e382559b10751d47a76d15b895b4918673ea69fad4e6ab56b3b87d07b323
SIZE (xpi/firefox-i18n-58.0b7/is.xpi) = 453624
SHA256 (xpi/firefox-i18n-58.0b7/it.xpi) = eb71509c0c22ca6d0882241520eb4e810992b4ccd9b41980d54bee0528f086e0
SIZE (xpi/firefox-i18n-58.0b7/it.xpi) = 346053
SHA256 (xpi/firefox-i18n-58.0b7/ja.xpi) = a17aeb195c4af4fe54c54c58de60e413d933d1a5583f71556e1511f52a4735f6
SIZE (xpi/firefox-i18n-58.0b7/ja.xpi) = 510301
SHA256 (xpi/firefox-i18n-58.0b7/ka.xpi) = c470053edef732d3339e2e59659dd10c2f87f00b300025aa3b94a0c9b347d699
SIZE (xpi/firefox-i18n-58.0b7/ka.xpi) = 491519
SHA256 (xpi/firefox-i18n-58.0b7/kab.xpi) = b69597fd71b12d614d1d7b3598644fc45179706c95853c1d861ae9d57d36a7c9
SIZE (xpi/firefox-i18n-58.0b7/kab.xpi) = 461954
SHA256 (xpi/firefox-i18n-58.0b7/kk.xpi) = a03c9b118b1f96705bec67b793539d3c8795d1e8880973c2a48ac61964140af1
SIZE (xpi/firefox-i18n-58.0b7/kk.xpi) = 518501
SHA256 (xpi/firefox-i18n-58.0b7/km.xpi) = 60111db2078ebc92e0c589651197affd93ddfd7dc0ab30782dc50b60ebe0e29b
SIZE (xpi/firefox-i18n-58.0b7/km.xpi) = 529838
SHA256 (xpi/firefox-i18n-58.0b7/kn.xpi) = 8c1c8b9278f14b6589720b2ddc471bf983bbcd5728029746d3bc87139168b4f4
SIZE (xpi/firefox-i18n-58.0b7/kn.xpi) = 531528
SHA256 (xpi/firefox-i18n-58.0b7/ko.xpi) = bd6a6b5b85ceda83aa5dd985378302b4a128fd512e3733904742f58953805f0a
SIZE (xpi/firefox-i18n-58.0b7/ko.xpi) = 486933
SHA256 (xpi/firefox-i18n-58.0b7/lij.xpi) = bd6fc0af9832c1ed3b76790525c0b5704e0f525cf2470f844bccfda9a124b354
SIZE (xpi/firefox-i18n-58.0b7/lij.xpi) = 453062
SHA256 (xpi/firefox-i18n-58.0b7/lt.xpi) = 8cc25004c248f2948e614fc25a5b3a0f606f0d6a83313921f04c6e9ab6ad98af
SIZE (xpi/firefox-i18n-58.0b7/lt.xpi) = 474321
SHA256 (xpi/firefox-i18n-58.0b7/lv.xpi) = b6e37ce1f97f533c24ec1aa10f402e1e867b7d56cd0d38ae0dff4f4345332169
SIZE (xpi/firefox-i18n-58.0b7/lv.xpi) = 466057
SHA256 (xpi/firefox-i18n-58.0b7/mai.xpi) = a15ec95331d0de1f1504b52099c926242b06ba72acc6797aec311c1abfd0f02d
SIZE (xpi/firefox-i18n-58.0b7/mai.xpi) = 507029
SHA256 (xpi/firefox-i18n-58.0b7/mk.xpi) = 3f9f002793a23691265583d7f02ddfed04882316ccc881518aaccd2ecc66a214
SIZE (xpi/firefox-i18n-58.0b7/mk.xpi) = 489714
SHA256 (xpi/firefox-i18n-58.0b7/ml.xpi) = 4a212e62b04474c0524b87e14fb9abe1784210394c7c21f9115f4aaaf8945fb8
SIZE (xpi/firefox-i18n-58.0b7/ml.xpi) = 535827
SHA256 (xpi/firefox-i18n-58.0b7/mr.xpi) = a0013db4b525f3517f536beadf63b31f14cbf3c9ed47ecbda30b75fabbebaa92
SIZE (xpi/firefox-i18n-58.0b7/mr.xpi) = 520641
SHA256 (xpi/firefox-i18n-58.0b7/ms.xpi) = e2d8e3a4511d81ee37080508e6c4f873e2296c65fcc9125e269c970100762db1
SIZE (xpi/firefox-i18n-58.0b7/ms.xpi) = 450754
SHA256 (xpi/firefox-i18n-58.0b7/my.xpi) = 34a5f1f31fa4423bc6b44610fcd1f8c1b780b2fe5674a2032dfcd2f0b6cc9d7f
SIZE (xpi/firefox-i18n-58.0b7/my.xpi) = 516242
SHA256 (xpi/firefox-i18n-58.0b7/nb-NO.xpi) = d1dbc2086a83a2c5313adad1b7d37daa1166aa526b967952f3f5e9b3992d58ee
SIZE (xpi/firefox-i18n-58.0b7/nb-NO.xpi) = 450952
SHA256 (xpi/firefox-i18n-58.0b7/ne-NP.xpi) = 9f8def738641de3cb201f16e56efe08d40d5e2231d6964578d0e5d166fac4951
SIZE (xpi/firefox-i18n-58.0b7/ne-NP.xpi) = 513866
SHA256 (xpi/firefox-i18n-58.0b7/nl.xpi) = 59055e0ae4eda4009a47e0378c785894bbe6cd1db7c35cd19be35b29ccaf3299
SIZE (xpi/firefox-i18n-58.0b7/nl.xpi) = 457920
SHA256 (xpi/firefox-i18n-58.0b7/nn-NO.xpi) = 198c410054c4d4b6e6e69ee5a31d7b1de5e46be7a7689d6721e90f6ae169971a
SIZE (xpi/firefox-i18n-58.0b7/nn-NO.xpi) = 451292
SHA256 (xpi/firefox-i18n-58.0b7/or.xpi) = ed660f0d5263f410c2206297703c97f3eb4e8c7508147f72c717e9943719c841
SIZE (xpi/firefox-i18n-58.0b7/or.xpi) = 500120
SHA256 (xpi/firefox-i18n-58.0b7/pa-IN.xpi) = 9304d145515d888243999699aabe7aca29fe2e7d3178d99f8290d6b9ba2f8d56
SIZE (xpi/firefox-i18n-58.0b7/pa-IN.xpi) = 495033
SHA256 (xpi/firefox-i18n-58.0b7/pl.xpi) = a8b29db802fafca938544e3bd9e64ede8ca13d1649610bde17f768318996b3ad
SIZE (xpi/firefox-i18n-58.0b7/pl.xpi) = 362848
SHA256 (xpi/firefox-i18n-58.0b7/pt-BR.xpi) = 924e2ba359c9697c9d49b28cbd69fb14cf3d1a9aa94c17f869dc39d4c12fec76
SIZE (xpi/firefox-i18n-58.0b7/pt-BR.xpi) = 456517
SHA256 (xpi/firefox-i18n-58.0b7/pt-PT.xpi) = 0ffb3f63545cede06e23117242a9bd3ad61953d134122f7191ec7935f73f9594
SIZE (xpi/firefox-i18n-58.0b7/pt-PT.xpi) = 459324
SHA256 (xpi/firefox-i18n-58.0b7/rm.xpi) = 3d642f50c71bb2e135c739b87184aae6eb8c72b53b0de0f6d87c704c11aa306d
SIZE (xpi/firefox-i18n-58.0b7/rm.xpi) = 452476
SHA256 (xpi/firefox-i18n-58.0b7/ro.xpi) = d81875adc8798e053093a0adaf5d3d61dfbebf96f4ff5be3d81436dad76e3209
SIZE (xpi/firefox-i18n-58.0b7/ro.xpi) = 456197
SHA256 (xpi/firefox-i18n-58.0b7/ru.xpi) = a2c1d93e82dbd642290c903988b44175870d8fd2be852ac8924f02f1768c51de
SIZE (xpi/firefox-i18n-58.0b7/ru.xpi) = 526135
SHA256 (xpi/firefox-i18n-58.0b7/si.xpi) = 4bd01ac9e4c0015f73a23cd99b539139ad009e4bbd62c86d17502ac00baa5024
SIZE (xpi/firefox-i18n-58.0b7/si.xpi) = 497889
SHA256 (xpi/firefox-i18n-58.0b7/sk.xpi) = de990779319a30e123c9a00cab286f0202e06d99ab92515872f7946adbd22d46
SIZE (xpi/firefox-i18n-58.0b7/sk.xpi) = 479897
SHA256 (xpi/firefox-i18n-58.0b7/sl.xpi) = bfd9b5a8e7151858ea1f68ff5374e92bc32a8d51a7fe162f3fa9bfb33de974b7
SIZE (xpi/firefox-i18n-58.0b7/sl.xpi) = 459207
SHA256 (xpi/firefox-i18n-58.0b7/son.xpi) = 5c99d721dcb5873ea46cf307557520511a2cbcbd308e978dcbac653ac615d64d
SIZE (xpi/firefox-i18n-58.0b7/son.xpi) = 451480
SHA256 (xpi/firefox-i18n-58.0b7/sq.xpi) = bb5396c789a92bf1aab0ab771cadd4632d4c0682c258ed52e7b6e8d7144fb6ac
SIZE (xpi/firefox-i18n-58.0b7/sq.xpi) = 465297
SHA256 (xpi/firefox-i18n-58.0b7/sr.xpi) = 2a729627c9f19cf05b6f4883ecfe304b22451f0238d9bfc0e04e0041a1779583
SIZE (xpi/firefox-i18n-58.0b7/sr.xpi) = 486326
SHA256 (xpi/firefox-i18n-58.0b7/sv-SE.xpi) = df1358334e43a8fd2c6335cac02eda71f26a5705607341e0ae4646d2a66f498f
SIZE (xpi/firefox-i18n-58.0b7/sv-SE.xpi) = 459101
SHA256 (xpi/firefox-i18n-58.0b7/ta.xpi) = 8f895cf90faf4a77373cd503f009c5ff58eb57b8526fbb1b82e9463bb7fa6eca
SIZE (xpi/firefox-i18n-58.0b7/ta.xpi) = 513774
SHA256 (xpi/firefox-i18n-58.0b7/te.xpi) = 2e66d22b735622e68231d51ea8f22748ac1f1bcb50710f01b4eafc5555389792
SIZE (xpi/firefox-i18n-58.0b7/te.xpi) = 530530
SHA256 (xpi/firefox-i18n-58.0b7/th.xpi) = 6ae4403abb4a7db21f2b3212ce01b39893cbfc650459cd3e42a200beaacacd33
SIZE (xpi/firefox-i18n-58.0b7/th.xpi) = 502310
SHA256 (xpi/firefox-i18n-58.0b7/tr.xpi) = c79665c4a8f3cab2ef5908ceff6fad2e45e4dc088698bd7be5bed9efd394222e
SIZE (xpi/firefox-i18n-58.0b7/tr.xpi) = 465013
SHA256 (xpi/firefox-i18n-58.0b7/uk.xpi) = 979a4625eeba33f98120a3a3d15b3897a28b6faa7be925dcfe02d2a2cbc76805
SIZE (xpi/firefox-i18n-58.0b7/uk.xpi) = 517420
SHA256 (xpi/firefox-i18n-58.0b7/ur.xpi) = 05ed1e79dab6ea9db530286c4c4f4ebcd59dd1ad67e22f607134364aab54535f
SIZE (xpi/firefox-i18n-58.0b7/ur.xpi) = 511280
SHA256 (xpi/firefox-i18n-58.0b7/uz.xpi) = 65943d8be65caf7ef44ece68978554af61be486a9da7156cef10d696899a6d49
SIZE (xpi/firefox-i18n-58.0b7/uz.xpi) = 462046
SHA256 (xpi/firefox-i18n-58.0b7/vi.xpi) = 009f9fdb444b45b4a683c5df361afeebe7ba781aa1ac1cad914cda14a5019eea
SIZE (xpi/firefox-i18n-58.0b7/vi.xpi) = 470021
SHA256 (xpi/firefox-i18n-58.0b7/xh.xpi) = 6af885ea970fd868b4d62be1f030ce2f2252d55a701b812d980929b6b29e2030
SIZE (xpi/firefox-i18n-58.0b7/xh.xpi) = 464808
SHA256 (xpi/firefox-i18n-58.0b7/zh-CN.xpi) = d74c5b1cd6e02d35cf5e3d0a561300d38624b07a3bf4a32912366907df06a18c
SIZE (xpi/firefox-i18n-58.0b7/zh-CN.xpi) = 482839
SHA256 (xpi/firefox-i18n-58.0b7/zh-TW.xpi) = 31153a6f5cfbee4889bdf2486b9f082794824fb8a7be06cdd691b5320cbac61c
SIZE (xpi/firefox-i18n-58.0b7/zh-TW.xpi) = 480463




# $FreeBSD$

PORTNAME=	firefox
DISTVERSION=	58.0b7
PORTREVISION=	2
PORTEPOCH=	1
CATEGORIES=	www ipv6
MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}/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.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.34:graphics/png \
		libvorbis>=1.3.5,3:audio/libvorbis \
		libvpx>=1.5.0:multimedia/libvpx \
		sqlite3>=3.20.1:databases/sqlite3 \

Lines 1-3 Link Here

(-)b/www/firefox/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1510498738	1	TIMESTAMP = 1511798418
2	SHA256 (firefox-57.0.source.tar.xz) = 603af00155be87f2c9c58047dd0072971f1cdab1f632695aae6ad072efefbb8f	2	SHA256 (firefox-58.0b7.source.tar.xz) = ee5439963930c004bef840729c8e10f22ab685a1e312723610be9dbb48f98f30
3	SIZE (firefox-57.0.source.tar.xz) = 250728772	3	SIZE (firefox-58.0b7.source.tar.xz) = 248193912




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




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 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




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"
   );




 toolkit/library/Makefile.in                             |  1 +
 6 files changed, 52 insertions(+), 1 deletion(-)

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
@@ -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)
 else
     MOZ_SYNTH_PICO=
 fi
     AC_DEFINE(MOZ_WEBRTC_SIGNALING)
diff --git build/gyp.mozbuild build/gyp.mozbuild
index b483cd1..f1dd1f0 100644
--- build/gyp.mozbuild




# Allow building against system-wide graphite2/harfbuzz.

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',
+#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 dom/base/moz.build dom/base/moz.build
index 8e19020315ae..2fcdbb6f7b42 100644
--- dom/base/moz.build
+++ dom/base/moz.build
@@ -470,6 +470,9 @@ if CONFIG['MOZ_BUILD_APP'] in ['browser', 'mobile/android', 'xulrunner']:
 if CONFIG['MOZ_X11']:
     CXXFLAGS += CONFIG['TK_CFLAGS']
 

index e06ae3457a47..93faa61594a3 100755
--- gfx/skia/generate_mozbuild.py
+++ gfx/skia/generate_mozbuild.py
@@ -135,6 +135,9 @@ if CONFIG['CLANG_CXX'] or CONFIG['CLANG_CL']:
         '-Wno-unused-private-field',
     ]
 

index 2118677ca3a8..e4978b413784 100644
--- gfx/skia/moz.build
+++ gfx/skia/moz.build
@@ -780,6 +780,9 @@ if CONFIG['CLANG_CXX'] or CONFIG['CLANG_CL']:
         '-Wno-unused-private-field',
     ]
 

index 56f1b9fe3f4b..0ac1100b0df3 100644
--- gfx/thebes/moz.build
+++ gfx/thebes/moz.build
@@ -267,7 +267,13 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3'):
 
 LOCAL_INCLUDES += CONFIG['SKIA_INCLUDES']
 

index cb1233c56d7e..06fb1f9f174b 100644
--- intl/unicharutil/util/moz.build
+++ intl/unicharutil/util/moz.build
@@ -25,4 +25,7 @@ UNIFIED_SOURCES += [
     'nsUnicodeProperties.cpp',
 ]
 
+if CONFIG['MOZ_SYSTEM_HARFBUZZ']:
+    CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS']

index 79c26e3e7001..c4d93bc5f7dc 100644
--- netwerk/dns/moz.build
+++ netwerk/dns/moz.build
@@ -73,3 +73,6 @@ USE_LIBS += ['icu']
     '/netwerk/base',
 ]
 
 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
@@ -4333,6 +4333,27 @@ dnl ========================================================
 
 AC_SUBST(MOZ_LINUX_32_SSE2_STARTUP_ERROR)
 
+dnl ========================================================
+dnl Check for graphite2
+dnl ========================================================
+if test -n "$MOZ_SYSTEM_GRAPHITE2"; then

+    CFLAGS=$_SAVE_CFLAGS
+fi
+
 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
@@ -231,6 +231,12 @@ if CONFIG['MOZ_SYSTEM_JPEG']:
 if CONFIG['MOZ_SYSTEM_PNG']:
     OS_LIBS += CONFIG['MOZ_PNG_LIBS']
 

index 9297e4d6f501..d8e273887e4b 100644
--- toolkit/moz.configure
+++ toolkit/moz.configure
@@ -1065,6 +1065,26 @@ add_old_configure_assignment('FT2_LIBS',
 add_old_configure_assignment('FT2_CFLAGS',
                              ft2_info.cflags)
 
+# Graphite2
+# ==============================================================

+
+set_config('MOZ_SYSTEM_HARFBUZZ', depends_if(system_harfbuzz)(lambda _: True))
+
 # Mortar
 # ==============================================================
 option('--enable-mortar', help='Enable mortar extension')




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 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




index d0fe7accffe6..c46bdd023225 100644
--- build/moz.configure/old.configure
+++ build/moz.configure/old.configure
@@ -285,7 +285,12 @@ def old_configure_options(*options):
     '--with-system-libvpx',
     '--with-system-nspr',
     '--with-system-nss',

     '--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
@@ -23,12 +23,21 @@ external_dirs += ['modules/woff2']
 
 external_dirs += ['modules/xz-embedded']
 
-if CONFIG['MOZ_VORBIS']:
+if not CONFIG['MOZ_SYSTEM_OGG']:

 if CONFIG['MOZ_WEBM_ENCODER']:
     external_dirs += ['media/libmkv']
 
@@ -51,12 +60,9 @@ external_dirs += [
     'media/kiss_fft',
     'media/libcubeb',
     'media/libnestegg',

     'media/psshparser'
 ]
 
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
@@ -121,7 +121,9 @@ AudioStream::AudioStream(DataSource& aSource)
   : mMonitor("AudioStream")
   , mChannels(0)
   , mOutChannels(0)

   , mDumpFile(nullptr)
   , mState(INITIALIZED)
   , mDataSource(aSource)
@@ -142,9 +144,11 @@ AudioStream::~AudioStream()
   if (mDumpFile) {
     fclose(mDumpFile);
   }

 #if defined(XP_WIN)
   if (XRE_IsContentProcess()) {
     audio::AudioNotificationReceiver::Unregister(this);
@@ -168,7 +172,11 @@ nsresult AudioStream::EnsureTimeStretcherInitializedUnlocked()
 {
   mMonitor.AssertCurrentThreadOwns();
   if (!mTimeStretcher) {

index 7dc1f60f95cc..67d402a4117f 100644
--- dom/media/AudioStream.h
+++ dom/media/AudioStream.h
@@ -15,7 +15,11 @@
 #include "mozilla/TimeStamp.h"
 #include "mozilla/UniquePtr.h"
 #include "CubebUtils.h"

 #include "soundtouch/SoundTouchFactory.h"
+#endif
 
 #if defined(XP_WIN)
 #include "mozilla/audio/AudioNotificationReceiver.h"
@@ -297,7 +301,11 @@ private:
   uint32_t mChannels;
   uint32_t mOutChannels;
   AudioClock mAudioClock;

index 86b051c58d33..fb6186dce78b 100644
--- dom/media/moz.build
+++ dom/media/moz.build
@@ -318,6 +318,21 @@ if CONFIG['MOZ_WEBRTC']:
 
 DEFINES['MOZILLA_INTERNAL_API'] = True
 

+if CONFIG['MOZ_SYSTEM_SOUNDTOUCH']:
+    CXXFLAGS += CONFIG['MOZ_SOUNDTOUCH_CFLAGS']
+
 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

 
 namespace mozilla {
 
@@ -54,6 +58,12 @@ FFVPXRuntimeLinker::Init()
 
   sLinkStatus = LinkStatus_FAILED;
 

   // We retrieve the path of the lgpllibs library as this is where mozavcodec
   // and mozavutil libs are located.
   char* lgpllibsname = PR_GetLibraryName(nullptr, "lgpllibs");
@@ -64,6 +74,7 @@ FFVPXRuntimeLinker::Init()
     PR_GetLibraryFilePathname(lgpllibsname,
                               (PRFuncPtr)&soundtouch::SoundTouch::getVersionId);
   PR_FreeLibraryName(lgpllibsname);

index 1211ac074b33..eb31084aed25 100644
--- media/libvorbis/README_MOZILLA
+++ media/libvorbis/README_MOZILLA
@@ -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.

index b614eef85c89..85f9099dba4d 100644
--- old-configure.in
+++ old-configure.in
@@ -2627,6 +2627,111 @@ if test -n "$MOZ_APPLEMEDIA"; then
     fi
 fi
 fi # COMPILE_ENVIRONMENT
 
+dnl ========================================================
+dnl Check for libogg

index 079a575adec3..514d901195de 100644
--- toolkit/library/moz.build
+++ toolkit/library/moz.build
@@ -240,6 +240,21 @@ if CONFIG['MOZ_SYSTEM_HARFBUZZ']:
 if CONFIG['MOZ_SYSTEM_HUNSPELL']:
     OS_LIBS += CONFIG['MOZ_HUNSPELL_LIBS']
 

index c083ab4bc4f3..62b917043a2c 100644
--- xpcom/build/XPCOMInit.cpp
+++ xpcom/build/XPCOMInit.cpp
@@ -132,7 +132,9 @@ extern nsresult nsStringInputStreamConstructor(nsISupports*, REFNSIID, void**);
 
 #include "mozilla/ipc/GeckoChildProcessHost.h"
 

 #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
@@ -639,11 +641,13 @@ NS_InitXPCOM2(nsIServiceManager** aResult,
   // this oddness.
   mozilla::SetICUMemoryFunctions();
 

Return to bug 223425

Lines 37-48 RUN_DEPENDS+= libxul>=45:www/libxul Link Here

(-)b/Mk/Uses/gecko.mk (-2 / +2 lines)
37	.elif ${gecko_ARGS:Mfirefox}	37	.elif ${gecko_ARGS:Mfirefox}
38		38
39	_GECKO_DEFAULT_VERSION= 52	39	_GECKO_DEFAULT_VERSION= 52
40	_GECKO_VERSIONS= 52 57	40	_GECKO_VERSIONS= 52 58
41	_GECKO_TYPE= firefox	41	_GECKO_TYPE= firefox
42		42
43	# Dependence lines for different Firefox versions	43	# Dependence lines for different Firefox versions
44	52_DEPENDS= ${LOCALBASE}/lib/firefox/firefox:www/firefox-esr	44	52_DEPENDS= ${LOCALBASE}/lib/firefox/firefox:www/firefox-esr
45	57_DEPENDS= ${LOCALBASE}/lib/firefox/firefox:www/firefox	45	58_DEPENDS= ${LOCALBASE}/lib/firefox/firefox:www/firefox
46		46
47	.if exists(${LOCALBASE}/bin/firefox)	47	.if exists(${LOCALBASE}/bin/firefox)
48	_GECKO_INSTALLED_VER!= ${LOCALBASE}/bin/firefox --version 2>/dev/null	48	_GECKO_INSTALLED_VER!= ${LOCALBASE}/bin/firefox --version 2>/dev/null

Lines 110-122 MESA_LLVM_VER?= 40 Link Here

(-)b/Mk/bsd.gecko.mk (-2 / +4 lines)
110	BUILD_DEPENDS+= llvm${MESA_LLVM_VER}>0:devel/llvm${MESA_LLVM_VER}	110	BUILD_DEPENDS+= llvm${MESA_LLVM_VER}>0:devel/llvm${MESA_LLVM_VER}
111	MOZ_EXPORT+= LLVM_CONFIG=llvm-config${MESA_LLVM_VER}	111	MOZ_EXPORT+= LLVM_CONFIG=llvm-config${MESA_LLVM_VER}
112	MOZ_EXPORT+= BINDGEN_CFLAGS="${BINDGEN_CFLAGS}"	112	MOZ_EXPORT+= BINDGEN_CFLAGS="${BINDGEN_CFLAGS}"
113	# XXX bug 1341234	113	.if ${MOZILLA_VER:R:R} < 58
114	. if ! ${USE_MOZILLA:M-nspr}	114	. if ! ${USE_MOZILLA:M-nspr}
115	BINDGEN_CFLAGS+=-isystem${LOCALBASE}/include/nspr	115	BINDGEN_CFLAGS+=-isystem${LOCALBASE}/include/nspr
116	. endif	116	. endif
117	. if ! ${USE_MOZILLA:M-pixman}	117	. if ! ${USE_MOZILLA:M-pixman}
118	BINDGEN_CFLAGS+=-isystem${LOCALBASE}/include/pixman-1	118	BINDGEN_CFLAGS+=-isystem${LOCALBASE}/include/pixman-1
119	. endif	119	. endif
		120	.endif # MOZILLA_VER < 58
120	.endif	121	.endif
121		122
122	.if ${OPSYS} == FreeBSD && ${OSREL} == 11.1	123	.if ${OPSYS} == FreeBSD && ${OSREL} == 11.1
Lines 144-149 PKGDEINSTALL_INC?= ${.CURDIR}/../../www/firefox/files/pkg-deinstall.in Link Here
144	MOZ_PKGCONFIG_FILES?= ${MOZILLA}-gtkmozembed ${MOZILLA}-js \	145	MOZ_PKGCONFIG_FILES?= ${MOZILLA}-gtkmozembed ${MOZILLA}-js \
145	${MOZILLA}-xpcom ${MOZILLA}-plugin	146	${MOZILLA}-xpcom ${MOZILLA}-plugin
146		147
		148	MAKE_ENV+= MACH=1 # XXX bug 1412398
147	ALL_TARGET?= build	149	ALL_TARGET?= build
148		150
149	MOZ_EXPORT+= ${CONFIGURE_ENV} \	151	MOZ_EXPORT+= ${CONFIGURE_ENV} \
Lines 381-387 post-patch-SNDIO-on: Link Here
381	.endif	383	.endif
382		384
383	.if ${PORT_OPTIONS:MRUST} \|\| ${MOZILLA_VER:R:R} >= 54	385	.if ${PORT_OPTIONS:MRUST} \|\| ${MOZILLA_VER:R:R} >= 54
384	BUILD_DEPENDS+= ${RUST_PORT:T}>=1.19.0_2:${RUST_PORT}	386	BUILD_DEPENDS+= ${RUST_PORT:T}>=1.21.0:${RUST_PORT}
385	RUST_PORT?= lang/rust	387	RUST_PORT?= lang/rust
386	. if ${MOZILLA_VER:R:R} < 54	388	. if ${MOZILLA_VER:R:R} < 54
387	MOZ_OPTIONS+= --enable-rust	389	MOZ_OPTIONS+= --enable-rust

Lines 2-11 Link Here

(-)b/www/firefox-i18n/Makefile (-3 / +3 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= firefox-i18n	4	PORTNAME= firefox-i18n
5	PORTVERSION= 57.0	5	PORTVERSION= 58.0b7
6	CATEGORIES= www	6	CATEGORIES= www
7	MASTER_SITES= MOZILLA/${PORTNAME:S\|-i18n\|\|}/releases/${DISTVERSION}/linux-i686/xpi \	7	MASTER_SITES= MOZILLA/${PORTNAME:S\|-i18n\|\|}/releases/${DISTVERSION}/linux-i686/xpi \
8	MOZILLA/${PORTNAME:S\|-i18n\|\|}/candidates/${DISTVERSION}-candidates/build4/linux-i686/xpi	8	MOZILLA/${PORTNAME:S\|-i18n\|\|}/candidates/${DISTVERSION}-candidates/build1/linux-i686/xpi
9	PKGNAMEPREFIX=	9	PKGNAMEPREFIX=
10	DISTFILES= ${FIREFOX_I18N_:S/$/.xpi/}	10	DISTFILES= ${FIREFOX_I18N_:S/$/.xpi/}
11	DIST_SUBDIR= xpi/${DISTNAME}	11	DIST_SUBDIR= xpi/${DISTNAME}
Lines 15-21 COMMENT= Localized interface for Firefox Link Here
15		15
16	EXTRACT_DEPENDS= zip:archivers/zip	16	EXTRACT_DEPENDS= zip:archivers/zip
17		17
18	USES= zip:infozip gecko:firefox,57,build	18	USES= zip:infozip gecko:firefox,58,build
19	USE_XPI= firefox	19	USE_XPI= firefox
20		20
21	NO_ARCH= yes	21	NO_ARCH= yes

Lines 2-25 Link Here

(-)b/www/firefox/Makefile (-5 / +4 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= firefox	4	PORTNAME= firefox
5	DISTVERSION= 57.0	5	DISTVERSION= 58.0b7
6	PORTREVISION= 2
7	PORTEPOCH= 1	6	PORTEPOCH= 1
8	CATEGORIES= www ipv6	7	CATEGORIES= www ipv6
9	MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \	8	MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \
10	MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build4/source	9	MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source
11	DISTFILES= ${DISTNAME}.source${EXTRACT_SUFX}	10	DISTFILES= ${DISTNAME}.source${EXTRACT_SUFX}
12		11
13	MAINTAINER= gecko@FreeBSD.org	12	MAINTAINER= gecko@FreeBSD.org
14	COMMENT= Web browser based on the browser portion of Mozilla	13	COMMENT= Web browser based on the browser portion of Mozilla
15		14
16	BUILD_DEPENDS= nspr>=4.17:devel/nspr \	15	BUILD_DEPENDS= nspr>=4.17:devel/nspr \
17	nss>=3.33:security/nss \	16	nss>=3.34:security/nss \
18	icu>=59.1,1:devel/icu \	17	icu>=59.1,1:devel/icu \
19	libevent>=2.1.8:devel/libevent \	18	libevent>=2.1.8:devel/libevent \
20	harfbuzz>=1.5.1:print/harfbuzz \	19	harfbuzz>=1.5.1:print/harfbuzz \
21	graphite2>=1.3.10:graphics/graphite2 \	20	graphite2>=1.3.10:graphics/graphite2 \
22	png>=1.6.31:graphics/png \	21	png>=1.6.34:graphics/png \
23	libvorbis>=1.3.5,3:audio/libvorbis \	22	libvorbis>=1.3.5,3:audio/libvorbis \
24	libvpx>=1.5.0:multimedia/libvpx \	23	libvpx>=1.5.0:multimedia/libvpx \
25	sqlite3>=3.20.1:databases/sqlite3 \	24	sqlite3>=3.20.1:databases/sqlite3 \

Removed Link Here

(-)a/www/firefox/files/patch-bug1186967 (-41 lines)
1	commit 64bb4e051b50
2	Author: Martin Stransky <stransky@redhat.com>
3	Date: Tue Oct 17 09:50:18 2017 +0200
4
5	Bug 1186967 - ignore double-click on WM without _NET_WM_MOVERESIZE support, r=jhorak
6
7	MozReview-Commit-ID: 2Vs6i5leero
8
9	--HG--
10	extra : rebase_source : d8f2bbaf9ef9b2025478f029a68ee7e87e07de79
11	---
12	widget/gtk/nsWindow.cpp \| 16 ++++++++++++++++
13	1 file changed, 16 insertions(+)
14
15	diff --git widget/gtk/nsWindow.cpp widget/gtk/nsWindow.cpp
16	index eb2f0e5e95cd..955327297ac9 100644
17	--- widget/gtk/nsWindow.cpp
18	+++ widget/gtk/nsWindow.cpp
19	@@ -6444,6 +6444,22 @@ nsWindow::GetDragInfo(WidgetMouseEvent* aMouseEvent,
20	return false;
21	}
22
23	+ if (mIsX11Display) {
24	+ // Workaround for https://bugzilla.gnome.org/show_bug.cgi?id=789054
25	+ // To avoid crashes disable double-click on WM without _NET_WM_MOVERESIZE.
26	+ // See _should_perform_ewmh_drag() at gdkwindow-x11.c
27	+ GdkScreen* screen = gdk_window_get_screen(gdk_window);
28	+ GdkAtom atom = gdk_atom_intern("_NET_WM_MOVERESIZE", FALSE);
29	+ if (!gdk_x11_screen_supports_net_wm_hint(screen, atom)) {
30	+ static unsigned int lastTimeStamp = 0;
31	+ if (lastTimeStamp != aMouseEvent->mTime) {
32	+ lastTimeStamp = aMouseEvent->mTime;
33	+ } else {
34	+ return false;
35	+ }
36	+ }
37	+ }
38	+
39	// FIXME: It would be nice to have the widget position at the time
40	// of the event, but it's relatively unlikely that the widget has
41	// moved since the mousedown. (On the other hand, it's quite likely

Removed Link Here

(-)a/www/firefox/files/patch-bug1366201 (-40 lines)
1	commit 139967a109c1
2	Author: Jean-Yves Avenard <jyavenard@mozilla.com>
3	Date: Wed Oct 25 18:25:37 2017 +0200
4
5	Bug 1366201 - P5. Get around FFmpeg bug with corrupted data. r=gerald
6
7	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.
8
9	We want the invalid content to generate a decoding error, so we set size to inputSize to ensure decoding failed later.
10
11	MozReview-Commit-ID: FZeiZUdUtLG
12	---
13	dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp \| 4 ++--
14	1 file changed, 2 insertions(+), 2 deletions(-)
15
16	diff --git dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp
17	index 6acc8fef4dd8..fdee880c9e3b 100644
18	--- dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp
19	+++ dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp
20	@@ -212,18 +212,18 @@ FFmpegVideoDecoder<LIBAV_VER>::DoDecode(MediaRawData* aSample, bool* aGotFrame,
21
22	#if LIBAVCODEC_VERSION_MAJOR >= 54
23	if (inputSize && mCodecParser && (mCodecID == AV_CODEC_ID_VP8
24	#if LIBAVCODEC_VERSION_MAJOR >= 55
25	\|\| mCodecID == AV_CODEC_ID_VP9
26	#endif
27	)) {
28	while (inputSize) {
29	- uint8_t* data;
30	- int size;
31	+ uint8_t* data = inputData;
32	+ int size = inputSize;
33	int len = mLib->av_parser_parse2(
34	mCodecParser, mCodecContext, &data, &size, inputData, inputSize,
35	aSample->mTime.ToMicroseconds(), aSample->mTimecode.ToMicroseconds(),
36	aSample->mOffset);
37	if (size_t(len) > inputSize) {
38	return NS_ERROR_DOM_MEDIA_DECODE_ERR;
39	}
40	inputData += len;

Removed Link Here

(-)a/www/firefox/files/patch-bug1412558 (-83 lines)
1	diff --git dom/media/flac/FlacDecoder.cpp dom/media/flac/FlacDecoder.cpp
2	index 53fc3c9937f7..b23771ab80fa 100644
3	--- dom/media/flac/FlacDecoder.cpp
4	+++ dom/media/flac/FlacDecoder.cpp
5	@@ -7,6 +7,7 @@
6	#include "FlacDecoder.h"
7	#include "MediaContainerType.h"
8	#include "MediaPrefs.h"
9	+#include "PDMFactory.h"
10
11	namespace mozilla {
12
13	@@ -15,6 +16,10 @@ FlacDecoder::IsEnabled()
14	{
15	#ifdef MOZ_FFVPX
16	return MediaPrefs::FlacEnabled();
17	+#elif defined(MOZ_FFMPEG)
18	+ RefPtr<PDMFactory> platform = new PDMFactory();
19	+ return MediaPrefs::FlacEnabled() && platform->SupportsMimeType(NS_LITERAL_CSTRING("audio/flac"),
20	+ /* DecoderDoctorDiagnostics* */ nullptr);
21	#else
22	// Until bug 1295886 is fixed.
23	return false;
24	diff --git media/ffvpx/README_MOZILLA media/ffvpx/README_MOZILLA
25	index 5d3a6037efe0..43144b726a92 100644
26	--- media/ffvpx/README_MOZILLA
27	+++ media/ffvpx/README_MOZILLA
28	@@ -17,14 +17,6 @@ configuration files were generated as follow using the configure script:
29	config*:
30	replace: /HAVE_(MALLOC_H\|ARC4RANDOM\|LOCALTIME_R\|MEMALIGN\|POSIX_MEMALIGN)/d
31
32	-config_darwin32.h:
33	-add to configure command: --disable-asm --disable-yasm --cc='clang -m32'
34	-
35	-config_unix32.h:
36	-add to configure command: --disable-asm --disable-yasm --cc='clang -m32'
37	-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/
38	-
39	-
40	config_unix64.h/config_unix64.asm:
41	replace: s/HAVE_SYSCTL 1/HAVE_SYSCTL 0
42
43	diff --git media/ffvpx/config.h media/ffvpx/config.h
44	index dab01e05cd65..26ebe529bd98 100644
45	--- media/ffvpx/config.h
46	+++ media/ffvpx/config.h
47	@@ -27,17 +27,9 @@
48	#define HAVE_LIBC_MSVCRT 0
49	#endif
50	#elif defined(XP_DARWIN)
51	-#if defined(HAVE_64BIT_BUILD)
52	#include "config_darwin64.h"
53	-#else
54	-#include "config_darwin32.h"
55	-#endif
56	#elif defined(XP_UNIX)
57	-#if defined(HAVE_64BIT_BUILD)
58	#include "config_unix64.h"
59	-#else
60	-#include "config_unix32.h"
61	-#endif
62	#endif
63	#include "config_common.h"
64	#endif // MOZ_FFVPX_CONFIG_H
65	diff --git old-configure.in old-configure.in
66	index b8ce71278548..410be683c2f6 100644
67	--- old-configure.in
68	+++ old-configure.in
69	@@ -3279,11 +3279,11 @@ dnl = FFmpeg's ffvpx configuration
70	dnl ========================================================
71
72	MOZ_FFVPX=
73	-case "$CPU_ARCH" in
74	- x86)
75	+case "$OS_ARCH:$CPU_ARCH" in
76	+ WINNT:x86)
77	MOZ_FFVPX=1
78	;;
79	- x86_64)
80	+ *:x86_64)
81	MOZ_FFVPX=1
82	;;
83	esac

Removed Link Here

(-)a/www/firefox/files/patch-bug1414440 (-108 lines)
1	Always build libyuv x86 optimizations with Clang.
2
3	diff --git media/libyuv/libyuv/include/libyuv/compare_row.h media/libyuv/libyuv/include/libyuv/compare_row.h
4	index 7abc2d4aef8f..542df1ef504b 100644
5	--- media/libyuv/libyuv/include/libyuv/compare_row.h
6	+++ media/libyuv/libyuv/include/libyuv/compare_row.h
7	@@ -19,7 +19,7 @@ extern "C" {
8	#endif
9
10	#if defined(__pnacl__) \|\| defined(__CLR_VER) \|\| \
11	- (defined(__i386__) && !defined(__SSE2__))
12	+ (defined(__i386__) && !defined(__SSE__) && !defined(__clang__))
13	#define LIBYUV_DISABLE_X86
14	#endif
15	// MemorySanitizer does not support assembly code yet. http://crbug.com/344505
16	diff --git media/libyuv/libyuv/include/libyuv/planar_functions.h media/libyuv/libyuv/include/libyuv/planar_functions.h
17	index 040839c211b1..5f6a8034d209 100644
18	--- media/libyuv/libyuv/include/libyuv/planar_functions.h
19	+++ media/libyuv/libyuv/include/libyuv/planar_functions.h
20	@@ -720,7 +720,7 @@ int I420Interpolate(const uint8* src0_y,
21	int interpolation);
22
23	#if defined(__pnacl__) \|\| defined(__CLR_VER) \|\| \
24	- (defined(__i386__) && !defined(__SSE2__))
25	+ (defined(__i386__) && !defined(__SSE__) && !defined(__clang__))
26	#define LIBYUV_DISABLE_X86
27	#endif
28	// MemorySanitizer does not support assembly code yet. http://crbug.com/344505
29	diff --git media/libyuv/libyuv/include/libyuv/rotate_row.h media/libyuv/libyuv/include/libyuv/rotate_row.h
30	index 2c51584eee8b..8e60a713c4cf 100644
31	--- media/libyuv/libyuv/include/libyuv/rotate_row.h
32	+++ media/libyuv/libyuv/include/libyuv/rotate_row.h
33	@@ -19,7 +19,7 @@ extern "C" {
34	#endif
35
36	#if defined(__pnacl__) \|\| defined(__CLR_VER) \|\| \
37	- (defined(__i386__) && !defined(__SSE2__))
38	+ (defined(__i386__) && !defined(__SSE__) && !defined(__clang__))
39	#define LIBYUV_DISABLE_X86
40	#endif
41	// MemorySanitizer does not support assembly code yet. http://crbug.com/344505
42	diff --git media/libyuv/libyuv/include/libyuv/row.h media/libyuv/libyuv/include/libyuv/row.h
43	index f74bd9f7d17a..b8f674ba124d 100644
44	--- media/libyuv/libyuv/include/libyuv/row.h
45	+++ media/libyuv/libyuv/include/libyuv/row.h
46	@@ -31,7 +31,7 @@ extern "C" {
47	var = 0
48
49	#if defined(__pnacl__) \|\| defined(__CLR_VER) \|\| \
50	- (defined(__i386__) && !defined(__SSE2__))
51	+ (defined(__i386__) && !defined(__SSE__) && !defined(__clang__))
52	#define LIBYUV_DISABLE_X86
53	#endif
54	// MemorySanitizer does not support assembly code yet. http://crbug.com/344505
55	diff --git media/libyuv/libyuv/include/libyuv/scale_row.h media/libyuv/libyuv/include/libyuv/scale_row.h
56	index edb46cc8c647..2b2c7a0700ef 100644
57	--- media/libyuv/libyuv/include/libyuv/scale_row.h
58	+++ media/libyuv/libyuv/include/libyuv/scale_row.h
59	@@ -20,7 +20,7 @@ extern "C" {
60	#endif
61
62	#if defined(__pnacl__) \|\| defined(__CLR_VER) \|\| \
63	- (defined(__i386__) && !defined(__SSE2__))
64	+ (defined(__i386__) && !defined(__SSE__) && !defined(__clang__))
65	#define LIBYUV_DISABLE_X86
66	#endif
67	// MemorySanitizer does not support assembly code yet. http://crbug.com/344505
68	diff --git media/libyuv/libyuv/linux.mk media/libyuv/libyuv/linux.mk
69	index 923345ae4d12..9e555e303913 100644
70	--- media/libyuv/libyuv/linux.mk
71	+++ media/libyuv/libyuv/linux.mk
72	@@ -80,4 +80,4 @@ cpuid: util/cpuid.c libyuv.a
73	$(CC) $(CFLAGS) -o $@ util/cpuid.c libyuv.a
74
75	clean:
76	- /bin/rm -f source/.o .ii *.s libyuv.a convert cpuid psnr
77	+ /bin/rm -f source/.o .ii *.s libyuv.a yuvconvert cpuid psnr
78	diff --git media/libyuv/libyuv/source/row_gcc.cc media/libyuv/libyuv/source/row_gcc.cc
79	index 8735070b619d..9df8c6a627db 100644
80	--- media/libyuv/libyuv/source/row_gcc.cc
81	+++ media/libyuv/libyuv/source/row_gcc.cc
82	@@ -5479,7 +5479,7 @@ void HalfFloatRow_SSE2(const uint16* src, uint16* dst, float scale, int width) {
83	: "+r"(src), // %0
84	"+r"(dst), // %1
85	"+r"(width) // %2
86	- : "x"(scale * kScaleBias) // %3
87	+ : "mx"(scale * kScaleBias) // %3
88	: "memory", "cc",
89	"xmm2", "xmm3", "xmm4", "xmm5"
90	);
91	@@ -5515,7 +5515,7 @@ void HalfFloatRow_AVX2(const uint16* src, uint16* dst, float scale, int width) {
92	: "+r"(src), // %0
93	"+r"(dst), // %1
94	"+r"(width) // %2
95	- : "x"(scale * kScaleBias) // %3
96	+ : "mx"(scale * kScaleBias) // %3
97	: "memory", "cc",
98	"xmm2", "xmm3", "xmm4", "xmm5"
99	);
100	@@ -5548,7 +5548,7 @@ void HalfFloatRow_F16C(const uint16* src, uint16* dst, float scale, int width) {
101	: "+r"(src), // %0
102	"+r"(dst), // %1
103	"+r"(width) // %2
104	- : "x"(scale) // %3
105	+ : "mx"(scale) // %3
106	: "memory", "cc",
107	"xmm2", "xmm3", "xmm4"
108	);

Lines 13-44 Date: Fri Jan 4 13:49:22 2013 +0100 Link Here

(-)b/www/firefox/files/patch-bug826985 (-20 / +20 lines)
13	toolkit/library/Makefile.in \| 1 +	13	toolkit/library/Makefile.in \| 1 +
14	6 files changed, 52 insertions(+), 1 deletion(-)	14	6 files changed, 52 insertions(+), 1 deletion(-)
15		15
16	diff --git config/system-headers config/system-headers	16	diff --git config/system-headers.mozbuild config/system-headers.mozbuild
17	index 55e4cd1..76567b3 100644	17	index e02d381a12e9..7620b4d00623 100644
18	--- config/system-headers	18	--- config/system-headers.mozbuild
19	+++ config/system-headers	19	+++ config/system-headers.mozbuild
20	@@ -624,6 +624,7 @@ libgnome/libgnome.h	20	@@ -428,6 +428,7 @@ system_headers = [
21	libgnomeui/gnome-icon-lookup.h	21	'libgnomeui/gnome-icon-theme.h',
22	libgnomeui/gnome-icon-theme.h	22	'libgnomeui/gnome-ui-init.h',
23	libgnomeui/gnome-ui-init.h	23	'libutil.h',
24	+libv4l2.h	24	+ 'libv4l2.h',
25	limits.h	25	'limits.h',
26	link.h	26	'link.h',
27	#ifdef ANDROID	27	'linux/ioprio.h',
28	diff --git old-configure.in configure.in	28	diff --git old-configure.in configure.in
29	index 55e4cd1..76567b3 100644	29	index 55e4cd1..76567b3 100644
30	--- old-configure.in	30	--- old-configure.in
31	+++ old-configure.in	31	+++ old-configure.in
32	@@ -5309,6 +5309,9 @@ if test -n "$MOZ_WEBRTC"; then	32	@@ -2558,6 +2558,9 @@ if test -n "$MOZ_WEBRTC"; then
33	MOZ_VP8_ENCODER=1	33	if test -n "$MOZ_X11"; then
34	MOZ_VP8_ERROR_CONCEALMENT=1	34	MOZ_WEBRTC_X11_LIBS="-lXext -lXdamage -lXfixes -lXcomposite"
35		35	fi
		36	+
36	+ dnl with libv4l2 we can support more cameras	37	+ dnl with libv4l2 we can support more cameras
37	+ PKG_CHECK_MODULES(MOZ_LIBV4L2, libv4l2)	38	+ PKG_CHECK_MODULES(MOZ_LIBV4L2, libv4l2)
38	+	39	else
39	dnl enable once Signaling lands	40	MOZ_SYNTH_PICO=
40	MOZ_WEBRTC_SIGNALING=1	41	fi
41	AC_DEFINE(MOZ_WEBRTC_SIGNALING)
42	diff --git build/gyp.mozbuild build/gyp.mozbuild	42	diff --git build/gyp.mozbuild build/gyp.mozbuild
43	index b483cd1..f1dd1f0 100644	43	index b483cd1..f1dd1f0 100644
44	--- build/gyp.mozbuild	44	--- build/gyp.mozbuild

Lines 1-43 Link Here

(-)b/www/firefox/files/patch-bug847568 (-56 / +44 lines)
1	# Allow building against system-wide graphite2/harfbuzz.	1	# Allow building against system-wide graphite2/harfbuzz.
2		2
3	diff --git config/Makefile.in config/Makefile.in	3	diff --git config/system-headers.mozbuild config/system-headers.mozbuild
4	index e2e11dc0e27e..a6206bb0ff30 100644	4	index 7620b4d00623..09d3db5ca8c0 100644
5	--- config/Makefile.in	5	--- config/system-headers.mozbuild
6	+++ config/Makefile.in	6	+++ config/system-headers.mozbuild
7	@@ -41,6 +41,8 @@ export:: $(export-preqs)	7	@@ -1312,6 +1312,19 @@ if not CONFIG['MOZ_TREE_PIXMAN']:
8	$(PYTHON) -m mozbuild.action.preprocessor $(DEFINES) $(ACDEFINES) \	8	'pixman.h',
9	-DMOZ_TREE_CAIRO=$(MOZ_TREE_CAIRO) \	9	]
10	-DMOZ_TREE_PIXMAN=$(MOZ_TREE_PIXMAN) \	10
11	+ -DMOZ_SYSTEM_GRAPHITE2=$(MOZ_SYSTEM_GRAPHITE2) \	11	+if CONFIG['MOZ_SYSTEM_GRAPHITE2']:
12	+ -DMOZ_SYSTEM_HARFBUZZ=$(MOZ_SYSTEM_HARFBUZZ) \	12	+ system_headers += [
13	-DMOZ_SYSTEM_HUNSPELL=$(MOZ_SYSTEM_HUNSPELL) \	13	+ 'graphite2/Font.h',
14	-DMOZ_SYSTEM_BZ2=$(MOZ_SYSTEM_BZ2) \	14	+ 'graphite2/Segment.h',
15	-DMOZ_SYSTEM_ZLIB=$(MOZ_SYSTEM_ZLIB) \	15	+ ]
16	diff --git config/system-headers config/system-headers	16	+
17	index a0c53c651a3e..5ee7f71f9634 100644	17	+if CONFIG['MOZ_SYSTEM_HARFBUZZ']:
18	--- config/system-headers	18	+ system_headers += [
19	+++ config/system-headers	19	+ 'harfbuzz/hb-glib.h',
20	@@ -1269,6 +1269,15 @@ libsn/sn-launcher.h	20	+ 'harfbuzz/hb-ot.h',
21	libsn/sn-monitor.h	21	+ 'harfbuzz/hb.h',
22	libsn/sn-util.h	22	+ ]
23	#endif	23	+
24	+#if MOZ_SYSTEM_GRAPHITE2==1	24	if CONFIG['MOZ_SYSTEM_LIBVPX']:
25	+graphite2/Font.h	25	system_headers += [
26	+graphite2/Segment.h	26	'vpx_mem/vpx_mem.h',
27	+#endif
28	+#if MOZ_SYSTEM_HARFBUZZ==1
29	+harfbuzz/hb-glib.h
30	+harfbuzz/hb-ot.h
31	+harfbuzz/hb.h
32	+#endif
33	#if MOZ_SYSTEM_HUNSPELL==1
34	hunspell.hxx
35	#endif
36	diff --git dom/base/moz.build dom/base/moz.build	27	diff --git dom/base/moz.build dom/base/moz.build
37	index 8e19020315ae..2fcdbb6f7b42 100644	28	index 8e19020315ae..2fcdbb6f7b42 100644
38	--- dom/base/moz.build	29	--- dom/base/moz.build
39	+++ dom/base/moz.build	30	+++ dom/base/moz.build
40	@@ -464,6 +464,9 @@ if CONFIG['MOZ_BUILD_APP'] in ['browser', 'mobile/android', 'xulrunner']:	31	@@ -470,6 +470,9 @@ if CONFIG['MOZ_BUILD_APP'] in ['browser', 'mobile/android', 'xulrunner']:
41	if CONFIG['MOZ_X11']:	32	if CONFIG['MOZ_X11']:
42	CXXFLAGS += CONFIG['TK_CFLAGS']	33	CXXFLAGS += CONFIG['TK_CFLAGS']
43		34
Lines 120-126 diff --git gfx/skia/generate_mozbuild.py gfx/skia/generate_mozbuild.py Link Here
120	index e06ae3457a47..93faa61594a3 100755	111	index e06ae3457a47..93faa61594a3 100755
121	--- gfx/skia/generate_mozbuild.py	112	--- gfx/skia/generate_mozbuild.py
122	+++ gfx/skia/generate_mozbuild.py	113	+++ gfx/skia/generate_mozbuild.py
123	@@ -143,6 +143,9 @@ if CONFIG['CLANG_CXX'] or CONFIG['CLANG_CL']:	114	@@ -135,6 +135,9 @@ if CONFIG['CLANG_CXX'] or CONFIG['CLANG_CL']:
124	'-Wno-unused-private-field',	115	'-Wno-unused-private-field',
125	]	116	]
126		117
Lines 134-140 diff --git gfx/skia/moz.build gfx/skia/moz.build Link Here
134	index 2118677ca3a8..e4978b413784 100644	125	index 2118677ca3a8..e4978b413784 100644
135	--- gfx/skia/moz.build	126	--- gfx/skia/moz.build
136	+++ gfx/skia/moz.build	127	+++ gfx/skia/moz.build
137	@@ -753,6 +753,9 @@ if CONFIG['CLANG_CXX'] or CONFIG['CLANG_CL']:	128	@@ -780,6 +780,9 @@ if CONFIG['CLANG_CXX'] or CONFIG['CLANG_CL']:
138	'-Wno-unused-private-field',	129	'-Wno-unused-private-field',
139	]	130	]
140		131
Lines 148-154 diff --git gfx/thebes/moz.build gfx/thebes/moz.build Link Here
148	index 56f1b9fe3f4b..0ac1100b0df3 100644	139	index 56f1b9fe3f4b..0ac1100b0df3 100644
149	--- gfx/thebes/moz.build	140	--- gfx/thebes/moz.build
150	+++ gfx/thebes/moz.build	141	+++ gfx/thebes/moz.build
151	@@ -269,7 +269,13 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3'):	142	@@ -267,7 +267,13 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3'):
152		143
153	LOCAL_INCLUDES += CONFIG['SKIA_INCLUDES']	144	LOCAL_INCLUDES += CONFIG['SKIA_INCLUDES']
154		145
Lines 167-175 diff --git intl/unicharutil/util/moz.build intl/unicharutil/util/moz.build Link Here
167	index cb1233c56d7e..06fb1f9f174b 100644	158	index cb1233c56d7e..06fb1f9f174b 100644
168	--- intl/unicharutil/util/moz.build	159	--- intl/unicharutil/util/moz.build
169	+++ intl/unicharutil/util/moz.build	160	+++ intl/unicharutil/util/moz.build
170	@@ -29,4 +29,7 @@ if CONFIG['ENABLE_INTL_API']:	161	@@ -25,4 +25,7 @@ UNIFIED_SOURCES += [
171	'ICUUtils.cpp',	162	'nsUnicodeProperties.cpp',
172	]	163	]
173		164
174	+if CONFIG['MOZ_SYSTEM_HARFBUZZ']:	165	+if CONFIG['MOZ_SYSTEM_HARFBUZZ']:
175	+ CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS']	166	+ CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS']
Lines 179-202 diff --git netwerk/dns/moz.build netwerk/dns/moz.build Link Here
179	index 79c26e3e7001..c4d93bc5f7dc 100644	170	index 79c26e3e7001..c4d93bc5f7dc 100644
180	--- netwerk/dns/moz.build	171	--- netwerk/dns/moz.build
181	+++ netwerk/dns/moz.build	172	+++ netwerk/dns/moz.build
182	@@ -69,6 +69,9 @@ LOCAL_INCLUDES += [	173	@@ -73,3 +73,6 @@ USE_LIBS += ['icu']
183	'/netwerk/base',
184	]
185		174
		175	if CONFIG['GNU_CXX']:
		176	CXXFLAGS += ['-Wno-error=shadow']
		177	+
186	+if CONFIG['MOZ_SYSTEM_HARFBUZZ']:	178	+if CONFIG['MOZ_SYSTEM_HARFBUZZ']:
187	+ CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS']	179	+ CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS']
188	+
189	if CONFIG['ENABLE_INTL_API']:
190	DEFINES['IDNA2008'] = True
191	USE_LIBS += ['icu']
192	diff --git old-configure.in old-configure.in	180	diff --git old-configure.in old-configure.in
193	index 95a58b634593..b614eef85c89 100644	181	index 95a58b634593..b614eef85c89 100644
194	--- old-configure.in	182	--- old-configure.in
195	+++ old-configure.in	183	+++ old-configure.in
196	@@ -4888,6 +4888,27 @@ dnl ========================================================	184	@@ -4333,6 +4333,27 @@ dnl ========================================================
		185
197	AC_SUBST(MOZ_LINUX_32_SSE2_STARTUP_ERROR)	186	AC_SUBST(MOZ_LINUX_32_SSE2_STARTUP_ERROR)
198		187
199	dnl ========================================================	188	+dnl ========================================================
200	+dnl Check for graphite2	189	+dnl Check for graphite2
201	+dnl ========================================================	190	+dnl ========================================================
202	+if test -n "$MOZ_SYSTEM_GRAPHITE2"; then	191	+if test -n "$MOZ_SYSTEM_GRAPHITE2"; then
Lines 217-231 index 95a58b634593..b614eef85c89 100644 Link Here
217	+ CFLAGS=$_SAVE_CFLAGS	206	+ CFLAGS=$_SAVE_CFLAGS
218	+fi	207	+fi
219	+	208	+
220	+dnl ========================================================	209	dnl ========================================================
221	dnl Check for pixman and cairo	210	dnl Check for pixman and cairo
222	dnl ========================================================	211	dnl ========================================================
223
224	diff --git toolkit/library/moz.build toolkit/library/moz.build	212	diff --git toolkit/library/moz.build toolkit/library/moz.build
225	index 24f940e1ed7e..079a575adec3 100644	213	index 24f940e1ed7e..079a575adec3 100644
226	--- toolkit/library/moz.build	214	--- toolkit/library/moz.build
227	+++ toolkit/library/moz.build	215	+++ toolkit/library/moz.build
228	@@ -224,6 +224,12 @@ if CONFIG['MOZ_SYSTEM_JPEG']:	216	@@ -231,6 +231,12 @@ if CONFIG['MOZ_SYSTEM_JPEG']:
229	if CONFIG['MOZ_SYSTEM_PNG']:	217	if CONFIG['MOZ_SYSTEM_PNG']:
230	OS_LIBS += CONFIG['MOZ_PNG_LIBS']	218	OS_LIBS += CONFIG['MOZ_PNG_LIBS']
231		219
Lines 242-250 diff --git toolkit/moz.configure toolkit/moz.configure Link Here
242	index 9297e4d6f501..d8e273887e4b 100644	230	index 9297e4d6f501..d8e273887e4b 100644
243	--- toolkit/moz.configure	231	--- toolkit/moz.configure
244	+++ toolkit/moz.configure	232	+++ toolkit/moz.configure
245	@@ -356,6 +356,26 @@ add_old_configure_assignment('FT2_LIBS',	233	@@ -1065,6 +1065,26 @@ add_old_configure_assignment('FT2_LIBS',
246	add_old_configure_assignment('FT2_CFLAGS',	234	add_old_configure_assignment('FT2_CFLAGS',
247	delayed_getattr(ft2_info, 'cflags'))	235	ft2_info.cflags)
248		236
249	+# Graphite2	237	+# Graphite2
250	+# ==============================================================	238	+# ==============================================================
Lines 266-271 index 9297e4d6f501..d8e273887e4b 100644 Link Here
266	+	254	+
267	+set_config('MOZ_SYSTEM_HARFBUZZ', depends_if(system_harfbuzz)(lambda _: True))	255	+set_config('MOZ_SYSTEM_HARFBUZZ', depends_if(system_harfbuzz)(lambda _: True))
268	+	256	+
269	# Apple platform decoder support	257	# Mortar
270	# ==============================================================	258	# ==============================================================
271	@depends(toolkit)	259	option('--enable-mortar', help='Enable mortar extension')

Added Link Here

(-)b/www/firefox/files/patch-dom_media_flac_FlacDecoder.cpp (+25 lines)
1	Enable FLAC on platforms without ffvpx like powerpc*
2
3	diff --git dom/media/flac/FlacDecoder.cpp dom/media/flac/FlacDecoder.cpp
4	index 53fc3c9937f7..b23771ab80fa 100644
5	--- dom/media/flac/FlacDecoder.cpp
6	+++ dom/media/flac/FlacDecoder.cpp
7	@@ -7,6 +7,7 @@
8	#include "FlacDecoder.h"
9	#include "MediaContainerType.h"
10	#include "MediaPrefs.h"
11	+#include "PDMFactory.h"
12
13	namespace mozilla {
14
15	@@ -15,6 +16,10 @@ FlacDecoder::IsEnabled()
16	{
17	#ifdef MOZ_FFVPX
18	return MediaPrefs::FlacEnabled();
19	+#elif defined(MOZ_FFMPEG)
20	+ RefPtr<PDMFactory> platform = new PDMFactory();
21	+ return MediaPrefs::FlacEnabled() && platform->SupportsMimeType(NS_LITERAL_CSTRING("audio/flac"),
22	+ /* DecoderDoctorDiagnostics* */ nullptr);
23	#else
24	// Until bug 1295886 is fixed.
25	return false;

Added Link Here

(-)b/www/firefox/files/patch-toolkit_moz.configure (+15 lines)
1	diff --git toolkit/moz.configure toolkit/moz.configure
2	index 1befea00c485..7999b7acd5bd 100644
3	--- toolkit/moz.configure
4	+++ toolkit/moz.configure
5	@@ -842,8 +842,8 @@ def webrender(value, milestone):
6	enable_webrender = None
7
8	if value.origin == 'default':
9	- # if nothing is specified, default to just building on Nightly
10	- build_webrender = milestone.is_nightly
11	+ # build by default downstream
12	+ build_webrender = True
13	elif len(value) and value[0] == 'build':
14	# if explicitly set to 'build', then we build but don't enable
15	build_webrender = True

Lines 4-10 diff --git build/moz.configure/old.configure build/moz.configure/old.configure Link Here

(-)b/www/firefox/files/patch-z-bug517422 (-62 / +57 lines)
4	index d0fe7accffe6..c46bdd023225 100644	4	index d0fe7accffe6..c46bdd023225 100644
5	--- build/moz.configure/old.configure	5	--- build/moz.configure/old.configure
6	+++ build/moz.configure/old.configure	6	+++ build/moz.configure/old.configure
7	@@ -288,7 +288,12 @@ def old_configure_options(*options):	7	@@ -285,7 +285,12 @@ def old_configure_options(*options):
8	'--with-system-libvpx',	8	'--with-system-libvpx',
9	'--with-system-nspr',	9	'--with-system-nspr',
10	'--with-system-nss',	10	'--with-system-nss',
Lines 17-45 index d0fe7accffe6..c46bdd023225 100644 Link Here
17	'--with-system-zlib',	17	'--with-system-zlib',
18	'--with-thumb',	18	'--with-thumb',
19	'--with-thumb-interwork',	19	'--with-thumb-interwork',
20	diff --git config/Makefile.in config/Makefile.in
21	index a6206bb0ff30..f20987c61754 100644
22	--- config/Makefile.in
23	+++ config/Makefile.in
24	@@ -51,6 +51,11 @@ export:: $(export-preqs)
25	-DMOZ_SYSTEM_LIBEVENT=$(MOZ_SYSTEM_LIBEVENT) \
26	-DMOZ_SYSTEM_LIBVPX=$(MOZ_SYSTEM_LIBVPX) \
27	-DMOZ_SYSTEM_ICU=$(MOZ_SYSTEM_ICU) \
28	+ -DMOZ_SYSTEM_OGG=$(MOZ_SYSTEM_OGG) \
29	+ -DMOZ_SYSTEM_THEORA=$(MOZ_SYSTEM_THEORA) \
30	+ -DMOZ_SYSTEM_VORBIS=$(MOZ_SYSTEM_VORBIS) \
31	+ -DMOZ_SYSTEM_TREMOR=$(MOZ_SYSTEM_TREMOR) \
32	+ -DMOZ_SYSTEM_SOUNDTOUCH=$(MOZ_SYSTEM_SOUNDTOUCH) \
33	$(srcdir)/system-headers $(srcdir)/stl-headers \| $(PERL) $(topsrcdir)/nsprpub/config/make-system-wrappers.pl system_wrappers
34	$(INSTALL) system_wrappers $(DIST)
35
36	diff --git config/external/moz.build config/external/moz.build	20	diff --git config/external/moz.build config/external/moz.build
37	index 029ff8504795..2c3a40caa1ba 100644	21	index 029ff8504795..2c3a40caa1ba 100644
38	--- config/external/moz.build	22	--- config/external/moz.build
39	+++ config/external/moz.build	23	+++ config/external/moz.build
40	@@ -21,12 +21,21 @@ if CONFIG['MOZ_UPDATER']:	24	@@ -23,12 +23,21 @@ external_dirs += ['modules/woff2']
41	external_dirs += ['modules/brotli']	25
42	external_dirs += ['modules/woff2']	26	external_dirs += ['modules/xz-embedded']
43		27
44	-if CONFIG['MOZ_VORBIS']:	28	-if CONFIG['MOZ_VORBIS']:
45	+if not CONFIG['MOZ_SYSTEM_OGG']:	29	+if not CONFIG['MOZ_SYSTEM_OGG']:
Lines 61-67 index 029ff8504795..2c3a40caa1ba 100644 Link Here
61	if CONFIG['MOZ_WEBM_ENCODER']:	45	if CONFIG['MOZ_WEBM_ENCODER']:
62	external_dirs += ['media/libmkv']	46	external_dirs += ['media/libmkv']
63		47
64	@@ -52,12 +61,9 @@ external_dirs += [	48	@@ -51,12 +60,9 @@ external_dirs += [
65	'media/kiss_fft',	49	'media/kiss_fft',
66	'media/libcubeb',	50	'media/libcubeb',
67	'media/libnestegg',	51	'media/libnestegg',
Lines 74-106 index 029ff8504795..2c3a40caa1ba 100644 Link Here
74	'media/psshparser'	58	'media/psshparser'
75	]	59	]
76		60
77	diff --git config/system-headers config/system-headers	61	diff --git config/system-headers.mozbuild config/system-headers.mozbuild
78	index 5ee7f71f9634..13178ac3b3ab 100644	62	index 09d3db5ca8c0..c6533b84c470 100644
79	--- config/system-headers	63	--- config/system-headers.mozbuild
80	+++ config/system-headers	64	+++ config/system-headers.mozbuild
81	@@ -1348,3 +1348,17 @@ unicode/utypes.h	65	@@ -1325,6 +1325,28 @@ if CONFIG['MOZ_SYSTEM_HARFBUZZ']:
82	libutil.h	66	'harfbuzz/hb.h',
83	unwind.h	67	]
84	fenv.h	68
85	+#if MOZ_SYSTEM_OGG==1	69	+if CONFIG['MOZ_SYSTEM_OGG']:
86	+ogg/ogg.h	70	+ system_headers += [
87	+ogg/os_types.h	71	+ 'ogg/ogg.h',
88	+#endif	72	+ 'ogg/os_types.h',
89	+#if MOZ_SYSTEM_THEORA==1	73	+ ]
90	+theora/theoradec.h	74	+
91	+#endif	75	+if CONFIG['MOZ_SYSTEM_THEORA']:
92	+#if MOZ_SYSTEM_VORBIS==1	76	+ system_headers += [
93	+vorbis/codec.h	77	+ 'theora/theoradec.h',
94	+vorbis/vorbisenc.h	78	+ ]
95	+#endif	79	+
96	+#if MOZ_SYSTEM_TREMOR==1	80	+if CONFIG['MOZ_SYSTEM_VORBIS']:
97	+tremor/ivorbiscodec.h	81	+ system_headers += [
98	+#endif	82	+ 'vorbis/codec.h',
		83	+ 'vorbis/vorbisenc.h',
		84	+ ]
		85	+
		86	+if CONFIG['MOZ_SYSTEM_TREMOR']:
		87	+ system_headers += [
		88	+ 'tremor/ivorbiscodec.h',
		89	+ ]
		90	+
		91	if CONFIG['MOZ_SYSTEM_LIBVPX']:
		92	system_headers += [
		93	'vpx_mem/vpx_mem.h',
99	diff --git dom/media/AudioStream.cpp dom/media/AudioStream.cpp	94	diff --git dom/media/AudioStream.cpp dom/media/AudioStream.cpp
100	index 93ecda4319af..ff674c64ea07 100644	95	index 93ecda4319af..ff674c64ea07 100644
101	--- dom/media/AudioStream.cpp	96	--- dom/media/AudioStream.cpp
102	+++ dom/media/AudioStream.cpp	97	+++ dom/media/AudioStream.cpp
103	@@ -115,7 +115,9 @@ AudioStream::AudioStream(DataSource& aSource)	98	@@ -121,7 +121,9 @@ AudioStream::AudioStream(DataSource& aSource)
104	: mMonitor("AudioStream")	99	: mMonitor("AudioStream")
105	, mChannels(0)	100	, mChannels(0)
106	, mOutChannels(0)	101	, mOutChannels(0)
Lines 110-116 index 93ecda4319af..ff674c64ea07 100644 Link Here
110	, mDumpFile(nullptr)	105	, mDumpFile(nullptr)
111	, mState(INITIALIZED)	106	, mState(INITIALIZED)
112	, mDataSource(aSource)	107	, mDataSource(aSource)
113	@@ -135,9 +137,11 @@ AudioStream::~AudioStream()	108	@@ -142,9 +144,11 @@ AudioStream::~AudioStream()
114	if (mDumpFile) {	109	if (mDumpFile) {
115	fclose(mDumpFile);	110	fclose(mDumpFile);
116	}	111	}
Lines 122-128 index 93ecda4319af..ff674c64ea07 100644 Link Here
122	#if defined(XP_WIN)	117	#if defined(XP_WIN)
123	if (XRE_IsContentProcess()) {	118	if (XRE_IsContentProcess()) {
124	audio::AudioNotificationReceiver::Unregister(this);	119	audio::AudioNotificationReceiver::Unregister(this);
125	@@ -151,7 +155,11 @@ nsresult AudioStream::EnsureTimeStretcherInitializedUnlocked()	120	@@ -168,7 +172,11 @@ nsresult AudioStream::EnsureTimeStretcherInitializedUnlocked()
126	{	121	{
127	mMonitor.AssertCurrentThreadOwns();	122	mMonitor.AssertCurrentThreadOwns();
128	if (!mTimeStretcher) {	123	if (!mTimeStretcher) {
Lines 138-144 diff --git dom/media/AudioStream.h dom/media/AudioStream.h Link Here
138	index 7dc1f60f95cc..67d402a4117f 100644	133	index 7dc1f60f95cc..67d402a4117f 100644
139	--- dom/media/AudioStream.h	134	--- dom/media/AudioStream.h
140	+++ dom/media/AudioStream.h	135	+++ dom/media/AudioStream.h
141	@@ -16,7 +16,11 @@	136	@@ -15,7 +15,11 @@
142	#include "mozilla/TimeStamp.h"	137	#include "mozilla/TimeStamp.h"
143	#include "mozilla/UniquePtr.h"	138	#include "mozilla/UniquePtr.h"
144	#include "CubebUtils.h"	139	#include "CubebUtils.h"
Lines 148-156 index 7dc1f60f95cc..67d402a4117f 100644 Link Here
148	#include "soundtouch/SoundTouchFactory.h"	143	#include "soundtouch/SoundTouchFactory.h"
149	+#endif	144	+#endif
150		145
151	namespace mozilla {	146	#if defined(XP_WIN)
152		147	#include "mozilla/audio/AudioNotificationReceiver.h"
153	@@ -287,7 +291,11 @@ private:	148	@@ -297,7 +301,11 @@ private:
154	uint32_t mChannels;	149	uint32_t mChannels;
155	uint32_t mOutChannels;	150	uint32_t mOutChannels;
156	AudioClock mAudioClock;	151	AudioClock mAudioClock;
Lines 166-172 diff --git dom/media/moz.build dom/media/moz.build Link Here
166	index 86b051c58d33..fb6186dce78b 100644	161	index 86b051c58d33..fb6186dce78b 100644
167	--- dom/media/moz.build	162	--- dom/media/moz.build
168	+++ dom/media/moz.build	163	+++ dom/media/moz.build
169	@@ -308,6 +308,21 @@ if CONFIG['MOZ_WEBRTC']:	164	@@ -318,6 +318,21 @@ if CONFIG['MOZ_WEBRTC']:
170		165
171	DEFINES['MOZILLA_INTERNAL_API'] = True	166	DEFINES['MOZILLA_INTERNAL_API'] = True
172		167
Lines 185-193 index 86b051c58d33..fb6186dce78b 100644 Link Here
185	+if CONFIG['MOZ_SYSTEM_SOUNDTOUCH']:	180	+if CONFIG['MOZ_SYSTEM_SOUNDTOUCH']:
186	+ CXXFLAGS += CONFIG['MOZ_SOUNDTOUCH_CFLAGS']	181	+ CXXFLAGS += CONFIG['MOZ_SOUNDTOUCH_CFLAGS']
187	+	182	+
188	if CONFIG['OS_TARGET'] == 'WINNT':	183	if CONFIG['MOZ_ANDROID_HLS_SUPPORT']:
189	DEFINES['WEBRTC_WIN'] = True	184	DEFINES['MOZ_ANDROID_HLS_SUPPORT'] = True
190	else:	185
191	diff --git dom/media/platforms/ffmpeg/ffvpx/FFVPXRuntimeLinker.cpp dom/media/platforms/ffmpeg/ffvpx/FFVPXRuntimeLinker.cpp	186	diff --git dom/media/platforms/ffmpeg/ffvpx/FFVPXRuntimeLinker.cpp dom/media/platforms/ffmpeg/ffvpx/FFVPXRuntimeLinker.cpp
192	index 078f6ea5ef60..c600db067539 100644	187	index 078f6ea5ef60..c600db067539 100644
193	--- dom/media/platforms/ffmpeg/ffvpx/FFVPXRuntimeLinker.cpp	188	--- dom/media/platforms/ffmpeg/ffvpx/FFVPXRuntimeLinker.cpp
Lines 206-212 index 078f6ea5ef60..c600db067539 100644 Link Here
206		201
207	namespace mozilla {	202	namespace mozilla {
208		203
209	@@ -50,6 +54,12 @@ FFVPXRuntimeLinker::Init()	204	@@ -54,6 +58,12 @@ FFVPXRuntimeLinker::Init()
210		205
211	sLinkStatus = LinkStatus_FAILED;	206	sLinkStatus = LinkStatus_FAILED;
212		207
Lines 219-225 index 078f6ea5ef60..c600db067539 100644 Link Here
219	// We retrieve the path of the lgpllibs library as this is where mozavcodec	214	// We retrieve the path of the lgpllibs library as this is where mozavcodec
220	// and mozavutil libs are located.	215	// and mozavutil libs are located.
221	char* lgpllibsname = PR_GetLibraryName(nullptr, "lgpllibs");	216	char* lgpllibsname = PR_GetLibraryName(nullptr, "lgpllibs");
222	@@ -60,6 +70,7 @@ FFVPXRuntimeLinker::Init()	217	@@ -64,6 +74,7 @@ FFVPXRuntimeLinker::Init()
223	PR_GetLibraryFilePathname(lgpllibsname,	218	PR_GetLibraryFilePathname(lgpllibsname,
224	(PRFuncPtr)&soundtouch::SoundTouch::getVersionId);	219	(PRFuncPtr)&soundtouch::SoundTouch::getVersionId);
225	PR_FreeLibraryName(lgpllibsname);	220	PR_FreeLibraryName(lgpllibsname);
Lines 312-318 diff --git media/libvorbis/README_MOZILLA media/libvorbis/README_MOZILLA Link Here
312	index 1211ac074b33..eb31084aed25 100644	307	index 1211ac074b33..eb31084aed25 100644
313	--- media/libvorbis/README_MOZILLA	308	--- media/libvorbis/README_MOZILLA
314	+++ media/libvorbis/README_MOZILLA	309	+++ media/libvorbis/README_MOZILLA
315	@@ -8,3 +8,6 @@ https://svn.xiph.org/tags/vorbis/libvorbis-1.3.5@19464	310	@@ -8,3 +8,6 @@ from https://git.xiph.org/vorbis.git
316		311
317	Some files are renamed during the copy to prevent clashes with object	312	Some files are renamed during the copy to prevent clashes with object
318	file names with other Mozilla libraries.	313	file names with other Mozilla libraries.
Lines 334-342 diff --git old-configure.in old-configure.in Link Here
334	index b614eef85c89..85f9099dba4d 100644	329	index b614eef85c89..85f9099dba4d 100644
335	--- old-configure.in	330	--- old-configure.in
336	+++ old-configure.in	331	+++ old-configure.in
337	@@ -2941,6 +2941,111 @@ if test -n "$MOZ_OMX_PLUGIN"; then	332	@@ -2627,6 +2627,111 @@ if test -n "$MOZ_APPLEMEDIA"; then
338	fi
339	fi	333	fi
		334	fi # COMPILE_ENVIRONMENT
340		335
341	+dnl ========================================================	336	+dnl ========================================================
342	+dnl Check for libogg	337	+dnl Check for libogg
Lines 450-456 diff --git toolkit/library/moz.build toolkit/library/moz.build Link Here
450	index 079a575adec3..514d901195de 100644	445	index 079a575adec3..514d901195de 100644
451	--- toolkit/library/moz.build	446	--- toolkit/library/moz.build
452	+++ toolkit/library/moz.build	447	+++ toolkit/library/moz.build
453	@@ -237,6 +237,21 @@ if CONFIG['MOZ_SYSTEM_HARFBUZZ']:	448	@@ -240,6 +240,21 @@ if CONFIG['MOZ_SYSTEM_HARFBUZZ']:
454	if CONFIG['MOZ_SYSTEM_HUNSPELL']:	449	if CONFIG['MOZ_SYSTEM_HUNSPELL']:
455	OS_LIBS += CONFIG['MOZ_HUNSPELL_LIBS']	450	OS_LIBS += CONFIG['MOZ_HUNSPELL_LIBS']
456		451
Lines 476-482 diff --git xpcom/build/XPCOMInit.cpp xpcom/build/XPCOMInit.cpp Link Here
476	index c083ab4bc4f3..62b917043a2c 100644	471	index c083ab4bc4f3..62b917043a2c 100644
477	--- xpcom/build/XPCOMInit.cpp	472	--- xpcom/build/XPCOMInit.cpp
478	+++ xpcom/build/XPCOMInit.cpp	473	+++ xpcom/build/XPCOMInit.cpp
479	@@ -154,7 +154,9 @@ extern nsresult nsStringInputStreamConstructor(nsISupports, REFNSIID, void*);	474	@@ -132,7 +132,9 @@ extern nsresult nsStringInputStreamConstructor(nsISupports, REFNSIID, void*);
480		475
481	#include "mozilla/ipc/GeckoChildProcessHost.h"	476	#include "mozilla/ipc/GeckoChildProcessHost.h"
482		477
Lines 486-492 index c083ab4bc4f3..62b917043a2c 100644 Link Here
486	#if defined(MOZ_VPX) && !defined(MOZ_VPX_NO_MEM_REPORTING)	481	#if defined(MOZ_VPX) && !defined(MOZ_VPX_NO_MEM_REPORTING)
487	#if defined(HAVE_STDINT_H)	482	#if defined(HAVE_STDINT_H)
488	// mozilla-config.h defines HAVE_STDINT_H, and then it's defined again in	483	// mozilla-config.h defines HAVE_STDINT_H, and then it's defined again in
489	@@ -664,11 +666,13 @@ NS_InitXPCOM2(nsIServiceManager** aResult,	484	@@ -639,11 +641,13 @@ NS_InitXPCOM2(nsIServiceManager** aResult,
490	// this oddness.	485	// this oddness.
491	mozilla::SetICUMemoryFunctions();	486	mozilla::SetICUMemoryFunctions();
492		487