Attachment #189115 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




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

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.0b13
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 = 1514295516
SHA256 (xpi/firefox-i18n-58.0b13/ach.xpi) = 7c4e9a3d40bee39b8eda799cc4d517933549c80342a9a5fefe7b70aeffc89942
SIZE (xpi/firefox-i18n-58.0b13/ach.xpi) = 444872
SHA256 (xpi/firefox-i18n-58.0b13/af.xpi) = 86ae9d41737cbf687c01107fd4292f61704ce5427a18b60b5d2ca419fdd33075
SIZE (xpi/firefox-i18n-58.0b13/af.xpi) = 444574
SHA256 (xpi/firefox-i18n-58.0b13/an.xpi) = 2898aed292d63e62545c3a6f605133e150e3d571f4468f4b59010d489e03309c
SIZE (xpi/firefox-i18n-58.0b13/an.xpi) = 468931
SHA256 (xpi/firefox-i18n-58.0b13/ar.xpi) = 74bc2712d853b286f8d1e853c489884f77d6ea0560acb03e0278721aeef3ac4d
SIZE (xpi/firefox-i18n-58.0b13/ar.xpi) = 493719
SHA256 (xpi/firefox-i18n-58.0b13/as.xpi) = 1bef07d2815d4964016df69f78c6114ee5f62109cc11021147cb0161b06ca83b
SIZE (xpi/firefox-i18n-58.0b13/as.xpi) = 492795
SHA256 (xpi/firefox-i18n-58.0b13/ast.xpi) = 0a063ab8289be7c884e0dd0b737b11feb47f530129f9f38833ac2e5b5ce3c33a
SIZE (xpi/firefox-i18n-58.0b13/ast.xpi) = 461572
SHA256 (xpi/firefox-i18n-58.0b13/az.xpi) = 0bc61ede399303c28947ad21d41fe252450d23e7e3348608019b46d9b5bfd2c4
SIZE (xpi/firefox-i18n-58.0b13/az.xpi) = 468525
SHA256 (xpi/firefox-i18n-58.0b13/be.xpi) = c4d256984ef85b19a991ba78ba41fdba944e0f260194bfc892c4101aaf099577
SIZE (xpi/firefox-i18n-58.0b13/be.xpi) = 521175
SHA256 (xpi/firefox-i18n-58.0b13/bg.xpi) = eb97467b9b6097beafe6edd6ab2e0f86b7545ab623c149b489cd78b4a486638d
SIZE (xpi/firefox-i18n-58.0b13/bg.xpi) = 515702
SHA256 (xpi/firefox-i18n-58.0b13/bn-BD.xpi) = aaa80b64c3d43899b94356d20978b904b22386b59cd66de9708087a9996a369c
SIZE (xpi/firefox-i18n-58.0b13/bn-BD.xpi) = 528704
SHA256 (xpi/firefox-i18n-58.0b13/bn-IN.xpi) = 1b792d745b3b95fec955834cf70928f1386ccee515a231ddae2dc6aeeddd92bc
SIZE (xpi/firefox-i18n-58.0b13/bn-IN.xpi) = 518318
SHA256 (xpi/firefox-i18n-58.0b13/br.xpi) = 0dad734591736df7031e0f593214a6672f7af545ae3b921660306b5074d554d5
SIZE (xpi/firefox-i18n-58.0b13/br.xpi) = 457134
SHA256 (xpi/firefox-i18n-58.0b13/bs.xpi) = 279d93c7b5235635a33136ad782966e15e3b1c406d56a66bb8924e95b064efe8
SIZE (xpi/firefox-i18n-58.0b13/bs.xpi) = 461814
SHA256 (xpi/firefox-i18n-58.0b13/ca.xpi) = 8ea023d710160fc69a9e5a17f1dfad7e24a9b4282a4d0dc29c860118cb32a015
SIZE (xpi/firefox-i18n-58.0b13/ca.xpi) = 470157
SHA256 (xpi/firefox-i18n-58.0b13/cak.xpi) = bc6c92bb04d8f71453d554eb1d951dc9fb4fe4ffa0a80d338878fabc492f1959
SIZE (xpi/firefox-i18n-58.0b13/cak.xpi) = 481298
SHA256 (xpi/firefox-i18n-58.0b13/cs.xpi) = 91f04e97066e74b7366617f63ca701eb88fb0924f6921034c660761d54aeea20
SIZE (xpi/firefox-i18n-58.0b13/cs.xpi) = 478410
SHA256 (xpi/firefox-i18n-58.0b13/cy.xpi) = 25d446670c629bfa8616fb807cedad6aae9e7469b9b1b50e98e440af41788191
SIZE (xpi/firefox-i18n-58.0b13/cy.xpi) = 460986
SHA256 (xpi/firefox-i18n-58.0b13/da.xpi) = f6f5c69b689eb31b3daad2819ef15c4f2fbcd535833c24dccdd7c0a735385f86
SIZE (xpi/firefox-i18n-58.0b13/da.xpi) = 450529
SHA256 (xpi/firefox-i18n-58.0b13/de.xpi) = 171211e4597b72b98c1aea340f325343238f8d62b4ad1c8106032263b3040496
SIZE (xpi/firefox-i18n-58.0b13/de.xpi) = 464694
SHA256 (xpi/firefox-i18n-58.0b13/dsb.xpi) = 4a1462ac6012065f8f3c3c9afed0347260cd10153f2b5d6213a21dab26115293
SIZE (xpi/firefox-i18n-58.0b13/dsb.xpi) = 485516
SHA256 (xpi/firefox-i18n-58.0b13/el.xpi) = 0d9f19a18803ca98dc7830a1bebcbef2f5cc3ae5e3c8bcf151860aae65e26c6f
SIZE (xpi/firefox-i18n-58.0b13/el.xpi) = 538370
SHA256 (xpi/firefox-i18n-58.0b13/en-GB.xpi) = f2150a70b821542759993b04a50299a0665d6a85dc33074d2e4d4ccc0c2d846e
SIZE (xpi/firefox-i18n-58.0b13/en-GB.xpi) = 439092
SHA256 (xpi/firefox-i18n-58.0b13/en-US.xpi) = 6744a00143f93992fd9ddbbcaed7e58bc2bab3f42709ba61480fd1f1cd98f9b1
SIZE (xpi/firefox-i18n-58.0b13/en-US.xpi) = 440002
SHA256 (xpi/firefox-i18n-58.0b13/en-ZA.xpi) = 21ff6c58a514b0b05b137196096f2711105f4b15c27a9dbadeff6ad111e14747
SIZE (xpi/firefox-i18n-58.0b13/en-ZA.xpi) = 434818
SHA256 (xpi/firefox-i18n-58.0b13/eo.xpi) = 6cdfa7224b1afc9bef0d2d53defe0ef36d420d5af62a406e1402076063f5b507
SIZE (xpi/firefox-i18n-58.0b13/eo.xpi) = 457975
SHA256 (xpi/firefox-i18n-58.0b13/es-AR.xpi) = 8b9085ed8faa5a2372ff62c9e603ac5ccea8402a0b7e7446eb848c6ad30c562a
SIZE (xpi/firefox-i18n-58.0b13/es-AR.xpi) = 467897
SHA256 (xpi/firefox-i18n-58.0b13/es-CL.xpi) = d93e4de1557e6bb4ddf7cbf8c9ad5c2903765b685b9557c1a8014d8f09392dd9
SIZE (xpi/firefox-i18n-58.0b13/es-CL.xpi) = 472661
SHA256 (xpi/firefox-i18n-58.0b13/es-ES.xpi) = b8e0618b9a254cffe60286f1e8356c9fd6a870f4b2674adc07745b7f21ef0a25
SIZE (xpi/firefox-i18n-58.0b13/es-ES.xpi) = 356827
SHA256 (xpi/firefox-i18n-58.0b13/es-MX.xpi) = 2f1f789d271d9ed30b4b3ab3dbeebd36fb44fd32187a83502fa7f6a1405a1bf8
SIZE (xpi/firefox-i18n-58.0b13/es-MX.xpi) = 472343
SHA256 (xpi/firefox-i18n-58.0b13/et.xpi) = 2421e32ae104cac3ed233664aa23faa5ba9fd5233bd2d92af2fbffe1ddf2d453
SIZE (xpi/firefox-i18n-58.0b13/et.xpi) = 450450
SHA256 (xpi/firefox-i18n-58.0b13/eu.xpi) = 57ce2af5d8579ce2d634e2ed9da6613f1c3838ac9f2ea25c8368a23fa22891ec
SIZE (xpi/firefox-i18n-58.0b13/eu.xpi) = 459750
SHA256 (xpi/firefox-i18n-58.0b13/fa.xpi) = d4d40d6aef3d887d910a00a7d28cb0272f525f64e7b5948ba07f24c4adda8139
SIZE (xpi/firefox-i18n-58.0b13/fa.xpi) = 516038
SHA256 (xpi/firefox-i18n-58.0b13/ff.xpi) = a29b465b7c16677465e0e65ceee94de250da5b65c69e859e1ac52e2fb59cb7b0
SIZE (xpi/firefox-i18n-58.0b13/ff.xpi) = 461467
SHA256 (xpi/firefox-i18n-58.0b13/fi.xpi) = f2be988378d19ebafe9b85299b65108c39071e01c783e289404de6619c05edaa
SIZE (xpi/firefox-i18n-58.0b13/fi.xpi) = 451161
SHA256 (xpi/firefox-i18n-58.0b13/fr.xpi) = 60aba5e10d02a1cb422f99cdcf83330badded0e9ca6bf24bb865dbbda590c854
SIZE (xpi/firefox-i18n-58.0b13/fr.xpi) = 477980
SHA256 (xpi/firefox-i18n-58.0b13/fy-NL.xpi) = b6744ac3792b7b8ac58f1da3d2a4ce3cd41822ab64d8ab77033dd5a6a40c5c76
SIZE (xpi/firefox-i18n-58.0b13/fy-NL.xpi) = 469750
SHA256 (xpi/firefox-i18n-58.0b13/ga-IE.xpi) = b51fe762d88c14a7f43a5604e38be6ebba948bf8a16abda66c81b3742d6a844a
SIZE (xpi/firefox-i18n-58.0b13/ga-IE.xpi) = 479265
SHA256 (xpi/firefox-i18n-58.0b13/gd.xpi) = f01213cff3a196272976ba25c55c5d3b90223d48112879f46318c277d58e27a4
SIZE (xpi/firefox-i18n-58.0b13/gd.xpi) = 466996
SHA256 (xpi/firefox-i18n-58.0b13/gl.xpi) = 96792d343d328d2586b9ba02362ee7c72b4b7683b7396915e38973b1f73a9a79
SIZE (xpi/firefox-i18n-58.0b13/gl.xpi) = 454324
SHA256 (xpi/firefox-i18n-58.0b13/gn.xpi) = 56bb603067c7bd1ffc53682c64bcd1c0337b6318e7b912357d9f8b792ff9a4bf
SIZE (xpi/firefox-i18n-58.0b13/gn.xpi) = 475399
SHA256 (xpi/firefox-i18n-58.0b13/gu-IN.xpi) = 19341da7dc0dca198c490a05b6c1f6d98f056edcbb44514158a6ef00044c307b
SIZE (xpi/firefox-i18n-58.0b13/gu-IN.xpi) = 520668
SHA256 (xpi/firefox-i18n-58.0b13/he.xpi) = 0b9840f4942adaa0bf1810d0b9dd7aae58a4156ab212a02bd4edacbd872861bf
SIZE (xpi/firefox-i18n-58.0b13/he.xpi) = 478364
SHA256 (xpi/firefox-i18n-58.0b13/hi-IN.xpi) = 64677c3006ebca31ff5e0bd49b5238845328cd15b910831d4fe9e02695311036
SIZE (xpi/firefox-i18n-58.0b13/hi-IN.xpi) = 528342
SHA256 (xpi/firefox-i18n-58.0b13/hr.xpi) = 09d74738a2155f8de2005755a19cf46813ba2d911742a62436721ea05c09cd3b
SIZE (xpi/firefox-i18n-58.0b13/hr.xpi) = 466023
SHA256 (xpi/firefox-i18n-58.0b13/hsb.xpi) = 39a8020737bdc8494dfdf072bd2399b66d741d67bbb084e817c4aa11b994d441
SIZE (xpi/firefox-i18n-58.0b13/hsb.xpi) = 482468
SHA256 (xpi/firefox-i18n-58.0b13/hu.xpi) = 7bca44e0df6a3d0dd547f66f106473b4a9cc2139ccee5556272daae8feff0e51
SIZE (xpi/firefox-i18n-58.0b13/hu.xpi) = 481473
SHA256 (xpi/firefox-i18n-58.0b13/hy-AM.xpi) = 9aae408ac8e0eb101e8a1186837a4bd41c3821834bb2f0ac4bc00f6a39a0dfbf
SIZE (xpi/firefox-i18n-58.0b13/hy-AM.xpi) = 515028
SHA256 (xpi/firefox-i18n-58.0b13/id.xpi) = cdcc74b70e358db9a1e0bd09798aa1ecfef0bb1820cd939a856bebe9f3e50afc
SIZE (xpi/firefox-i18n-58.0b13/id.xpi) = 447287
SHA256 (xpi/firefox-i18n-58.0b13/is.xpi) = 6f84b805852b8d5f1cae3e9861ae91ae3a93656a1e48e03f0b5db3ad7c00fccd
SIZE (xpi/firefox-i18n-58.0b13/is.xpi) = 458899
SHA256 (xpi/firefox-i18n-58.0b13/it.xpi) = ea625ef8773b24fea2e14c817e205e745e5ecbedffcf491e1a3b7136a1ecc1ae
SIZE (xpi/firefox-i18n-58.0b13/it.xpi) = 349758
SHA256 (xpi/firefox-i18n-58.0b13/ja.xpi) = 976fdefc7012feddee7a936f251a5be8989edd1666df37ee9686d0bc96c6a195
SIZE (xpi/firefox-i18n-58.0b13/ja.xpi) = 512766
SHA256 (xpi/firefox-i18n-58.0b13/ka.xpi) = 6a9a17b081735ab036e6e00834c3a406a49ac72e000e491f2deec00195b805b7
SIZE (xpi/firefox-i18n-58.0b13/ka.xpi) = 499586
SHA256 (xpi/firefox-i18n-58.0b13/kab.xpi) = b402369ff353faba1a848efaf5f162fab7825753717ba7549d888d2e9ee5fada
SIZE (xpi/firefox-i18n-58.0b13/kab.xpi) = 468028
SHA256 (xpi/firefox-i18n-58.0b13/kk.xpi) = 13372992ea9fa201de1df2cd8bb72c79dbcaa5f7a7d79d43417a7804aa66ba95
SIZE (xpi/firefox-i18n-58.0b13/kk.xpi) = 523596
SHA256 (xpi/firefox-i18n-58.0b13/km.xpi) = 9686b573aff4df80cb630d80112f2e478a569d9a9e873f97a79c5287ddfb8228
SIZE (xpi/firefox-i18n-58.0b13/km.xpi) = 532324
SHA256 (xpi/firefox-i18n-58.0b13/kn.xpi) = 1047b89ee28e2cc60a3b62686e745d9235efb1b77d0815f65ce9a0b40f9f06d2
SIZE (xpi/firefox-i18n-58.0b13/kn.xpi) = 535940
SHA256 (xpi/firefox-i18n-58.0b13/ko.xpi) = 98ff8d7e454cca00c35ee33864803f9e6788ef24207b23743ab3c89179583f14
SIZE (xpi/firefox-i18n-58.0b13/ko.xpi) = 492312
SHA256 (xpi/firefox-i18n-58.0b13/lij.xpi) = 4d35c9c5eed73a23a21b0acc3fc9d56cb438d86eb1f611ca145aca0904a5171f
SIZE (xpi/firefox-i18n-58.0b13/lij.xpi) = 455541
SHA256 (xpi/firefox-i18n-58.0b13/lt.xpi) = 228f05ff56651f5467b35f4a2f1afb3a4a51ec8b7d1eac0a7fef4b68ffc22112
SIZE (xpi/firefox-i18n-58.0b13/lt.xpi) = 477092
SHA256 (xpi/firefox-i18n-58.0b13/lv.xpi) = c7fa9ef97d49b0ddbb61cf3786135cdfdababca9dad68eab4e71fa61801a7294
SIZE (xpi/firefox-i18n-58.0b13/lv.xpi) = 468514
SHA256 (xpi/firefox-i18n-58.0b13/mai.xpi) = ae9f9390adb8ea8e9df3a9e805ba5149e65db7ac44ea3a955dde3a2fbab341ec
SIZE (xpi/firefox-i18n-58.0b13/mai.xpi) = 509069
SHA256 (xpi/firefox-i18n-58.0b13/mk.xpi) = b10ae273eea89b520a1f96b60279707bf5ca41f1607a8dd0bf23f76db50a8067
SIZE (xpi/firefox-i18n-58.0b13/mk.xpi) = 492513
SHA256 (xpi/firefox-i18n-58.0b13/ml.xpi) = c40dcbb10a4a118d4fd2c67032fd5cb178e14e6cae3ed40e24c6b022bb6a71e0
SIZE (xpi/firefox-i18n-58.0b13/ml.xpi) = 546665
SHA256 (xpi/firefox-i18n-58.0b13/mr.xpi) = 8848fa0390743021a7373e1ff9b82d687b78e0ae6c65d6737f2e38c5a2923dfd
SIZE (xpi/firefox-i18n-58.0b13/mr.xpi) = 523118
SHA256 (xpi/firefox-i18n-58.0b13/ms.xpi) = a4936b6c21f1c61aa2ccfdc6e791cc642e9a271af14207a83beb8cf473639b5c
SIZE (xpi/firefox-i18n-58.0b13/ms.xpi) = 457059
SHA256 (xpi/firefox-i18n-58.0b13/my.xpi) = d8a309b641915532ce098cee4181d893c747ea58b73171a1967bf77cb3d6add7
SIZE (xpi/firefox-i18n-58.0b13/my.xpi) = 520422
SHA256 (xpi/firefox-i18n-58.0b13/nb-NO.xpi) = f513a8df5805b1e1aa53c401253a61ecb183163e19b4cd88559c37505fcf5894
SIZE (xpi/firefox-i18n-58.0b13/nb-NO.xpi) = 456804
SHA256 (xpi/firefox-i18n-58.0b13/ne-NP.xpi) = eaebd2f5e64d5db13000889b84bda88a55b1f9ceee401245281c5db0f95c1366
SIZE (xpi/firefox-i18n-58.0b13/ne-NP.xpi) = 517046
SHA256 (xpi/firefox-i18n-58.0b13/nl.xpi) = dde64ca31ac34885f1d6b3d69395c58e09ff2112cb8b095a64f0ec3b163420f3
SIZE (xpi/firefox-i18n-58.0b13/nl.xpi) = 464338
SHA256 (xpi/firefox-i18n-58.0b13/nn-NO.xpi) = c2230bfe5a237f4af252aacb8b20cdf9db9edb15d814c7ea2f8d59091daf6035
SIZE (xpi/firefox-i18n-58.0b13/nn-NO.xpi) = 456705
SHA256 (xpi/firefox-i18n-58.0b13/or.xpi) = 286fec32531641fa74d46c2760366c4e304414504c9c910ae283afb46b8d7534
SIZE (xpi/firefox-i18n-58.0b13/or.xpi) = 502587
SHA256 (xpi/firefox-i18n-58.0b13/pa-IN.xpi) = 5d65b650780b06c0e8664352553238302f9fe9b06665f1187a6c2471f758fc03
SIZE (xpi/firefox-i18n-58.0b13/pa-IN.xpi) = 497515
SHA256 (xpi/firefox-i18n-58.0b13/pl.xpi) = e7a3635174f883d06b2f190b79e7b193129644074a7a680d6a3a56a4550981d2
SIZE (xpi/firefox-i18n-58.0b13/pl.xpi) = 365324
SHA256 (xpi/firefox-i18n-58.0b13/pt-BR.xpi) = dab2334b3f6575c0b37f06516e6db66f1c2aa465cfd7ecbfb0da9b396c816839
SIZE (xpi/firefox-i18n-58.0b13/pt-BR.xpi) = 462440
SHA256 (xpi/firefox-i18n-58.0b13/pt-PT.xpi) = ab3467b22a49514e842a490d34c025c027c11172b9237c2317719a21e357dfbf
SIZE (xpi/firefox-i18n-58.0b13/pt-PT.xpi) = 465749
SHA256 (xpi/firefox-i18n-58.0b13/rm.xpi) = 3a8103585e0bd761c38bd2b43bd502adaa6b19d7572d174082f837e953662971
SIZE (xpi/firefox-i18n-58.0b13/rm.xpi) = 458240
SHA256 (xpi/firefox-i18n-58.0b13/ro.xpi) = 22cd64cf9c60852e0cee86d21f66fb822802f708ebc1f3b4fe9335d2ad5c5984
SIZE (xpi/firefox-i18n-58.0b13/ro.xpi) = 458746
SHA256 (xpi/firefox-i18n-58.0b13/ru.xpi) = c5a5441236e75ec309f194dc6b7f7040c169a4b3734d74031bbee946a374b290
SIZE (xpi/firefox-i18n-58.0b13/ru.xpi) = 531422
SHA256 (xpi/firefox-i18n-58.0b13/si.xpi) = 309466ca6bd299bbbeab6dfcde85d25e5144566f88c170b286cc4735848ccbc6
SIZE (xpi/firefox-i18n-58.0b13/si.xpi) = 500389
SHA256 (xpi/firefox-i18n-58.0b13/sk.xpi) = eb7e0c9b45ae881622a98e3f274539d81cb54c4b30a099fa9d9b3ad1bc268b05
SIZE (xpi/firefox-i18n-58.0b13/sk.xpi) = 484544
SHA256 (xpi/firefox-i18n-58.0b13/sl.xpi) = fa1d496847410a8ea46135de624607e54c87c4ba9fe3c2cdc90bf0da9ecc5664
SIZE (xpi/firefox-i18n-58.0b13/sl.xpi) = 461910
SHA256 (xpi/firefox-i18n-58.0b13/son.xpi) = 0b6275f2fca13c105f7857c74a1b67745a4ce0eba648ce30b4aaf86a4b2183da
SIZE (xpi/firefox-i18n-58.0b13/son.xpi) = 453958
SHA256 (xpi/firefox-i18n-58.0b13/sq.xpi) = 2ee16e07de9525dc40581773a53bb7f5cf1fa22daebac9ba1c023a3f5f2bf2ae
SIZE (xpi/firefox-i18n-58.0b13/sq.xpi) = 471954
SHA256 (xpi/firefox-i18n-58.0b13/sr.xpi) = 868f17bf905ffc172bd141f0103c1830be667cf2e08a7e9d66c74965481ff2f1
SIZE (xpi/firefox-i18n-58.0b13/sr.xpi) = 492195
SHA256 (xpi/firefox-i18n-58.0b13/sv-SE.xpi) = 0064764f26ea544f929effeb0d2dbad75f2b6f3bd01f54d669fc6a07fa85e066
SIZE (xpi/firefox-i18n-58.0b13/sv-SE.xpi) = 465202
SHA256 (xpi/firefox-i18n-58.0b13/ta.xpi) = f808615955af018e0bf823b6711e24c9ee5de2620438cb547cdb07b4ebb81004
SIZE (xpi/firefox-i18n-58.0b13/ta.xpi) = 518560
SHA256 (xpi/firefox-i18n-58.0b13/te.xpi) = 47310b16e3b82e9d2c11a922b54c16cfe27c6973bdfcefb4854156bc57fb87f4
SIZE (xpi/firefox-i18n-58.0b13/te.xpi) = 535197
SHA256 (xpi/firefox-i18n-58.0b13/th.xpi) = fe9238eba87ac1afae437f4768aa2b477b5e55bee19a96ea6b214b40cc801288
SIZE (xpi/firefox-i18n-58.0b13/th.xpi) = 505465
SHA256 (xpi/firefox-i18n-58.0b13/tr.xpi) = a1bc981e5ccf0b340994e40716c5587852946c3ad73608fd9bfbbd2c8162b960
SIZE (xpi/firefox-i18n-58.0b13/tr.xpi) = 470489
SHA256 (xpi/firefox-i18n-58.0b13/uk.xpi) = 146dc401a55e88dbce63eb43e2107921c915af53b7882e27f6f31a430dc14cf0
SIZE (xpi/firefox-i18n-58.0b13/uk.xpi) = 522142
SHA256 (xpi/firefox-i18n-58.0b13/ur.xpi) = 57078f2f19193a74231175b4c215cc9b046be783317eee858c58ccba468e4fb1
SIZE (xpi/firefox-i18n-58.0b13/ur.xpi) = 514449
SHA256 (xpi/firefox-i18n-58.0b13/uz.xpi) = 2b6cf0ae2087227427bb0b2c7a2a0d736d6b64f236e88dc08c94185a1ba015c9
SIZE (xpi/firefox-i18n-58.0b13/uz.xpi) = 464526
SHA256 (xpi/firefox-i18n-58.0b13/vi.xpi) = 3902ebd3b9ed3eb735328e022969bc78cb4e113dd1bfe85509a696f2d59c6589
SIZE (xpi/firefox-i18n-58.0b13/vi.xpi) = 475105
SHA256 (xpi/firefox-i18n-58.0b13/xh.xpi) = b8efa4b6bf7f603878a0333178a02f0d105a45104d3ca0246f931c8f8fa5f538
SIZE (xpi/firefox-i18n-58.0b13/xh.xpi) = 467386
SHA256 (xpi/firefox-i18n-58.0b13/zh-CN.xpi) = 0edc0f71bd033047c74ddb705bbd5e9baf5923e85dcc95d56cbad2d3f3586d54
SIZE (xpi/firefox-i18n-58.0b13/zh-CN.xpi) = 489516
SHA256 (xpi/firefox-i18n-58.0b13/zh-TW.xpi) = 7b5474ad82a5b9e3c7b1c8986f55cf17bc59a5ff4e0c587dbf74bcf8131e985a
SIZE (xpi/firefox-i18n-58.0b13/zh-TW.xpi) = 487147




# $FreeBSD$

PORTNAME=	firefox
DISTVERSION=	58.0b13
PORTREVISION=	1
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.1:security/nss \
		icu>=59.1,1:devel/icu \
		libevent>=2.1.8:devel/libevent \
		harfbuzz>=1.7.2: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 = 1512592860	1	TIMESTAMP = 1514295516
2	SHA256 (firefox-57.0.2.source.tar.xz) = cad021a13daf8fd2c951fab763e784c82aabef45e68a34c941fb64d62f1a5707	2	SHA256 (firefox-58.0b13.source.tar.xz) = 4e91c0f574d7b205f5e7c09f069a7c57384e7a7d92428217fb9b1c6cc56e42aa
3	SIZE (firefox-57.0.2.source.tar.xz) = 248772480	3	SIZE (firefox-58.0b13.source.tar.xz) = 249197352




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
+# ==============================================================

+option('--with-system-harfbuzz',
+       help="Use system harfbuzz (located with pkgconfig)")
+
+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))
+
 # 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 109-122 USE_XORG+= xcb Link Here

(-)b/Mk/bsd.gecko.mk (-2 / +4 lines)
109	MESA_LLVM_VER?= 50	109	MESA_LLVM_VER?= 50
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	.if ${MOZILLA_VER:R:R} < 58
112	MOZ_EXPORT+= BINDGEN_CFLAGS="${BINDGEN_CFLAGS}"	113	MOZ_EXPORT+= BINDGEN_CFLAGS="${BINDGEN_CFLAGS}"
113	# XXX bug 1341234
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 389-395 post-patch-SNDIO-on: Link Here
389	.endif	391	.endif
390		392
391	.if ${PORT_OPTIONS:MRUST} \|\| ${MOZILLA_VER:R:R} >= 54	393	.if ${PORT_OPTIONS:MRUST} \|\| ${MOZILLA_VER:R:R} >= 54
392	BUILD_DEPENDS+= ${RUST_PORT:T}>=1.19.0_2:${RUST_PORT}	394	BUILD_DEPENDS+= ${RUST_PORT:T}>=1.21.0:${RUST_PORT}
393	RUST_PORT?= lang/rust	395	RUST_PORT?= lang/rust
394	. if ${MOZILLA_VER:R:R} < 54	396	. if ${MOZILLA_VER:R:R} < 54
395	MOZ_OPTIONS+= --enable-rust	397	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.2	5	PORTVERSION= 58.0b13
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/build2/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 (-6 / +5 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= firefox	4	PORTNAME= firefox
5	DISTVERSION= 57.0.2	5	DISTVERSION= 58.0b13
6	PORTREVISION= 1
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/build2/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.1: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.7.2: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 (-57 / +45 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 261-271 index 9297e4d6f501..d8e273887e4b 100644 Link Here
261	+option('--with-system-harfbuzz',	249	+option('--with-system-harfbuzz',
262	+ help="Use system harfbuzz (located with pkgconfig)")	250	+ help="Use system harfbuzz (located with pkgconfig)")
263	+	251	+
264	+system_harfbuzz = pkg_check_modules('MOZ_HARFBUZZ', 'harfbuzz >= 1.5.1',	252	+system_harfbuzz = pkg_check_modules('MOZ_HARFBUZZ', 'harfbuzz >= 1.7.2',
265	+ when='--with-system-harfbuzz')	253	+ when='--with-system-harfbuzz')
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