Attachment #183933 for bug #219963




.elif ${gecko_ARGS:Mfirefox}

_GECKO_DEFAULT_VERSION=	52
_GECKO_VERSIONS=		52 55
_GECKO_TYPE=	firefox

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

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

Lines 2-8 Link Here

(-)b/www/firefox-i18n/Makefile (-2 / +2 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= firefox-i18n	4	PORTNAME= firefox-i18n
5	PORTVERSION= 54.0.1	5	PORTVERSION= 55.0b6
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/build1/linux-i686/xpi	8	MOZILLA/${PORTNAME:S\|-i18n\|\|}/candidates/${DISTVERSION}-candidates/build1/linux-i686/xpi
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,54,build	18	USES= zip:infozip gecko:firefox,55,build
19	USE_XPI= firefox	19	USE_XPI= firefox
20		20
21	NO_ARCH= yes	21	NO_ARCH= yes

Lines 1-7 Link Here

(-)b/www/firefox-i18n/Makefile.lang (-1 / +4 lines)
1	# Created by: Koji Yokota <yokota@res.otaru-uc.ac.jp>	1	# Created by: Koji Yokota <yokota@res.otaru-uc.ac.jp>
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	FIREFOX_I18N_ALL_= ach af an ar as ast az bg bn-BD bn-IN br bs ca cak \	4	FIREFOX_I18N_ALL_= ach af an ar as ast az be bg bn-BD bn-IN br bs ca cak \
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 \
Lines 33-38 FIREFOX_I18N+= ast Link Here
33	.if ${PORT_OPTIONS:MLANG_AZ}	33	.if ${PORT_OPTIONS:MLANG_AZ}
34	FIREFOX_I18N+= az	34	FIREFOX_I18N+= az
35	.endif	35	.endif
		36	.if ${PORT_OPTIONS:MLANG_BE}
		37	FIREFOX_I18N+= be
		38	.endif
36	.if ${PORT_OPTIONS:MLANG_BG}	39	.if ${PORT_OPTIONS:MLANG_BG}
37	FIREFOX_I18N+= bg	40	FIREFOX_I18N+= bg
38	.endif	41	.endif

Lines 9-14 OPTIONS_DEFINE= LANG_ACH \ Link Here

(-)b/www/firefox-i18n/Makefile.option (+1 lines)
9	LANG_AS \	9	LANG_AS \
10	LANG_AST \	10	LANG_AST \
11	LANG_AZ \	11	LANG_AZ \
		12	LANG_BE \
12	LANG_BG \	13	LANG_BG \
13	LANG_BB \	14	LANG_BB \
14	LANG_BN \	15	LANG_BN \




TIMESTAMP = 1498779690
SHA256 (xpi/firefox-i18n-55.0b6/ach.xpi) = d9e3383b8e2f45491f3b429c51810f7b89961d1c73d8c7f5522e87e273b28b36
SIZE (xpi/firefox-i18n-55.0b6/ach.xpi) = 447506
SHA256 (xpi/firefox-i18n-55.0b6/af.xpi) = 9cee3e9c6fe77c2449018f1c2ff210b9308ad6b02d4acf5a4afc15869bd70070
SIZE (xpi/firefox-i18n-55.0b6/af.xpi) = 448927
SHA256 (xpi/firefox-i18n-55.0b6/an.xpi) = 743aa0d3b4900b0d3fbf9424811079bba083113e7fa5c3069da8d929d1112248
SIZE (xpi/firefox-i18n-55.0b6/an.xpi) = 468639
SHA256 (xpi/firefox-i18n-55.0b6/ar.xpi) = dc0b2970d1a78716ff5ebcea7c657c0392cf9c97a9d17ad844f85758772477d5
SIZE (xpi/firefox-i18n-55.0b6/ar.xpi) = 492757
SHA256 (xpi/firefox-i18n-55.0b6/as.xpi) = 9ae1c0a2681a42412b1939e3ae78bc49fd00c45be07ae94fce1fd5e5c6fbf8c4
SIZE (xpi/firefox-i18n-55.0b6/as.xpi) = 501510
SHA256 (xpi/firefox-i18n-55.0b6/ast.xpi) = 7b81e42d5cd8924aa6633da2d6c1090a2975794907dc23254d7a94364e2312b1
SIZE (xpi/firefox-i18n-55.0b6/ast.xpi) = 460843
SHA256 (xpi/firefox-i18n-55.0b6/az.xpi) = 196bfd443e2ed7b16d507abce0a6b3fb2969d1ce0c0c479b1a51332af2b36011
SIZE (xpi/firefox-i18n-55.0b6/az.xpi) = 475369
SHA256 (xpi/firefox-i18n-55.0b6/be.xpi) = 3bf65a2e19618cd53085a9530619d10f8df44cd94ba87ca230f97aa3c8fd9ccd
SIZE (xpi/firefox-i18n-55.0b6/be.xpi) = 522577
SHA256 (xpi/firefox-i18n-55.0b6/bg.xpi) = f0c33195d12d746b8c49d82a3fae540ea8ae65af4994662d80f9bb13ce5b8d39
SIZE (xpi/firefox-i18n-55.0b6/bg.xpi) = 520013
SHA256 (xpi/firefox-i18n-55.0b6/bn-BD.xpi) = cda2110c2c745d734f4c854ea36384fd48543f8d87a8befe628e65dde0e62937
SIZE (xpi/firefox-i18n-55.0b6/bn-BD.xpi) = 535155
SHA256 (xpi/firefox-i18n-55.0b6/bn-IN.xpi) = 9da03fc9aef3722c6be39c16f486a7f8d65bdc5e64df4839689659c3305ce372
SIZE (xpi/firefox-i18n-55.0b6/bn-IN.xpi) = 526356
SHA256 (xpi/firefox-i18n-55.0b6/br.xpi) = ad0000dec558c7cac4e3c8c66c707b7f4edfa6ac6be7c22c6740aa2f56479bf0
SIZE (xpi/firefox-i18n-55.0b6/br.xpi) = 457068
SHA256 (xpi/firefox-i18n-55.0b6/bs.xpi) = c60d2e21621be1b1cf671100b16746f3f18216055c2c823ac9db76684b511a1f
SIZE (xpi/firefox-i18n-55.0b6/bs.xpi) = 465027
SHA256 (xpi/firefox-i18n-55.0b6/ca.xpi) = e8b22987facda25bf30530a0128722e5bb6964e1e8be3714e3a44ab6dd3e9d97
SIZE (xpi/firefox-i18n-55.0b6/ca.xpi) = 472851
SHA256 (xpi/firefox-i18n-55.0b6/cak.xpi) = df0342bbded84bdb8cbcfc594751089b00324e9de9d2264cf67418234ed296a6
SIZE (xpi/firefox-i18n-55.0b6/cak.xpi) = 481824
SHA256 (xpi/firefox-i18n-55.0b6/cs.xpi) = 1c4645945579f5fb689dd10919abac5931e32833c62ea3cde998a8cde6bd876a
SIZE (xpi/firefox-i18n-55.0b6/cs.xpi) = 476812
SHA256 (xpi/firefox-i18n-55.0b6/cy.xpi) = b6fb5acc15c542bead3d89503dfce70fc05abd2e7ad5203dee003b92f5ab93bf
SIZE (xpi/firefox-i18n-55.0b6/cy.xpi) = 458741
SHA256 (xpi/firefox-i18n-55.0b6/da.xpi) = f59ce3f901112b1bac2c4e8c69568b50e2a7a46dfbc13d4c73606bad009defb4
SIZE (xpi/firefox-i18n-55.0b6/da.xpi) = 452520
SHA256 (xpi/firefox-i18n-55.0b6/de.xpi) = 317ab0cc5c877f42b7d08053843421ec0315ddb2d4722f547446d443bb3e084e
SIZE (xpi/firefox-i18n-55.0b6/de.xpi) = 465462
SHA256 (xpi/firefox-i18n-55.0b6/dsb.xpi) = 3e024740c3fbac5e926333f1de69fb80d6094c229ea244fef69bac156c4bdcf7
SIZE (xpi/firefox-i18n-55.0b6/dsb.xpi) = 482082
SHA256 (xpi/firefox-i18n-55.0b6/el.xpi) = 70a800178d02af136d01078671f881ff0ac894e70d2e41ca79b614a75c56452e
SIZE (xpi/firefox-i18n-55.0b6/el.xpi) = 539781
SHA256 (xpi/firefox-i18n-55.0b6/en-GB.xpi) = 9c6cd3d0b09169250795ae6a40efbe65ec703be37e0a8ffd67550d82721688bf
SIZE (xpi/firefox-i18n-55.0b6/en-GB.xpi) = 439573
SHA256 (xpi/firefox-i18n-55.0b6/en-US.xpi) = 5caf8ec0abed31549af6d2033d47af428898c3d45d31bc7d1d7968f3a8a2c150
SIZE (xpi/firefox-i18n-55.0b6/en-US.xpi) = 439815
SHA256 (xpi/firefox-i18n-55.0b6/en-ZA.xpi) = 3712d5010c2294bed961182777aa9b710381ccd18a8689d9c9ca47070469fc26
SIZE (xpi/firefox-i18n-55.0b6/en-ZA.xpi) = 438623
SHA256 (xpi/firefox-i18n-55.0b6/eo.xpi) = f37150f3d4a32f6dd295d956bd9b00f49d7ef9e50d7dad5d2bf2cf14345a1177
SIZE (xpi/firefox-i18n-55.0b6/eo.xpi) = 459159
SHA256 (xpi/firefox-i18n-55.0b6/es-AR.xpi) = 61357d88d81cb738cffbb0a2b0661ab098366c3d195706b98ea96dc3427ddda2
SIZE (xpi/firefox-i18n-55.0b6/es-AR.xpi) = 467584
SHA256 (xpi/firefox-i18n-55.0b6/es-CL.xpi) = 4886dadb81e24257b418f2439b54959b139dac4296549fbbeb0ea7828b12e04d
SIZE (xpi/firefox-i18n-55.0b6/es-CL.xpi) = 471602
SHA256 (xpi/firefox-i18n-55.0b6/es-ES.xpi) = ea9719950f42b7fbc62d24158388d12f4eafa335ac1d4f67706d101123eb72bd
SIZE (xpi/firefox-i18n-55.0b6/es-ES.xpi) = 359825
SHA256 (xpi/firefox-i18n-55.0b6/es-MX.xpi) = 879dd25a93c0d4eaa52add7337cb1a6805da3b626b5500137f2824e03d7bf7fd
SIZE (xpi/firefox-i18n-55.0b6/es-MX.xpi) = 474246
SHA256 (xpi/firefox-i18n-55.0b6/et.xpi) = 7e4bf4cee9dc632b6de4f390c93c16e5991c75077cec343a7601b109ba8d3727
SIZE (xpi/firefox-i18n-55.0b6/et.xpi) = 454473
SHA256 (xpi/firefox-i18n-55.0b6/eu.xpi) = 1c22b8f512572f01617cc674024d23820f2e8f1751001ab3073b1bd20fcc7641
SIZE (xpi/firefox-i18n-55.0b6/eu.xpi) = 460417
SHA256 (xpi/firefox-i18n-55.0b6/fa.xpi) = ef7ec2f65f39197e94655a45e5131046a4fe261e04f2dcaadf4ea79359fdfa6a
SIZE (xpi/firefox-i18n-55.0b6/fa.xpi) = 511562
SHA256 (xpi/firefox-i18n-55.0b6/ff.xpi) = bbecf3289401b722a200923ff15b3504b762a082a425e5a7dcd41daa49d8fe63
SIZE (xpi/firefox-i18n-55.0b6/ff.xpi) = 455333
SHA256 (xpi/firefox-i18n-55.0b6/fi.xpi) = 419b49709b58b20efe5afeb4a52c395511b25a34d18059807975a83e1a9a1be3
SIZE (xpi/firefox-i18n-55.0b6/fi.xpi) = 453636
SHA256 (xpi/firefox-i18n-55.0b6/fr.xpi) = 1f5fb2631956d2ac91b2b14782d833a45e3f50ccb015b5aa93780aeced47509c
SIZE (xpi/firefox-i18n-55.0b6/fr.xpi) = 476671
SHA256 (xpi/firefox-i18n-55.0b6/fy-NL.xpi) = 3a866da87ca7d1e419afb94863eed6209897b748f6844d57ed707f6afbfb526a
SIZE (xpi/firefox-i18n-55.0b6/fy-NL.xpi) = 469969
SHA256 (xpi/firefox-i18n-55.0b6/ga-IE.xpi) = 72a25cea22bde83c7d16fdaf2dc4d0b8497565bab0a028fac4defbab9fe15b21
SIZE (xpi/firefox-i18n-55.0b6/ga-IE.xpi) = 481485
SHA256 (xpi/firefox-i18n-55.0b6/gd.xpi) = ec27bdb0129d14ea21249cb80f46e6bf639cd6a7b0ebd09b4c20e9064a2ebced
SIZE (xpi/firefox-i18n-55.0b6/gd.xpi) = 469057
SHA256 (xpi/firefox-i18n-55.0b6/gl.xpi) = 8597d98d51774bcd81c8f22b4edfbf9fee8e76e18c0695892a7f858fa2815f45
SIZE (xpi/firefox-i18n-55.0b6/gl.xpi) = 459113
SHA256 (xpi/firefox-i18n-55.0b6/gn.xpi) = d23208ec658adfbae1694050cf9b2f134a5d710035b5d5cf858ea3fe918cf595
SIZE (xpi/firefox-i18n-55.0b6/gn.xpi) = 476202
SHA256 (xpi/firefox-i18n-55.0b6/gu-IN.xpi) = 98c96f42d2ffd4dce34b70b85ae3969edb12588736d2cf29e47f9f83bd01b82b
SIZE (xpi/firefox-i18n-55.0b6/gu-IN.xpi) = 498747
SHA256 (xpi/firefox-i18n-55.0b6/he.xpi) = b729f53c7ed86fdc65ad700d70eee0da8674558b13ce809c43b319c05f385160
SIZE (xpi/firefox-i18n-55.0b6/he.xpi) = 479884
SHA256 (xpi/firefox-i18n-55.0b6/hi-IN.xpi) = 7a7a49cc48b7a113b6a21d040d1fdb91820d4304edfcf550170e1a418bcfa8ea
SIZE (xpi/firefox-i18n-55.0b6/hi-IN.xpi) = 530525
SHA256 (xpi/firefox-i18n-55.0b6/hr.xpi) = cf723a591824833db35d3c7982589d56d54b3948f52080d9b3e508694d1cafba
SIZE (xpi/firefox-i18n-55.0b6/hr.xpi) = 467994
SHA256 (xpi/firefox-i18n-55.0b6/hsb.xpi) = c3fe484e5c44cbe3e984a07f5128276a6d5a09eae6afb15a234ae8957327d0c2
SIZE (xpi/firefox-i18n-55.0b6/hsb.xpi) = 479801
SHA256 (xpi/firefox-i18n-55.0b6/hu.xpi) = 9ed57541dc657311b58b13de8bc76d245d54f895469d9ca5928c8d3876579c3e
SIZE (xpi/firefox-i18n-55.0b6/hu.xpi) = 481406
SHA256 (xpi/firefox-i18n-55.0b6/hy-AM.xpi) = ec2fab1b89512d6d202a6b4e0dd03a4533ed65a275aac04d8e02e2c49130df29
SIZE (xpi/firefox-i18n-55.0b6/hy-AM.xpi) = 520884
SHA256 (xpi/firefox-i18n-55.0b6/id.xpi) = 024a10512561c126a761295e1384b570318b683594225bc5d04d9ac77af10fd4
SIZE (xpi/firefox-i18n-55.0b6/id.xpi) = 450293
SHA256 (xpi/firefox-i18n-55.0b6/is.xpi) = bda2d8f23dd7f6ab286ad865d98d3aa222553c60b21010f00373798c355fcbcd
SIZE (xpi/firefox-i18n-55.0b6/is.xpi) = 464422
SHA256 (xpi/firefox-i18n-55.0b6/it.xpi) = 123cdd890540b723e6b675ba8dee0e081117bfce99b7f92cbaa347de156d3838
SIZE (xpi/firefox-i18n-55.0b6/it.xpi) = 352978
SHA256 (xpi/firefox-i18n-55.0b6/ja.xpi) = efec79900949cda39fd76e24e5b7b935ac23828f8e2fc2d62111ed8fcfcbe5fd
SIZE (xpi/firefox-i18n-55.0b6/ja.xpi) = 521621
SHA256 (xpi/firefox-i18n-55.0b6/ka.xpi) = aa167ea5d8643d3591d1a53d17c42b8a5461492aae1d62bd65a4924514aa282f
SIZE (xpi/firefox-i18n-55.0b6/ka.xpi) = 493506
SHA256 (xpi/firefox-i18n-55.0b6/kab.xpi) = 28154778e4b8c091d6c3c70c7400b9241259c67a612c4b82e5eb5381c299dd83
SIZE (xpi/firefox-i18n-55.0b6/kab.xpi) = 470045
SHA256 (xpi/firefox-i18n-55.0b6/kk.xpi) = 3938d7ab311a3e88792d8a8bbadb90a70cd2fd4ee1cb4203b764e0f0addba9f5
SIZE (xpi/firefox-i18n-55.0b6/kk.xpi) = 526712
SHA256 (xpi/firefox-i18n-55.0b6/km.xpi) = 6c2c5cb9a92900b88b7dccc8cdfa02a6e8122cf652153887a335d7ef4d3cf6de
SIZE (xpi/firefox-i18n-55.0b6/km.xpi) = 540650
SHA256 (xpi/firefox-i18n-55.0b6/kn.xpi) = 3af51007d753bb58d202a48e50845e240abe20634bb75c658f503adad5ebe28b
SIZE (xpi/firefox-i18n-55.0b6/kn.xpi) = 538863
SHA256 (xpi/firefox-i18n-55.0b6/ko.xpi) = e7ef5a6d1d1fea439c012e0ea39179357a20c09a07de26c7eb2ce0c13594bc7b
SIZE (xpi/firefox-i18n-55.0b6/ko.xpi) = 494549
SHA256 (xpi/firefox-i18n-55.0b6/lij.xpi) = 4e93b68af7f1540fdf0eebce9990ec7f57c7ba2e1a2fb6777727aa9793c203c2
SIZE (xpi/firefox-i18n-55.0b6/lij.xpi) = 458701
SHA256 (xpi/firefox-i18n-55.0b6/lt.xpi) = 19dcf321eeb4e69197b5f1d23d2e30a2ee12aae74a737a1a32cfd2a5b72c25dd
SIZE (xpi/firefox-i18n-55.0b6/lt.xpi) = 481083
SHA256 (xpi/firefox-i18n-55.0b6/lv.xpi) = e18044f962a8656b6e1d5497518bab73674632a77042efcca894184dea54313e
SIZE (xpi/firefox-i18n-55.0b6/lv.xpi) = 473112
SHA256 (xpi/firefox-i18n-55.0b6/mai.xpi) = 06a22bd790edb768363b2f446c626b0674f4067f9bc8b0ceb973a832b104a06b
SIZE (xpi/firefox-i18n-55.0b6/mai.xpi) = 517897
SHA256 (xpi/firefox-i18n-55.0b6/mk.xpi) = c46db01460f3bde0b2d2421dd8640a10f70548107172e6ee1b981ed95fa53a04
SIZE (xpi/firefox-i18n-55.0b6/mk.xpi) = 500209
SHA256 (xpi/firefox-i18n-55.0b6/ml.xpi) = 98c3bf1f1c851fd9a46fc2bef602f6de4b75197f21b79e5da23cab2c436fdc70
SIZE (xpi/firefox-i18n-55.0b6/ml.xpi) = 540984
SHA256 (xpi/firefox-i18n-55.0b6/mr.xpi) = 7f43d422c262c8b4dc1f5647f0dcd64ee0e5c9573d7af67cc48d25b0dd7ced63
SIZE (xpi/firefox-i18n-55.0b6/mr.xpi) = 528275
SHA256 (xpi/firefox-i18n-55.0b6/ms.xpi) = c1d9de2123b82f4420daded17f164f56eaaff9dd739bd66f88cd3b6e60f49174
SIZE (xpi/firefox-i18n-55.0b6/ms.xpi) = 459507
SHA256 (xpi/firefox-i18n-55.0b6/my.xpi) = 04e0ff8a32e4a62006aa924251d67aecb7296fd7c016a36fdcc295cd9c0d5b55
SIZE (xpi/firefox-i18n-55.0b6/my.xpi) = 528101
SHA256 (xpi/firefox-i18n-55.0b6/nb-NO.xpi) = 9e8841bf9461349a758083c92a29af905cb4cc9b6b3b96ba43ad2e36808fac78
SIZE (xpi/firefox-i18n-55.0b6/nb-NO.xpi) = 457649
SHA256 (xpi/firefox-i18n-55.0b6/nl.xpi) = 2584e4557f075f8f26ae2eaea9ed0de8e63f6b942467501f32b875d3123ca06e
SIZE (xpi/firefox-i18n-55.0b6/nl.xpi) = 461513
SHA256 (xpi/firefox-i18n-55.0b6/nn-NO.xpi) = fe1649ccd3f90035fba24b4dea0adda0246dcd984bcb16868f946a579f05d554
SIZE (xpi/firefox-i18n-55.0b6/nn-NO.xpi) = 458459
SHA256 (xpi/firefox-i18n-55.0b6/or.xpi) = 384ce93c67a564813688ac981040c3deaae9cd5f13729c4d27f86445287d144d
SIZE (xpi/firefox-i18n-55.0b6/or.xpi) = 511357
SHA256 (xpi/firefox-i18n-55.0b6/pa-IN.xpi) = 74f89d6c7868b55503cd8e3ec0dac561ac86a08676f650d80a486e58709c38f8
SIZE (xpi/firefox-i18n-55.0b6/pa-IN.xpi) = 498455
SHA256 (xpi/firefox-i18n-55.0b6/pl.xpi) = 78b2f86f7a56658b3a852d1e09ef6de25f37193e21c05d50d72664944e6852cd
SIZE (xpi/firefox-i18n-55.0b6/pl.xpi) = 376265
SHA256 (xpi/firefox-i18n-55.0b6/pt-BR.xpi) = 9566eca306c31c5e96ceb88e485636f3c8af94b103f9c710fe6bcf1f279dbb4c
SIZE (xpi/firefox-i18n-55.0b6/pt-BR.xpi) = 462719
SHA256 (xpi/firefox-i18n-55.0b6/pt-PT.xpi) = 62e7de31997c1b81bd3741e2202ae029470e05ab2e785180c3a11c2d2ec4b4a8
SIZE (xpi/firefox-i18n-55.0b6/pt-PT.xpi) = 465294
SHA256 (xpi/firefox-i18n-55.0b6/rm.xpi) = 5011a71d8f5d42412a94427bdd07094c280c4143c0c86cd345f48fbd737f41c0
SIZE (xpi/firefox-i18n-55.0b6/rm.xpi) = 458267
SHA256 (xpi/firefox-i18n-55.0b6/ro.xpi) = 882f45563d22dbfe160541ca65061cd3f2b4c723e4e2d1135cec467797b82e2e
SIZE (xpi/firefox-i18n-55.0b6/ro.xpi) = 462977
SHA256 (xpi/firefox-i18n-55.0b6/ru.xpi) = a98adcef40783b35a4859f48552df0de226d4f7e3bdec7991ee855f865757879
SIZE (xpi/firefox-i18n-55.0b6/ru.xpi) = 530903
SHA256 (xpi/firefox-i18n-55.0b6/si.xpi) = 44f834eb59d09f1c6dec2afa092a3540023273eb941eb19d2eb0b34a1224c2ec
SIZE (xpi/firefox-i18n-55.0b6/si.xpi) = 508354
SHA256 (xpi/firefox-i18n-55.0b6/sk.xpi) = 8d8b71fe0b9bc8133470840746cfd0c0bb9c357c2e1576a172d8f74ded36d810
SIZE (xpi/firefox-i18n-55.0b6/sk.xpi) = 487554
SHA256 (xpi/firefox-i18n-55.0b6/sl.xpi) = be3a710c017af33f76efdbb2e1389131fc0a938dd76ee71220a9883bca74464c
SIZE (xpi/firefox-i18n-55.0b6/sl.xpi) = 465769
SHA256 (xpi/firefox-i18n-55.0b6/son.xpi) = 801217151d6c1fb14875435be1404643a9ebd9aba86066792d9421b94e33284c
SIZE (xpi/firefox-i18n-55.0b6/son.xpi) = 456961
SHA256 (xpi/firefox-i18n-55.0b6/sq.xpi) = 8b3364c04114fe2726856fdb25e0a2e6e11b9f7d78154e33221b9622794ff5c5
SIZE (xpi/firefox-i18n-55.0b6/sq.xpi) = 470634
SHA256 (xpi/firefox-i18n-55.0b6/sr.xpi) = 4aa34cf8cbf8afad6c431372be3fb45139a064ebc9a284a80154b750ac0769ba
SIZE (xpi/firefox-i18n-55.0b6/sr.xpi) = 494881
SHA256 (xpi/firefox-i18n-55.0b6/sv-SE.xpi) = 2cb7ddd298a99cad6486a6147c93ef511af24ecce5b2e6670b9b427d01c2e32e
SIZE (xpi/firefox-i18n-55.0b6/sv-SE.xpi) = 466011
SHA256 (xpi/firefox-i18n-55.0b6/ta.xpi) = 75ad6ad085d67f47e5c26d240c2e9308ae91589a8a2b3b737934f02dc4603a2c
SIZE (xpi/firefox-i18n-55.0b6/ta.xpi) = 519927
SHA256 (xpi/firefox-i18n-55.0b6/te.xpi) = f92ab2191ab83692412c00560316cb1014e6db9f51b757d8d54b971be8453756
SIZE (xpi/firefox-i18n-55.0b6/te.xpi) = 540118
SHA256 (xpi/firefox-i18n-55.0b6/th.xpi) = f566fa675c3b1198bcf02bb476081dc0dad93741511ca714112790f3596ff697
SIZE (xpi/firefox-i18n-55.0b6/th.xpi) = 511879
SHA256 (xpi/firefox-i18n-55.0b6/tr.xpi) = a9a0321da699b8e096194c9865fa92ddc83e1dc2d0b9b2c692ff6e285c587b46
SIZE (xpi/firefox-i18n-55.0b6/tr.xpi) = 472163
SHA256 (xpi/firefox-i18n-55.0b6/uk.xpi) = 2ca922162673551507ef938dc6e9c5f6c8026c702207e76c75de8839f9e03c4d
SIZE (xpi/firefox-i18n-55.0b6/uk.xpi) = 526439
SHA256 (xpi/firefox-i18n-55.0b6/ur.xpi) = 68512194641db6bf7ceb34a387ada41a791a89166edd34502bd28e8d27b97985
SIZE (xpi/firefox-i18n-55.0b6/ur.xpi) = 520737
SHA256 (xpi/firefox-i18n-55.0b6/uz.xpi) = ac1e4d70587334dadb1dc5bd876c0cd0b0ae9db313e70981fe808be0f91d05ba
SIZE (xpi/firefox-i18n-55.0b6/uz.xpi) = 467673
SHA256 (xpi/firefox-i18n-55.0b6/vi.xpi) = 7fd4dc72ab78a13c43cd5c4a5172c7b7529dc2927872e2f77f1ce68d7393ad46
SIZE (xpi/firefox-i18n-55.0b6/vi.xpi) = 474773
SHA256 (xpi/firefox-i18n-55.0b6/xh.xpi) = 990cfea918c879b0dfb465fcc7d74ed1094e9dc0b1eba9e1a8fe9ba58d65d820
SIZE (xpi/firefox-i18n-55.0b6/xh.xpi) = 470722
SHA256 (xpi/firefox-i18n-55.0b6/zh-CN.xpi) = a58a883827be06aeb5bb73b909c75a163e3e40fc30e3fa8c5f993d5fdedeaf7b
SIZE (xpi/firefox-i18n-55.0b6/zh-CN.xpi) = 490381
SHA256 (xpi/firefox-i18n-55.0b6/zh-TW.xpi) = 102be0c4f6cedbf8ce003d91c64df82d2d53abe9af47a9ffc505c7285f7731e8
SIZE (xpi/firefox-i18n-55.0b6/zh-TW.xpi) = 489349




# $FreeBSD$

PORTNAME=	firefox
DISTVERSION=	55.0b6
DISTVERSIONSUFFIX=.source
PORTREVISION=	1
PORTEPOCH=	1

MAINTAINER=	gecko@FreeBSD.org
COMMENT=	Web browser based on the browser portion of Mozilla

BUILD_DEPENDS=	nspr>=4.15:devel/nspr \
		nss>=3.31:security/nss \
		libevent>=2.0.22:devel/libevent \
		harfbuzz>=1.4.6:print/harfbuzz \
		graphite2>=1.3.10:graphics/graphite2 \
		png>=1.6.28:graphics/png \
		libvorbis>=1.3.5,3:audio/libvorbis \
		libvpx>=1.5.0:multimedia/libvpx \
		sqlite3>=3.19.2:databases/sqlite3 \
		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 \
		v4l_compat>0:multimedia/v4l_compat \
		autoconf-2.13:devel/autoconf213 \


OPTIONS_DEFINE=		RUST
OPTIONS_DEFAULT=	BUNDLED_CAIRO
OPTIONS_EXCLUDE=	GNOMEUI
# XXX lang/rust and devel/cargo currently build only on these platforms
OPTIONS_DEFAULT_aarch64=RUST
OPTIONS_DEFAULT_amd64=	RUST

Lines 1-3 Link Here

(-)b/www/firefox/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1498670356	1	TIMESTAMP = 1498779690
2	SHA256 (firefox-54.0.1.source.tar.xz) = 07843e68f2f64842bb230b7fe821e45c82944e64dc3f2a3a90d3ea9f1efa7f77	2	SHA256 (firefox-55.0b6.source.tar.xz) = 24c61e7f62aca33f971dc8323022ed6a64f072753f9eb6bf859f34442d7d6136
3	SIZE (firefox-54.0.1.source.tar.xz) = 229935420	3	SIZE (firefox-55.0b6.source.tar.xz) = 236071532




 
 static int
 validate_stream_params(cubeb_stream_params * input_stream_params,
@@ -155,6 +158,10 @@ cubeb_init(cubeb ** context, char const * context_name, char const * backend_nam
 #if defined(USE_KAI)
       init_oneshot = kai_init;
 #endif
+    } else if (!strcmp(backend_name, "oss")) {
+#if defined(USE_OSS)
+      init_oneshot = oss_init;
+#endif
     } else {
       /* Already set */
     }
@@ -196,6 +203,9 @@ cubeb_init(cubeb ** context, char const * context_name, char const * backend_nam
 #if defined(USE_KAI)
     kai_init,
 #endif

+    char * buftail = stm->buffer + WRAP(snd_pcm_frames_to_bytes)(stm->pcm, stm->bufframes);
 
     /* Correct read size to the other stream available frames */
     if (stm->other_stream && got > (snd_pcm_sframes_t) stm->other_stream->bufframes) {
@@ -372,8 +421,8 @@ alsa_process_stream(cubeb_stream * stm)
     long drain_frames = avail - stm->bufframes;
     double drain_time = (double) drain_frames / stm->params.rate;

+  r = WRAP(snd_pcm_poll_descriptors)(stm->pcm, stm->saved_fds, stm->nfds);
   assert((nfds_t) r == stm->nfds);
 
   if (alsa_register_stream(ctx, stm) != 0) {
@@ -1048,7 +1156,7 @@ alsa_stream_destroy(cubeb_stream * stm)
   pthread_mutex_lock(&stm->mutex);
   if (stm->pcm) {

index b139b8f497fd..d1f8a223c6d8 100755
--- media/libcubeb/update.sh
+++ media/libcubeb/update.sh
@@ -20,6 +20,7 @@ cp $1/src/cubeb_log.h src
 cp $1/src/cubeb_mixer.cpp src
 cp $1/src/cubeb_mixer.h src
 cp $1/src/cubeb_opensl.c src
+cp $1/src/cubeb_oss.c src
 cp $1/src/cubeb_osx_run_loop.h src
 cp $1/src/cubeb_panner.cpp src
 cp $1/src/cubeb_panner.h src
diff --git media/webrtc/signaling/test/common.build media/webrtc/signaling/test/common.build
index 3e5450f5d63a..dd45427f655a 100644
--- media/webrtc/signaling/test/common.build
+++ media/webrtc/signaling/test/common.build
@@ -99,8 +99,8 @@ USE_LIBS += ['mozglue']
 OS_LIBS += CONFIG['MOZ_WEBRTC_X11_LIBS']
 OS_LIBS += CONFIG['REALTIME_LIBS']
 
-if CONFIG['MOZ_ALSA']:
-    OS_LIBS += CONFIG['MOZ_ALSA_LIBS']
+if CONFIG['MOZ_OSS']:
+    OS_LIBS += CONFIG['MOZ_OSS_LIBS']
 
 if CONFIG['MOZ_SYSTEM_JPEG']:
     OS_LIBS += CONFIG['MOZ_JPEG_LIBS']
diff --git toolkit/library/moz.build toolkit/library/moz.build
index a61c689c83c3..7764df6f8a6b 100644
--- toolkit/library/moz.build




commit acc36099bfc1
Author: Steve Fink <sfink@mozilla.com>
Date:   Mon Apr 17 21:04:08 2017 -0700

    Bug 1356709 - Fix uses of uninitialized values in arm64 code, r=sstangl
    
    --HG--
    extra : rebase_source : 2f9a59c88f21dd467fbc4232e2f6b20850fd53ed
    extra : histedit_source : b5110806cf04a3ca056ea89709bcc707368a2e57
---
 js/src/jit/arm64/MacroAssembler-arm64.cpp   |  4 +++-
 js/src/jit/arm64/vixl/Debugger-vixl.cpp     | 10 ++++++----
 js/src/jit/arm64/vixl/Decoder-vixl.cpp      | 12 ++++++------
 js/src/jit/arm64/vixl/Instrument-vixl.cpp   |  4 +++-
 js/src/jit/arm64/vixl/MozSimulator-vixl.cpp |  8 ++++++--
 5 files changed, 24 insertions(+), 14 deletions(-)

diff --git js/src/jit/arm64/MacroAssembler-arm64.cpp js/src/jit/arm64/MacroAssembler-arm64.cpp
index 013fefd85e9b..f1704c622cb6 100644
--- js/src/jit/arm64/MacroAssembler-arm64.cpp
+++ js/src/jit/arm64/MacroAssembler-arm64.cpp
@@ -682,7 +682,9 @@ MacroAssembler::callWithABIPre(uint32_t* stackAdjust, bool callFromWasm)
     *stackAdjust = stackForCall;
     reserveStack(*stackAdjust);
     {
-        moveResolver_.resolve();
+        enoughMemory_ &= moveResolver_.resolve();
+        if (!enoughMemory_)
+            return;
         MoveEmitter emitter(*this);
         emitter.emit(moveResolver_);
         emitter.finish();
diff --git js/src/jit/arm64/vixl/Debugger-vixl.cpp js/src/jit/arm64/vixl/Debugger-vixl.cpp
index 85097ed5a086..2f4966fbef15 100644
--- js/src/jit/arm64/vixl/Debugger-vixl.cpp
+++ js/src/jit/arm64/vixl/Debugger-vixl.cpp
@@ -30,6 +30,7 @@
 
 #include "jit/arm64/vixl/Debugger-vixl.h"
 
+#include "mozilla/Unused.h"
 #include "mozilla/Vector.h"
 
 #include "jsalloc.h"
@@ -1109,6 +1110,7 @@ bool DebugCommand::Match(const char* name, const char** aliases) {
 
 
 DebugCommand* DebugCommand::Parse(char* line) {
+  using mozilla::Unused;
   TokenVector args;
 
   for (char* chunk = strtok(line, " \t");
@@ -1120,15 +1122,15 @@ DebugCommand* DebugCommand::Parse(char* line) {
       Token* format = FormatToken::Tokenize(dot + 1);
       if (format != NULL) {
         *dot = '\0';
-        args.append(Token::Tokenize(chunk));
-        args.append(format);
+        Unused << args.append(Token::Tokenize(chunk));
+        Unused << args.append(format);
       } else {
         // Error while parsing the format, push the UnknownToken so an error
         // can be accurately reported.
-        args.append(Token::Tokenize(chunk));
+        Unused << args.append(Token::Tokenize(chunk));
       }
     } else {
-      args.append(Token::Tokenize(chunk));
+      Unused << args.append(Token::Tokenize(chunk));
     }
   }
 
diff --git js/src/jit/arm64/vixl/Decoder-vixl.cpp js/src/jit/arm64/vixl/Decoder-vixl.cpp
index 5865689ae6fa..c74f71a11b24 100644
--- js/src/jit/arm64/vixl/Decoder-vixl.cpp
+++ js/src/jit/arm64/vixl/Decoder-vixl.cpp
@@ -112,12 +112,12 @@ void Decoder::DecodeInstruction(const Instruction *instr) {
 }
 
 void Decoder::AppendVisitor(DecoderVisitor* new_visitor) {
-  visitors_.append(new_visitor);
+  MOZ_ALWAYS_TRUE(visitors_.append(new_visitor));
 }
 
 
 void Decoder::PrependVisitor(DecoderVisitor* new_visitor) {
-  visitors_.insert(visitors_.begin(), new_visitor);
+  MOZ_ALWAYS_TRUE(visitors_.insert(visitors_.begin(), new_visitor));
 }
 
 
@@ -125,12 +125,12 @@ void Decoder::InsertVisitorBefore(DecoderVisitor* new_visitor,
                                   DecoderVisitor* registered_visitor) {
   for (auto it = visitors_.begin(); it != visitors_.end(); it++) {
     if (*it == registered_visitor) {
-      visitors_.insert(it, new_visitor);
+      MOZ_ALWAYS_TRUE(visitors_.insert(it, new_visitor));
       return;
     }
   }
   // We reached the end of the list without finding registered_visitor.
-  visitors_.append(new_visitor);
+  MOZ_ALWAYS_TRUE(visitors_.append(new_visitor));
 }
 
 
@@ -139,12 +139,12 @@ void Decoder::InsertVisitorAfter(DecoderVisitor* new_visitor,
   for (auto it = visitors_.begin(); it != visitors_.end(); it++) {
     if (*it == registered_visitor) {
       it++;
-      visitors_.insert(it, new_visitor);
+      MOZ_ALWAYS_TRUE(visitors_.insert(it, new_visitor));
       return;
     }
   }
   // We reached the end of the list without finding registered_visitor.
-  visitors_.append(new_visitor);
+  MOZ_ALWAYS_TRUE(visitors_.append(new_visitor));
 }
 
 
diff --git js/src/jit/arm64/vixl/Instrument-vixl.cpp js/src/jit/arm64/vixl/Instrument-vixl.cpp
index 7653e0856281..15d143c8ec13 100644
--- js/src/jit/arm64/vixl/Instrument-vixl.cpp
+++ js/src/jit/arm64/vixl/Instrument-vixl.cpp
@@ -26,6 +26,8 @@
 
 #include "jit/arm64/vixl/Instrument-vixl.h"
 
+#include "mozilla/Unused.h"
+
 namespace vixl {
 
 Counter::Counter(const char* name, CounterType type)
@@ -139,7 +141,7 @@ Instrument::Instrument(const char* datafile, uint64_t sample_period)
   // Construct Counter objects from counter description array.
   for (int i = 0; i < num_counters; i++) {
     if (Counter* counter = js_new<Counter>(kCounterList[i].name, kCounterList[i].type))
-      counters_.append(counter);
+      mozilla::Unused << counters_.append(counter);
   }
 
   DumpCounterNames();
diff --git js/src/jit/arm64/vixl/MozSimulator-vixl.cpp js/src/jit/arm64/vixl/MozSimulator-vixl.cpp
index 0f8acebf9de6..284413bc5875 100644
--- js/src/jit/arm64/vixl/MozSimulator-vixl.cpp
+++ js/src/jit/arm64/vixl/MozSimulator-vixl.cpp
@@ -29,6 +29,7 @@
 #include "jit/arm64/vixl/Debugger-vixl.h"
 #include "jit/arm64/vixl/Simulator-vixl.h"
 #include "jit/IonTypes.h"
+#include "js/Utility.h"
 #include "threading/LockGuard.h"
 #include "vm/Runtime.h"
 #include "wasm/WasmCode.h"
@@ -427,9 +428,12 @@ void Simulator::VisitException(const Instruction* instr) {
         case kCallRtRedirected:
           VisitCallRedirection(instr);
           return;
-        case kMarkStackPointer:
-          spStack_.append(xreg(31, Reg31IsStackPointer));
+        case kMarkStackPointer: {
+          js::AutoEnterOOMUnsafeRegion oomUnsafe;
+          if (!spStack_.append(xreg(31, Reg31IsStackPointer)))
+            oomUnsafe.crash("tracking stack for ARM64 simulator");
           return;
+        }
         case kCheckStackPointer: {
           int64_t current = xreg(31, Reg31IsStackPointer);
           int64_t expected = spStack_.popCopy();




commit 50d30e203b35
Author: Jim Chen <nchen@mozilla.com>
Date:   Mon May 1 14:46:00 2017 -0400

    Bug 1357874 - Add more AArch64 support to JS code; r=luke
    
    * Fix a parentheses warning when compiling testGCAllocator.cpp.
    
    * Enable trace logging in TraceLogging.cpp.
---
 js/src/jsapi-tests/testGCAllocator.cpp |  2 +-
 js/src/jsmath.cpp                      |  2 ++
 js/src/jsnativestack.cpp               | 10 +++++-----
 js/src/vm/TraceLogging.cpp             |  2 +-
 js/src/wasm/WasmSignalHandlers.cpp     |  2 ++
 5 files changed, 11 insertions(+), 7 deletions(-)

diff --git js/src/jsapi-tests/testGCAllocator.cpp js/src/jsapi-tests/testGCAllocator.cpp
index 229e56422fdf..ec5407e8cca1 100644
--- js/src/jsapi-tests/testGCAllocator.cpp
+++ js/src/jsapi-tests/testGCAllocator.cpp
@@ -315,7 +315,7 @@ mapMemoryAt(void* desired, size_t length)
 
 #if defined(__ia64__) || defined(__aarch64__) || \
     (defined(__sparc__) && defined(__arch64__) && (defined(__NetBSD__) || defined(__linux__)))
-    MOZ_RELEASE_ASSERT(0xffff800000000000ULL & (uintptr_t(desired) + length - 1) == 0);
+    MOZ_RELEASE_ASSERT((0xffff800000000000ULL & (uintptr_t(desired) + length - 1)) == 0);
 #endif
     void* region = mmap(desired, length, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANON, -1, 0);
     if (region == MAP_FAILED)
diff --git js/src/vm/TraceLogging.cpp js/src/vm/TraceLogging.cpp
index c7bc6a84b2e9..82fdf7c77e8a 100644
--- js/src/vm/TraceLogging.cpp
+++ js/src/vm/TraceLogging.cpp
@@ -61,7 +61,7 @@ rdtsc(void)
     return result;
 
 }
-#elif defined(__arm__)
+#elif defined(__arm__) || defined(__aarch64__)
 
 #include <sys/time.h>
 




commit a2dff5ad917b
Author: Jim Chen <nchen@mozilla.com>
Date:   Wed May 17 13:06:23 2017 -0400

    Bug 1360321 - 10. Fix opt build warnings in VIXL; r=me
    
    Fix an unused variable warning for `visitor` because it's only used in
    the assertion macro.
    
    Fix several no-return-value errors because the compiler cannot assume
    the VIXL_UNREACHABLE() macro is actually unreachable.
    
    r=me for trivial patch.
    
    MozReview-Commit-ID: 13IlMyUsXUN
---
 js/src/jit/arm64/vixl/Decoder-vixl.h | 2 ++
 js/src/jit/arm64/vixl/Globals-vixl.h | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git js/src/jit/arm64/vixl/Decoder-vixl.h js/src/jit/arm64/vixl/Decoder-vixl.h
index 95dd589e8ab0..742c6f954c72 100644
--- js/src/jit/arm64/vixl/Decoder-vixl.h
+++ js/src/jit/arm64/vixl/Decoder-vixl.h
@@ -151,9 +151,11 @@ class Decoder {
 
   // Top-level wrappers around the actual decoding function.
   void Decode(const Instruction* instr) {
+#ifdef DEBUG
     for (auto visitor : visitors_) {
       VIXL_ASSERT(visitor->IsConstVisitor());
     }
+#endif
     DecodeInstruction(instr);
   }
   void Decode(Instruction* instr) {
diff --git js/src/jit/arm64/vixl/Globals-vixl.h js/src/jit/arm64/vixl/Globals-vixl.h
index 8a7418eb8c47..39d9c1d3f37d 100644
--- js/src/jit/arm64/vixl/Globals-vixl.h
+++ js/src/jit/arm64/vixl/Globals-vixl.h
@@ -76,7 +76,7 @@ const int MBytes = 1024 * KBytes;
   #define VIXL_ASSERT(condition) ((void) 0)
   #define VIXL_CHECK(condition) ((void) 0)
   #define VIXL_UNIMPLEMENTED() ((void) 0)
-  #define VIXL_UNREACHABLE() ((void) 0)
+  #define VIXL_UNREACHABLE() MOZ_MAKE_COMPILER_ASSUME_IS_UNREACHABLE()
 #endif
 // This is not as powerful as template based assertions, but it is simple.
 // It assumes that the descriptions are unique. If this starts being a problem,




- "libc 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.24 (registry+https://github.com/rust-lang/crates.io-index)",
  "libz-sys 1.0.12 (registry+https://github.com/rust-lang/crates.io-index)",
  "num_cpus 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -14,7 +14,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -13,7 +13,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "libc"

 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -23,7 +23,7 @@ version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "gcc 0.3.42 (registry+https://github.com/rust-lang/crates.io-index)",

  "pkg-config 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -32,7 +32,7 @@ name = "num_cpus"
 version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.24 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -42,7 +42,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [metadata]
 "checksum gcc 0.3.42 (registry+https://github.com/rust-lang/crates.io-index)" = "291055c78f59ca3d84c99026c9501c469413d386bb46be1e1cf1d285cd1db3b0"
-"checksum libc 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)" = "684f330624d8c3784fb9558ca46c4ce488073a8d22450415c5eb4f4cfb0d11b5"
+"checksum libc 0.2.24 (registry+https://github.com/rust-lang/crates.io-index)" = "38f5c2b18a287cf78b4097db62e20f43cace381dc76ae5c0a3073067f78b7ddc"
 "checksum libz-sys 1.0.12 (registry+https://github.com/rust-lang/crates.io-index)" = "7616099a575493da60cddc1174b686fcfb00ece89dc6f61f31ff47c35f07bbe8"
 "checksum num_cpus 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a225d1e2717567599c24f88e49f00856c6e825a12125181ee42c4257e3688d39"
 "checksum pkg-config 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "3a8b4c6b8165cd1a1cd4b9b120978131389f64bdaf456435caa41e630edba903"
diff --git testing/geckodriver/Cargo.lock testing/geckodriver/Cargo.lock
index 1fb7f412fff8..71ba5daa6658 100644
--- testing/geckodriver/Cargo.lock
+++ testing/geckodriver/Cargo.lock
@@ -47,7 +47,7 @@ dependencies = [
  "cfg-if 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "dbghelp-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.24 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustc-demangle 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -58,7 +58,7 @@ version = "0.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "gcc 0.3.42 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.24 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -85,7 +85,7 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "bzip2-sys 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.24 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -94,7 +94,7 @@ version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "gcc 0.3.42 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.24 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -151,7 +151,7 @@ name = "flate2"
 version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.24 (registry+https://github.com/rust-lang/crates.io-index)",
  "miniz-sys 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -200,7 +200,7 @@ version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.24 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -248,7 +248,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "libc"
-version = "0.2.20"
+version = "0.2.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -266,7 +266,7 @@ name = "memchr"
 version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.24 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -283,7 +283,7 @@ version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "gcc 0.3.42 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.24 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -361,7 +361,7 @@ name = "num_cpus"
 version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.24 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -374,7 +374,7 @@ name = "rand"
 version = "0.3.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.24 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -519,7 +519,7 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.24 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -529,7 +529,7 @@ version = "3.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.24 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -547,7 +547,7 @@ version = "0.1.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.24 (registry+https://github.com/rust-lang/crates.io-index)",
  "redox_syscall 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -711,7 +711,7 @@ dependencies = [
 "checksum language-tags 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a91d884b6667cd606bb5a69aa0c99ba811a115fc68915e7056ec08a46e93199a"
 "checksum lazy_static 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "cf186d1a8aa5f5bee5fd662bc9c1b949e0259e1bcc379d1f006847b0080c7417"
 "checksum lazy_static 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6abe0ee2e758cd6bc8a2cd56726359007748fbf4128da998b65d0b70f881e19b"
-"checksum libc 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)" = "684f330624d8c3784fb9558ca46c4ce488073a8d22450415c5eb4f4cfb0d11b5"
+"checksum libc 0.2.24 (registry+https://github.com/rust-lang/crates.io-index)" = "38f5c2b18a287cf78b4097db62e20f43cace381dc76ae5c0a3073067f78b7ddc"
 "checksum log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "ab83497bf8bf4ed2a74259c1c802351fcd67a65baa86394b6ba73c36f4838054"
 "checksum matches 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "efd7622e3022e1a6eaa602c4cea8912254e5582c9c692e9167714182244801b1"
 "checksum memchr 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1dbccc0e46f1ea47b9f17e6d67c5a96bd27030519c519c9c91327e31275a47b4"
diff --git third_party/rust/libc/.cargo-checksum.json third_party/rust/libc/.cargo-checksum.json
index e1e2ea34c5e4..3514e55b4293 100644
--- third_party/rust/libc/.cargo-checksum.json

index 2561f3856303..ab148dfb5e13 100644
--- toolkit/library/gtest/rust/Cargo.lock
+++ toolkit/library/gtest/rust/Cargo.lock
@@ -68,7 +68,7 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.24 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -160,7 +160,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "bitflags 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.24 (registry+https://github.com/rust-lang/crates.io-index)",
  "libloading 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -185,7 +185,7 @@ version = "0.3.0"
 dependencies = [
  "ansi_term 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.24 (registry+https://github.com/rust-lang/crates.io-index)",
  "strsim 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "term_size 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "unicode-segmentation 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -157,7 +157,7 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "core-foundation-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",

 ]
 
 [[package]]
@@ -193,7 +193,7 @@ name = "core-foundation-sys"
 version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [

 ]
 
 [[package]]
@@ -202,7 +202,7 @@ version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "core-foundation 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",

  "serde 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -213,7 +213,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "core-foundation 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "core-graphics 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",

 ]
 
 [[package]]
@@ -272,7 +272,7 @@ dependencies = [
  "gdi32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.24 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_derive 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -309,7 +309,7 @@ name = "freetype"
 version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [

 ]
 
 [[package]]
@@ -341,7 +341,7 @@ dependencies = [
  "atomic_refcell 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "cssparser 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "env_logger 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "euclid 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.24 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "nsstring_vendor 0.1.0",
  "parking_lot 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -439,7 +439,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "libc"

 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -467,7 +467,7 @@ name = "memchr"
 version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [

 ]
 
 [[package]]
@@ -545,7 +545,7 @@ name = "num_cpus"
 version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [

 ]
 
 [[package]]
@@ -583,7 +583,7 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.24 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
  "smallvec 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -663,7 +663,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 name = "pulse-ffi"
 version = "0.1.0"
 dependencies = [
- "libc 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.24 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -696,7 +696,7 @@ name = "rand"
 version = "0.3.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.24 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -715,7 +715,7 @@ dependencies = [
  "deque 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.24 (registry+https://github.com/rust-lang/crates.io-index)",
  "num_cpus 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -746,7 +746,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 name = "rust_url_capi"
 version = "0.0.1"
 dependencies = [
- "libc 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.24 (registry+https://github.com/rust-lang/crates.io-index)",
  "nserror 0.1.0",
  "nsstring 0.1.0",
  "url 1.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -948,7 +948,7 @@ name = "syntex_errors"
 version = "0.58.1"
  "gdi32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.24 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_codegen 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -858,7 +858,7 @@ version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "lazy_static 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.24 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -963,7 +963,7 @@ name = "syntex_errors"
 version = "0.54.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.24 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustc-serialize 0.3.22 (registry+https://github.com/rust-lang/crates.io-index)",
  "syntex_pos 0.54.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -985,7 +985,7 @@ version = "0.54.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.24 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustc-serialize 0.3.22 (registry+https://github.com/rust-lang/crates.io-index)",
  "syntex_pos 0.58.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "term 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -991,7 +991,7 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",

  "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -1001,7 +1001,7 @@ version = "3.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",

 ]
 
 [[package]]
@@ -1024,7 +1024,7 @@ version = "0.1.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",

  "redox_syscall 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -1225,7 +1225,7 @@ dependencies = [
 version = "2.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.24 (registry+https://github.com/rust-lang/crates.io-index)",
  "metadeps 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -1290,7 +1290,7 @@ dependencies = [
 "checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d"
 "checksum khronos_api 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d5a08e2a31d665af8f1ca437eab6d00a93c9d62a549f73f9ed8fc2e55b5a91a7"
 "checksum lazy_static 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6abe0ee2e758cd6bc8a2cd56726359007748fbf4128da998b65d0b70f881e19b"
-"checksum libc 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)" = "684f330624d8c3784fb9558ca46c4ce488073a8d22450415c5eb4f4cfb0d11b5"
+"checksum libc 0.2.24 (registry+https://github.com/rust-lang/crates.io-index)" = "38f5c2b18a287cf78b4097db62e20f43cace381dc76ae5c0a3073067f78b7ddc"
 "checksum libloading 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "be99f814beb3e9503a786a592c909692bb6d4fc5a695f6ed7987223acfbd5194"
 "checksum log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "ab83497bf8bf4ed2a74259c1c802351fcd67a65baa86394b6ba73c36f4838054"
 "checksum matches 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "efd7622e3022e1a6eaa602c4cea8912254e5582c9c692e9167714182244801b1"
diff --git toolkit/library/rust/Cargo.lock toolkit/library/rust/Cargo.lock
index d69359a9a640..99443b59f1af 100644
--- toolkit/library/rust/Cargo.lock
+++ toolkit/library/rust/Cargo.lock
@@ -66,7 +66,7 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.24 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -158,7 +158,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "bitflags 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.24 (registry+https://github.com/rust-lang/crates.io-index)",
  "libloading 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -183,7 +183,7 @@ version = "0.3.0"
 dependencies = [
  "ansi_term 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.24 (registry+https://github.com/rust-lang/crates.io-index)",
  "strsim 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "term_size 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "unicode-segmentation 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -155,7 +155,7 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "core-foundation-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",

 ]
 
 [[package]]
@@ -191,7 +191,7 @@ name = "core-foundation-sys"
 version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [

 ]
 
 [[package]]
@@ -200,7 +200,7 @@ version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "core-foundation 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",

  "serde 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -211,7 +211,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "core-foundation 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "core-graphics 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",

 ]
 
 [[package]]
@@ -270,7 +270,7 @@ dependencies = [
  "gdi32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.24 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_derive 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -307,7 +307,7 @@ name = "freetype"
 version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [

 ]
 
 [[package]]
@@ -339,7 +339,7 @@ dependencies = [
  "atomic_refcell 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "cssparser 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "env_logger 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "euclid 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.24 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "nsstring_vendor 0.1.0",
  "parking_lot 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -437,7 +437,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "libc"

 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -465,7 +465,7 @@ name = "memchr"
 version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [

 ]
 
 [[package]]
@@ -532,7 +532,7 @@ name = "num_cpus"
 version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [

 ]
 
 [[package]]
@@ -570,7 +570,7 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.24 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
  "smallvec 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -650,7 +650,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 name = "pulse-ffi"
 version = "0.1.0"
 dependencies = [
- "libc 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.24 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -683,7 +683,7 @@ name = "rand"
 version = "0.3.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.24 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -702,7 +702,7 @@ dependencies = [
  "deque 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.24 (registry+https://github.com/rust-lang/crates.io-index)",
  "num_cpus 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -733,7 +733,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 name = "rust_url_capi"
 version = "0.0.1"
 dependencies = [
- "libc 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.24 (registry+https://github.com/rust-lang/crates.io-index)",
  "nserror 0.1.0",
  "nsstring 0.1.0",
  "url 1.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -935,7 +935,7 @@ name = "syntex_errors"
 version = "0.58.1"
  "gdi32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.24 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_codegen 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -845,7 +845,7 @@ version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "lazy_static 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.24 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -950,7 +950,7 @@ name = "syntex_errors"
 version = "0.54.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.24 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustc-serialize 0.3.22 (registry+https://github.com/rust-lang/crates.io-index)",
  "syntex_pos 0.54.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -972,7 +972,7 @@ version = "0.54.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.24 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustc-serialize 0.3.22 (registry+https://github.com/rust-lang/crates.io-index)",
  "syntex_pos 0.58.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "term 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -978,7 +978,7 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",

  "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -988,7 +988,7 @@ version = "3.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",

 ]
 
 [[package]]
@@ -1011,7 +1011,7 @@ version = "0.1.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",

  "redox_syscall 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -1212,7 +1212,7 @@ dependencies = [
 version = "2.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.24 (registry+https://github.com/rust-lang/crates.io-index)",
  "metadeps 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -1277,7 +1277,7 @@ dependencies = [
 "checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d"
 "checksum khronos_api 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d5a08e2a31d665af8f1ca437eab6d00a93c9d62a549f73f9ed8fc2e55b5a91a7"
 "checksum lazy_static 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6abe0ee2e758cd6bc8a2cd56726359007748fbf4128da998b65d0b70f881e19b"
-"checksum libc 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)" = "684f330624d8c3784fb9558ca46c4ce488073a8d22450415c5eb4f4cfb0d11b5"
+"checksum libc 0.2.24 (registry+https://github.com/rust-lang/crates.io-index)" = "38f5c2b18a287cf78b4097db62e20f43cace381dc76ae5c0a3073067f78b7ddc"
 "checksum libloading 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "be99f814beb3e9503a786a592c909692bb6d4fc5a695f6ed7987223acfbd5194"
 "checksum log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "ab83497bf8bf4ed2a74259c1c802351fcd67a65baa86394b6ba73c36f4838054"
 "checksum matches 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "efd7622e3022e1a6eaa602c4cea8912254e5582c9c692e9167714182244801b1"

Lines 1-13 Link Here

(-)b/www/firefox/files/patch-bug702179 (-9 / +8 lines)
1	--- js/src/moz.build.orig 2015-12-16 12:32:04.574425000 +0100	1	Don't build static JS lib to make sure DTrace probes are picked up.
2	+++ js/src/moz.build 2015-12-16 12:32:09.032032000 +0100	2
3	@@ -671,10 +671,6 @@ CFLAGS += CONFIG['MOZ_ICU_CFLAGS']	3	--- js/src/build/moz.build.orig 2017-04-16 18:00:50 UTC
4	CXXFLAGS += CONFIG['MOZ_ICU_CFLAGS']	4	+++ js/src/build/moz.build
5	LOCAL_INCLUDES += CONFIG['MOZ_ICU_INCLUDES']	5	@@ -71,7 +71,3 @@ if CONFIG['OS_ARCH'] == 'SunOS':
		6	]
6		7
		8	OS_LIBS += CONFIG['REALTIME_LIBS']
		9	-
7	-NO_EXPAND_LIBS = True	10	-NO_EXPAND_LIBS = True
8	-	11	-
9	-DIST_INSTALL = True	12	-DIST_INSTALL = True
10	-
11	# Prepare self-hosted JS code for embedding
12	GENERATED_FILES += ['selfhosted.out.h']
13	selfhosted = GENERATED_FILES['selfhosted.out.h']




     # basic stuff for everything
     'include_internal_video_render': 0,
     'clang_use_chrome_plugins': 0,
diff --git media/webrtc/signaling/test/common.build media/webrtc/signaling/test/common.build
index b483cd1..f1dd1f0 100644
--- media/webrtc/signaling/test/common.build
+++ media/webrtc/signaling/test/common.build
@@ -99,6 +99,7 @@ if CONFIG['JS_SHARED_LIBRARY']:
 
 USE_LIBS += ['mozglue']
 
+OS_LIBS += CONFIG['MOZ_LIBV4L2_LIBS']
 OS_LIBS += CONFIG['MOZ_WEBRTC_X11_LIBS']
 OS_LIBS += CONFIG['REALTIME_LIBS']
 
diff --git media/webrtc/trunk/webrtc/modules/video_capture/linux/device_info_linux.cc media/webrtc/trunk/webrtc/modules/video_capture/linux/device_info_linux.cc
index 239a292..bab496c 100644
--- media/webrtc/trunk/webrtc/modules/video_capture/linux/device_info_linux.cc

Lines 261-267 index 9297e4d6f501..d8e273887e4b 100644 Link Here

(-)b/www/firefox/files/patch-bug847568 (-1 / +1 lines)
261	+option('--with-system-harfbuzz',	261	+option('--with-system-harfbuzz',
262	+ help="Use system harfbuzz (located with pkgconfig)")	262	+ help="Use system harfbuzz (located with pkgconfig)")
263	+	263	+
264	+system_harfbuzz = pkg_check_modules('MOZ_HARFBUZZ', 'harfbuzz >= 1.4.3',	264	+system_harfbuzz = pkg_check_modules('MOZ_HARFBUZZ', 'harfbuzz >= 1.4.6',
265	+ when='--with-system-harfbuzz')	265	+ when='--with-system-harfbuzz')
266	+	266	+
267	+set_config('MOZ_SYSTEM_HARFBUZZ', depends_if(system_harfbuzz)(lambda _: True))	267	+set_config('MOZ_SYSTEM_HARFBUZZ', depends_if(system_harfbuzz)(lambda _: True))




diff --git dom/system/OSFileConstants.cpp dom/system/OSFileConstants.cpp
index 88bba9baa401..99f240952dfe 100644
--- dom/system/OSFileConstants.cpp
+++ dom/system/OSFileConstants.cpp
@@ -16,14 +16,17 @@
 #include "dirent.h"
 #include "poll.h"
 #include "sys/stat.h"
-#if defined(ANDROID)
+#if defined(XP_LINUX)
 #include <sys/vfs.h>
 #define statvfs statfs
+#define f_frsize f_bsize
 #else
 #include "sys/statvfs.h"
+#endif // defined(XP_LINUX)
+#if !defined(ANDROID)
 #include "sys/wait.h"
 #include <spawn.h>
-#endif // defined(ANDROID)
+#endif // !defined(ANDROID)
 #endif // defined(XP_UNIX)
 
 #if defined(XP_LINUX)
@@ -699,7 +702,7 @@ static const dom::ConstantSpec gLibcProperties[] =
 
   { "OSFILE_SIZEOF_STATVFS", JS::Int32Value(sizeof (struct statvfs)) },
 
-  { "OSFILE_OFFSETOF_STATVFS_F_BSIZE", JS::Int32Value(offsetof (struct statvfs, f_bsize)) },
+  { "OSFILE_OFFSETOF_STATVFS_F_FRSIZE", JS::Int32Value(offsetof (struct statvfs, f_frsize)) },
   { "OSFILE_OFFSETOF_STATVFS_F_BAVAIL", JS::Int32Value(offsetof (struct statvfs, f_bavail)) },
 
 #endif // defined(XP_UNIX)
diff --git toolkit/components/osfile/modules/osfile_unix_back.jsm toolkit/components/osfile/modules/osfile_unix_back.jsm
index a028dda7d5ec..f5c632e3d7e5 100644
--- toolkit/components/osfile/modules/osfile_unix_back.jsm
+++ toolkit/components/osfile/modules/osfile_unix_back.jsm
@@ -228,8 +228,8 @@
          let statvfs = new SharedAll.HollowStructure("statvfs",
            Const.OSFILE_SIZEOF_STATVFS);
 
-         statvfs.add_field_at(Const.OSFILE_OFFSETOF_STATVFS_F_BSIZE,
-                        "f_bsize", Type.unsigned_long.implementation);
+         statvfs.add_field_at(Const.OSFILE_OFFSETOF_STATVFS_F_FRSIZE,
+                        "f_frsize", Type.unsigned_long.implementation);
          statvfs.add_field_at(Const.OSFILE_OFFSETOF_STATVFS_F_BAVAIL,
                         "f_bavail", Type.fsblkcnt_t.implementation);
 
diff --git toolkit/components/osfile/modules/osfile_unix_front.jsm toolkit/components/osfile/modules/osfile_unix_front.jsm
index bd60d4d8419c..a8cd6b546b0e 100644
--- toolkit/components/osfile/modules/osfile_unix_front.jsm
+++ toolkit/components/osfile/modules/osfile_unix_front.jsm
@@ -399,7 +399,7 @@
        throw_on_negative("statvfs",  (UnixFile.statvfs || UnixFile.statfs)(sourcePath, fileSystemInfoPtr));
 
        let bytes = new Type.uint64_t.implementation(
-                        fileSystemInfo.f_bsize * fileSystemInfo.f_bavail);
+                        fileSystemInfo.f_frsize * fileSystemInfo.f_bavail);
 
        return bytes.value;
      };




--- python/futures/concurrent/futures/process.py.orig	2017-04-11 04:15:19 UTC
+++ python/futures/concurrent/futures/process.py
@@ -247,7 +247,11 @@ def _check_system_limits():
     _system_limits_checked = True
     try:
         import os
-        nsems_max = os.sysconf("SC_SEM_NSEMS_MAX")
+        if sys.platform.startswith('freebsd'):
+            # sem(4) confuses sysconf(3) on FreeBSD < 11.1
+            nsems_max = -1
+        else:
+            nsems_max = os.sysconf("SC_SEM_NSEMS_MAX")
     except (AttributeError, ValueError):
         # sysconf not available or setting not available
         return




Revert bug 1284816, bug 1341967, bug 1336153 to postpone bustage on non-x86 archs.

diff --git browser/confvars.sh browser/confvars.sh
index d8dcd99c2757..740d9d3e5fcf 100755

     if not rustc_info:
         die(dedent('''\
         Rust compiler not found.
@@ -97,6 +110,9 @@ def rust_compiler(rustc_info, cargo_info):
 
     return True
 
+set_define('MOZ_RUST', rust_compiler)
+set_config('MOZ_RUST', rust_compiler)
+
 @template
 def rust_triple_alias(host_or_target):
     """Template defining the alias used for rustc's --target flag.
@@ -227,7 +243,8 @@ set_config('RUST_HOST_TARGET', rust_host_triple)
 
 @depends(rust_target_triple)
 def rust_target_env_name(triple):
-    return triple.upper().replace('-','_')
+    if triple:
+        return triple.upper().replace('-','_')
 
 # We need this to form various Cargo environment variables, as there is no
 # uppercase function in make, and we don't want to shell out just for
@@ -235,5 +252,6 @@ def rust_target_env_name(triple):
 set_config('RUST_TARGET_ENV_NAME', rust_target_env_name)
 
 # Until we remove all the other Rust checks in old-configure.
+add_old_configure_assignment('MOZ_RUST', rust_compiler)
 add_old_configure_assignment('RUSTC', rustc)
 add_old_configure_assignment('RUST_TARGET', rust_target_triple)
diff --git config/rules.mk config/rules.mk
index 94cc5556e3d0..7b143ebc5146 100644
--- config/rules.mk
+++ config/rules.mk
@@ -900,6 +900,7 @@ endif
 
 $(foreach file,$(DUMP_SYMS_TARGETS),$(eval $(call syms_template,$(file),$(file)_syms.track)))
 
+ifdef MOZ_RUST
 cargo_host_flag := --target=$(RUST_HOST_TARGET)
 cargo_target_flag := --target=$(RUST_TARGET)
 
@@ -1055,6 +1056,7 @@ force-cargo-host-program-build:
 
 $(HOST_RUST_PROGRAMS): force-cargo-host-program-build
 endif # HOST_RUST_PROGRAMS
+endif # MOZ_RUST
 
 $(SOBJS):
 	$(REPORT_BUILD)
diff --git dom/media/MediaPrefs.h dom/media/MediaPrefs.h
index 4dcc659222a4..559334d89fd1 100644
--- dom/media/MediaPrefs.h
+++ dom/media/MediaPrefs.h
@@ -183,7 +183,7 @@ private:
   DECL_MEDIA_PREF("media.ogg.flac.enabled",                   FlacInOgg, bool, false);
   DECL_MEDIA_PREF("media.flac.enabled",                       FlacEnabled, bool, true);
 

   DECL_MEDIA_PREF("media.rust.test_mode",                     RustTestMode, bool, false);
 #endif
 
diff --git dom/media/gtest/moz.build dom/media/gtest/moz.build
index c66ac4a9437f..e2203c0a4321 100644
--- dom/media/gtest/moz.build
+++ dom/media/gtest/moz.build
@@ -22,7 +22,6 @@ UNIFIED_SOURCES += [
     'TestMozPromise.cpp',
     'TestMP3Demuxer.cpp',
     'TestMP4Demuxer.cpp',
-    'TestRust.cpp',
     'TestTrackEncoder.cpp',
     'TestVideoSegment.cpp',
     'TestVideoUtils.cpp',
@@ -36,6 +35,9 @@ if CONFIG['MOZ_WEBM_ENCODER']:
         'TestWebMWriter.cpp',
     ]
 
+if CONFIG['MOZ_RUST']:
+    UNIFIED_SOURCES += ['TestRust.cpp',]
+
 TEST_HARNESS_FILES.gtest += [
     '../test/gizmo-frag.mp4',
     '../test/gizmo.mp4',
diff --git media/libcubeb/src/moz.build media/libcubeb/src/moz.build
index c65b53b80f63..8953f646e831 100644
--- media/libcubeb/src/moz.build
+++ media/libcubeb/src/moz.build
@@ -32,7 +32,8 @@ if CONFIG['MOZ_PULSEAUDIO']:
         'cubeb_pulse.c',
     ]
     DEFINES['USE_PULSE'] = True
-    DEFINES['USE_PULSE_RUST'] = True
+    if CONFIG['MOZ_RUST']:
+        DEFINES['USE_PULSE_RUST'] = True
 
 if CONFIG['MOZ_JACK']:
     SOURCES += [
diff --git media/libstagefright/binding/DecoderData.cpp media/libstagefright/binding/DecoderData.cpp
index 109ea329d154..a06e533b1e62 100644
--- media/libstagefright/binding/DecoderData.cpp

+#endif // MOZ_RUST_MP4PARSE
 
 using namespace stagefright;
 using mozilla::media::TimeUnit;
@@ -177,6 +179,7 @@ MP4VideoInfo::Update(const MetaData* aMetaData, const char* aMimeType)
   FindData(aMetaData, kKeyAVCC, mExtraData);
 }
 
+#ifdef MOZ_RUST_MP4PARSE
 static void
 UpdateTrackProtectedInfo(mozilla::TrackInfo& aConfig,
                          const mp4parse_sinf_info& aSinf)
@@ -263,6 +266,7 @@ MP4VideoInfo::Update(const mp4parse_track_info* track,
     mExtraData->AppendElements(video->extra_data.data, video->extra_data.length);
   }
 }

index 5c3810d99a38..5d14dfd8b8a9 100644
--- media/libstagefright/binding/MP4Metadata.cpp
+++ media/libstagefright/binding/MP4Metadata.cpp
@@ -20,14 +20,18 @@
 #include "mp4_demuxer/MP4Metadata.h"
 #include "mp4_demuxer/Stream.h"
 #include "MediaPrefs.h"

+#endif // MOZ_RUST_MP4PARSE
 
 using namespace stagefright;
 using mozilla::media::TimeUnit;
@@ -105,6 +109,7 @@ private:
   bool mCanSeek;
 };
 

 // Wrap an mp4_demuxer::Stream to remember the read offset.
 
 class RustStreamAdaptor {
@@ -151,6 +156,7 @@ private:
   RustStreamAdaptor mRustSource;
   mozilla::UniquePtr<mp4parse_parser, FreeMP4Parser> mRustParser;
 };
+#endif // MOZ_RUST_MP4PARSE
 
 class IndiceWrapperStagefright : public IndiceWrapper {
 public:
@@ -187,6 +193,7 @@ IndiceWrapperStagefright::GetIndice(size_t aIndex, Index::Indice& aIndice) const
   return true;
 }
 
+#ifdef MOZ_RUST_MP4PARSE
 // the owner of mIndice is rust mp4 paser, so lifetime of this class
 // SHOULD NOT longer than rust parser.
 class IndiceWrapperRust : public IndiceWrapper
@@ -232,9 +239,11 @@ IndiceWrapperRust::GetIndice(size_t aIndex, Index::Indice& aIndice) const
   aIndice.sync = indice->sync;
   return true;
 }
+#endif // MOZ_RUST_MP4PARSE
 
 MP4Metadata::MP4Metadata(Stream* aSource)
  : mStagefright(MakeUnique<MP4MetadataStagefright>(aSource))
+#ifdef MOZ_RUST_MP4PARSE
  , mRust(MakeUnique<MP4MetadataRust>(aSource))
  , mPreferRust(MediaPrefs::EnableRustMP4Parser())
  , mReportedAudioTrackTelemetry(false)
@@ -242,6 +251,7 @@ MP4Metadata::MP4Metadata(Stream* aSource)
 #ifndef RELEASE_OR_BETA
  , mRustTestMode(MediaPrefs::RustTestMode())
 #endif

 {
 }
 
@@ -274,8 +284,11 @@ MP4Metadata::GetNumberTracks(mozilla::TrackInfo::TrackType aType) const
   MP4Metadata::ResultAndTrackCount numTracks =
     mStagefright->GetNumberTracks(aType);
 
+#ifdef MOZ_RUST_MP4PARSE
   if (!mRust) {
+#endif // MOZ_RUST_MP4PARSE
     return numTracks;
+#ifdef MOZ_RUST_MP4PARSE
   }
@@ -211,10 +219,12 @@ MP4Metadata::GetNumberTracks(mozilla::TrackInfo::TrackType aType) const
     mPreferRust = true;
     return numTracksRust;
   }
+#endif // MOZ_RUST_MP4PARSE
 
   MP4Metadata::ResultAndTrackCount numTracksRust =
@@ -350,8 +363,10 @@ MP4Metadata::GetNumberTracks(mozilla::TrackInfo::TrackType aType) const
   // Same non-error numbers, just return any.
   // (Choosing Rust here, in case it carries a warning, we'd want to know that.)
   return numTracksRust;
+#endif // MOZ_RUST_MP4PARSE
 }
 
+#ifdef MOZ_RUST_MP4PARSE
 bool MP4Metadata::ShouldPreferRust() const {
   if (!mRust) {
     return false;
@@ -389,6 +404,7 @@ bool MP4Metadata::ShouldPreferRust() const {
   // Otherwise, fall back.
   return false;
 }
+#endif // MOZ_RUST_MP4PARSE
 
 static const char*
 GetDifferentField(const mozilla::TrackInfo& info,
@@ -443,6 +459,7 @@ MP4Metadata::GetTrackInfo(mozilla::TrackInfo::TrackType aType,
   MP4Metadata::ResultAndTrackInfo info =
     mStagefright->GetTrackInfo(aType, aTrackNumber);
 
+#ifdef MOZ_RUST_MP4PARSE
   if (!mRust) {
     return info;
   }
@@ -514,6 +531,7 @@ MP4Metadata::GetTrackInfo(mozilla::TrackInfo::TrackType aType,
   if (mPreferRust) {
     return infoRust;
   }

 
   return info;
 }
@@ -528,6 +546,7 @@ MP4Metadata::ResultAndCryptoFile
 MP4Metadata::Crypto() const
 {
   MP4Metadata::ResultAndCryptoFile crypto = mStagefright->Crypto();
+#ifdef MOZ_RUST_MP4PARSE
   MP4Metadata::ResultAndCryptoFile rustCrypto = mRust->Crypto();
 
 #ifndef RELEASE_OR_BETA
@@ -548,6 +567,7 @@ MP4Metadata::Crypto() const
   if (mPreferRust) {
     return rustCrypto;
   }

 
   return crypto;
 }
@@ -556,17 +576,22 @@ MP4Metadata::ResultAndIndice
 MP4Metadata::GetTrackIndice(mozilla::TrackID aTrackID)
 {
   FallibleTArray<Index::Indice> indiceSF;
+#ifdef MOZ_RUST_MP4PARSE
   if (!mPreferRust
 #ifndef RELEASE_OR_BETA
       || mRustTestMode
 #endif
      ) {
+#endif // MOZ_RUST_MP4PARSE
     MediaResult rv = mStagefright->ReadTrackIndex(indiceSF, aTrackID);
     if (NS_FAILED(rv)) {
       return {Move(rv), nullptr};
     }
+#ifdef MOZ_RUST_MP4PARSE
   }
+#endif // MOZ_RUST_MP4PARSE
 
+#ifdef MOZ_RUST_MP4PARSE
   mp4parse_byte_data indiceRust = {};
   if (mPreferRust
 #ifndef RELEASE_OR_BETA
@@ -592,13 +617,18 @@ MP4Metadata::GetTrackIndice(mozilla::TrackID aTrackID)
     }
   }
 #endif
+#endif // MOZ_RUST_MP4PARSE
 
   UniquePtr<IndiceWrapper> indice;
+#ifdef MOZ_RUST_MP4PARSE
   if (mPreferRust) {
     indice = mozilla::MakeUnique<IndiceWrapperRust>(indiceRust);
   } else {
+#endif // MOZ_RUST_MP4PARSE
     indice = mozilla::MakeUnique<IndiceWrapperStagefright>(indiceSF);
+#ifdef MOZ_RUST_MP4PARSE
   }
+#endif // MOZ_RUST_MP4PARSE
 
   return {NS_OK, Move(indice)};
 }
@@ -856,6 +886,7 @@ MP4MetadataStagefright::Metadata(Stream* aSource)
   return {NS_OK, Move(buffer)};
 }
 
+#ifdef MOZ_RUST_MP4PARSE
 bool
 RustStreamAdaptor::Read(uint8_t* buffer, uintptr_t size, size_t* bytes_read)
 {
@@ -1152,5 +1183,6 @@ MP4MetadataRust::Metadata(Stream* aSource)
   MOZ_ASSERT(false, "Not yet implemented");
   return {NS_ERROR_NOT_IMPLEMENTED, nullptr};
 }
+#endif // MOZ_RUST_MP4PARSE
 

index 492c9c1c1bc3..e16dbbd1155e 100644
--- media/libstagefright/binding/include/mp4_demuxer/MP4Metadata.h
+++ media/libstagefright/binding/include/mp4_demuxer/MP4Metadata.h
@@ -13,7 +13,9 @@
 #include "MediaInfo.h"
 #include "MediaResult.h"
 #include "Stream.h"
+#ifdef MOZ_RUST_MP4PARSE
 #include "mp4parse.h"
+#endif // MOZ_RUST_MP4PARSE
 
 namespace mp4_demuxer {
 
@@ -82,6 +84,7 @@ public:
 
 private:
   UniquePtr<MP4MetadataStagefright> mStagefright;

   UniquePtr<MP4MetadataRust> mRust;
   mutable bool mPreferRust;
   mutable bool mReportedAudioTrackTelemetry;
@@ -90,6 +93,7 @@ private:
   mutable bool mRustTestMode;
 #endif
   bool ShouldPreferRust() const;

 };
 
 } // namespace mp4_demuxer
diff --git media/libstagefright/gtest/moz.build media/libstagefright/gtest/moz.build
index be4d56fc93f7..66fdd365f8f3 100644
--- media/libstagefright/gtest/moz.build
+++ media/libstagefright/gtest/moz.build
@@ -38,12 +38,13 @@ TEST_HARNESS_FILES.gtest += [
     'test_case_1351094.mp4',
 ]
 
-UNIFIED_SOURCES += ['TestMP4Rust.cpp',]
-TEST_HARNESS_FILES.gtest += [
-    '../../../dom/media/test/street.mp4',
-]
-LOCAL_INCLUDES += [
-    '../binding/include',
-]
+if CONFIG['MOZ_RUST']:
+    UNIFIED_SOURCES += ['TestMP4Rust.cpp',]
+    TEST_HARNESS_FILES.gtest += [
+        '../../../dom/media/test/street.mp4',
+    ]
+    LOCAL_INCLUDES += [
+        '../binding/include',
+    ]
 
 FINAL_LIBRARY = 'xul-gtest'
diff --git media/libstagefright/moz.build media/libstagefright/moz.build
index af5d1194d621..6725a0179989 100644
--- media/libstagefright/moz.build
+++ media/libstagefright/moz.build
@@ -83,9 +83,10 @@ SOURCES += [
     'system/core/libutils/VectorImpl.cpp',
 ]
 
-EXPORTS += [
-    'binding/include/mp4parse.h',
-]
+if CONFIG['MOZ_RUST']:
+    EXPORTS += [
+        'binding/include/mp4parse.h',
+    ]
 
 UNIFIED_SOURCES += [
     'binding/Adts.cpp',
diff --git mobile/android/confvars.sh mobile/android/confvars.sh
index e79b6f5c0707..eb62763acaf7 100644
--- mobile/android/confvars.sh

 # use custom widget for html:select
 MOZ_USE_NATIVE_POPUP_WINDOWS=1
 
diff --git netwerk/base/moz.build netwerk/base/moz.build
index 61d022a9660e..e5ca1d77d859 100644
--- netwerk/base/moz.build
+++ netwerk/base/moz.build
@@ -256,7 +256,7 @@ UNIFIED_SOURCES += [
     'TLSServerSocket.cpp',
 ]
 
-if CONFIG['MOZ_RUST_URLPARSE']:
+if CONFIG['MOZ_RUST'] and CONFIG['MOZ_RUST_URLPARSE']:
     EXPORTS.mozilla.net += [ 'RustURL.h' ]
     UNIFIED_SOURCES += [ 'RustURL.cpp' ]
 
diff --git netwerk/base/nsStandardURL.cpp netwerk/base/nsStandardURL.cpp
index 608b918a4ecf..20bcdeb34ab8 100644
--- netwerk/base/nsStandardURL.cpp
+++ netwerk/base/nsStandardURL.cpp
@@ -858,6 +858,7 @@ nsStandardURL::BuildNormalizedSpec(const char *spec)
         if (!SegmentIs(spec, mScheme, "resource") &&
             !SegmentIs(spec, mScheme, "chrome")) {
             nsAutoCString ipString;
+#ifdef MOZ_RUST
             if (encHost.Length() > 0 &&
                 encHost.First() == '[' && encHost.Last() == ']' &&
                 ValidIPv6orHostname(encHost.get(), encHost.Length())) {
@@ -866,7 +867,9 @@ nsStandardURL::BuildNormalizedSpec(const char *spec)
                     return rv;
                 }
                 encHost = ipString;
-            } else if (NS_SUCCEEDED(NormalizeIPv4(encHost, ipString))) {
+            } else
+#endif
+            if (NS_SUCCEEDED(NormalizeIPv4(encHost, ipString))) {
                 encHost = ipString;
             }
         }
@@ -2112,6 +2115,7 @@ nsStandardURL::SetHost(const nsACString &input)
 
     if (!SegmentIs(mScheme, "resource") && !SegmentIs(mScheme, "chrome")) {
         nsAutoCString ipString;
+#ifdef MOZ_RUST
         if (hostBuf.Length() > 0 &&
             hostBuf.First() == '[' && hostBuf.Last() == ']' &&
             ValidIPv6orHostname(hostBuf.get(), hostBuf.Length())) {
@@ -2120,7 +2124,9 @@ nsStandardURL::SetHost(const nsACString &input)
                 return rv;
             }
             hostBuf = ipString;
-        } else if (NS_SUCCEEDED(NormalizeIPv4(hostBuf, ipString))) {
+        } else
+#endif
+        if (NS_SUCCEEDED(NormalizeIPv4(hostBuf, ipString))) {
           hostBuf = ipString;
         }
     }
diff --git old-configure.in old-configure.in
index 717a94fcc692..54b29d737cc1 100644
--- old-configure.in
+++ old-configure.in
@@ -2330,9 +2330,14 @@ if test -n "$MOZ_MULET"; then
 fi
 
 # Propagate feature switches for code written in rust from confvars.sh
-if test -n "$MOZ_RUST_URLPARSE"; then
-    AC_DEFINE(MOZ_RUST_URLPARSE)
-    AC_SUBST(MOZ_RUST_URLPARSE)
+if test -n "$MOZ_RUST"; then
+    if test -n "$MOZ_RUST_MP4PARSE"; then
+        AC_DEFINE(MOZ_RUST_MP4PARSE)
+    fi
+    if test -n "$MOZ_RUST_URLPARSE"; then
+        AC_DEFINE(MOZ_RUST_URLPARSE)
+        AC_SUBST(MOZ_RUST_URLPARSE)
+    fi
 fi
 
 AC_SUBST(MOZ_PHOENIX)
diff --git toolkit/components/telemetry/Histograms.json toolkit/components/telemetry/Histograms.json
index 061c55f6a5b6..e49dfd176952 100644
--- toolkit/components/telemetry/Histograms.json
+++ toolkit/components/telemetry/Histograms.json
@@ -8320,7 +8320,8 @@
     "expires_in_version": "60",
     "kind": "boolean",
     "bug_numbers": [1220885],
-    "description": "Whether the rust mp4 demuxer successfully parsed a stream segment."
+    "description": "Whether the rust mp4 demuxer successfully parsed a stream segment.",
+    "cpp_guard": "MOZ_RUST_MP4PARSE"
   },
   "MEDIA_RUST_MP4PARSE_ERROR_CODE": {
     "record_in_processes": ["main", "content"],
@@ -8329,7 +8330,8 @@
     "kind": "enumerated",
     "n_values": 32,
     "bug_numbers": [1238420],

+    "cpp_guard": "MOZ_RUST_MP4PARSE"
   },
   "MEDIA_RUST_MP4PARSE_TRACK_MATCH_AUDIO": {
     "record_in_processes": ["main", "content"],
@@ -8337,7 +8339,8 @@
     "expires_in_version": "60",
     "kind": "boolean",
     "bug_numbers": [1231169],
-    "description": "Whether rust and stagefight mp4 parser audio track results match."

+    "cpp_guard": "MOZ_RUST_MP4PARSE"
   },
   "MEDIA_RUST_MP4PARSE_TRACK_MATCH_VIDEO": {
     "record_in_processes": ["main", "content"],
@@ -8345,7 +8348,8 @@
     "expires_in_version": "60",
     "kind": "boolean",
     "bug_numbers": [1231169],
-    "description": "Whether rust and stagefight mp4 parser video track results match."

+    "cpp_guard": "MOZ_RUST_MP4PARSE"
   },
   "MEDIA_WMF_DECODE_ERROR": {
     "record_in_processes": ["main", "content", "gpu"],
diff --git toolkit/library/gtest/moz.build toolkit/library/gtest/moz.build
index 69a8fb1f4893..c684f48e456e 100644
--- toolkit/library/gtest/moz.build
+++ toolkit/library/gtest/moz.build
@@ -7,7 +7,6 @@
 FINAL_TARGET = 'dist/bin/gtest'
 
 USE_LIBS += [
-    'gkrust-gtest',
     'static:xul',
     # xul-gtest is an intermediate static library. It is used as FINAL_TARGET
     # for gtest code.
@@ -21,6 +20,11 @@ USE_LIBS += [
 # before StaticXULComponentStart.
 Libxul('xul-gtest-real')
 
+if CONFIG['MOZ_RUST']:
+    USE_LIBS += [
+        'gkrust-gtest',
+    ]
+
 DIRS += [
     'static',
 ]
diff --git toolkit/library/moz.build toolkit/library/moz.build
index 650f6eaba980..191e90ceb09a 100644
--- toolkit/library/moz.build
+++ toolkit/library/moz.build
@@ -63,7 +63,7 @@ def Libxul(name):
 
     # This option should go away in bug 1290972, but we need to wait until
     # Rust 1.12 has been released.
-    if CONFIG['OS_ARCH'] == 'Darwin':
+    if CONFIG['MOZ_RUST'] and CONFIG['OS_ARCH'] == 'Darwin':
         LDFLAGS += ['-Wl,-no_compact_unwind']
 
 Libxul('xul')
@@ -343,4 +343,5 @@ USE_LIBS += ['StaticXULComponentsEnd']
 # The above library needs to be last for C++ purposes.  This library,
 # however, is entirely composed of Rust code, and needs to come after
 # all the C++ code so any possible C++ -> Rust calls can be resolved.
-USE_LIBS += ['gkrust']
+if CONFIG['MOZ_RUST']:
+    USE_LIBS += ['gkrust']
diff --git toolkit/moz.configure toolkit/moz.configure
index ac9d123224ce..e90da70f0fa5 100644
--- toolkit/moz.configure
+++ toolkit/moz.configure
@@ -88,8 +88,7 @@ include('../js/moz.configure')
 
 # Rust
 # ==============================================================
-include('../build/moz.configure/rust.configure',
-        when='--enable-compile-environment')
+include('../build/moz.configure/rust.configure')
 
 
 # L10N
@@ -623,13 +622,13 @@ id_and_secret_keyfile('Leanplum SDK')
 option('--enable-stylo', nargs='?', choices=('build',),
        help='Include Stylo in the build and/or enable it at runtime')
 
-@depends('--enable-stylo')
-def stylo_config(value):
+@depends('--enable-stylo', '--enable-rust')
+def stylo_config(value, rust_enabled):
     build_stylo = None
     enable_stylo = None
 
     # The default is to not build Stylo at all.
-    if value.origin == 'default':
+    if not rust_enabled or value.origin == 'default':
         pass
     elif value == 'build':
         build_stylo = True
@@ -769,12 +768,14 @@ set_config('SERVO_TARGET_DIR', servo_target_dir)
 option('--enable-webrender', nargs='?', choices=('build',),
        help='Include WebRender in the build and/or enable it at runtime')
 
-@depends('--enable-webrender', milestone)
-def webrender(value, milestone):
+@depends('--enable-webrender', '--enable-rust', milestone)
+def webrender(value, rust_enabled, milestone):
     build_webrender = None
     enable_webrender = None
 
-    if value.origin == 'default':
+    if not rust_enabled:
+        pass
+    elif value.origin == 'default':
         # if nothing is specified, default to just building on Nightly
         build_webrender = milestone.is_nightly
     elif value == 'build':
diff --git toolkit/toolkit.mozbuild toolkit/toolkit.mozbuild
index b845aab48023..9215afc6dd2d 100644
--- toolkit/toolkit.mozbuild
+++ toolkit/toolkit.mozbuild
@@ -133,16 +133,23 @@ if CONFIG['MOZ_PREF_EXTENSIONS']:
 
 DIRS += [
     '/devtools',
-    '/toolkit/library',
-    '/toolkit/library/gtest/rust',
-    '/toolkit/library/rust',
-    '/toolkit/library/StaticXULComponentsEnd',
     '/services',
     '/startupcache',
     '/js/ductwork/debugger',
     '/other-licenses/snappy',
 ]
 
+if CONFIG['MOZ_RUST']:
+    DIRS += [
+        '/toolkit/library/gtest/rust',
+        '/toolkit/library/rust',
+    ]
+
+DIRS += [
+    '/toolkit/library/StaticXULComponentsEnd',
+    '/toolkit/library',
+]
+
 if 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
     DIRS += ['/toolkit/system/gnome']
 
diff --git toolkit/xre/nsAppRunner.cpp toolkit/xre/nsAppRunner.cpp
index 667c2eb1b365..6fb6cf102baa 100644
--- toolkit/xre/nsAppRunner.cpp
+++ toolkit/xre/nsAppRunner.cpp
@@ -227,11 +227,13 @@
 extern uint32_t gRestartMode;
 extern void InstallSignalHandlers(const char *ProgramName);
 
+#ifdef MOZ_RUST
 // This workaround is fixed in Rust 1.19. For details, see bug 1358151.
 // Implementation in toolkit/library/rust/shared/lib.rs
 extern "C" {
   void rust_init_please_remove_this_after_updating_rust_1_19();
 }
+#endif
 
 #define FILE_COMPATIBILITY_INFO NS_LITERAL_CSTRING("compatibility.ini")
 #define FILE_INVALIDATE_CACHES NS_LITERAL_CSTRING(".purgecaches")
@@ -3122,8 +3124,10 @@ XREMain::XRE_mainInit(bool* aExitFlag)
     return 1;
   *aExitFlag = false;
 
+#ifdef MOZ_RUST
   // This workaround is fixed in Rust 1.19. For details, see bug 1358151.
   rust_init_please_remove_this_after_updating_rust_1_19();
+#endif
 
   atexit(UnexpectedExit);
   auto expectedShutdown = mozilla::MakeScopeExit([&] {
diff --git xpcom/base/nsDebugImpl.cpp xpcom/base/nsDebugImpl.cpp
index e6bb623c258b..c49d61dce605 100644
--- xpcom/base/nsDebugImpl.cpp
+++ xpcom/base/nsDebugImpl.cpp
@@ -148,14 +148,20 @@ nsDebugImpl::Abort(const char* aFile, int32_t aLine)
   return NS_OK;
 }
 
+#ifdef MOZ_RUST
 // From toolkit/library/rust/lib.rs
 extern "C" void intentional_panic(const char* message);
+#endif
 
 NS_IMETHODIMP
 nsDebugImpl::RustPanic(const char* aMessage)
 {
+#ifdef MOZ_RUST
   intentional_panic(aMessage);
   return NS_OK;
+#else
+  return NS_ERROR_NOT_IMPLEMENTED;
+#endif
 }
 
 NS_IMETHODIMP
diff --git xpcom/rust/nsstring/gtest/moz.build xpcom/rust/nsstring/gtest/moz.build
index 197411678815..5bed9e57e57d 100644
--- xpcom/rust/nsstring/gtest/moz.build
+++ xpcom/rust/nsstring/gtest/moz.build
@@ -4,8 +4,9 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-UNIFIED_SOURCES += [
-    'Test.cpp'
-]
+if CONFIG['MOZ_RUST']:
+    UNIFIED_SOURCES += [
+        'Test.cpp'
+    ]
 
 FINAL_LIBRARY = 'xul-gtest'




--- third_party/python/futures/concurrent/futures/process.py.orig	2017-04-11 04:15:19 UTC
+++ third_party/python/futures/concurrent/futures/process.py
@@ -247,7 +247,11 @@ def _check_system_limits():
     _system_limits_checked = True
     try:
         import os
-        nsems_max = os.sysconf("SC_SEM_NSEMS_MAX")
+        if sys.platform.startswith('freebsd'):
+            # sem(4) confuses sysconf(3) on FreeBSD < 11.1
+            nsems_max = -1
+        else:
+            nsems_max = os.sysconf("SC_SEM_NSEMS_MAX")
     except (AttributeError, ValueError):
         # sysconf not available or setting not available
         return

Return to bug 219963

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 54	40	_GECKO_VERSIONS= 52 55
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	54_DEPENDS= ${LOCALBASE}/lib/firefox/firefox:www/firefox	45	55_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 2-8 Link Here

(-)b/www/firefox/Makefile (-5 / +6 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= firefox	4	PORTNAME= firefox
5	DISTVERSION= 54.0.1	5	DISTVERSION= 55.0b6
6	DISTVERSIONSUFFIX=.source	6	DISTVERSIONSUFFIX=.source
7	PORTREVISION= 1	7	PORTREVISION= 1
8	PORTEPOCH= 1	8	PORTEPOCH= 1
Lines 13-27 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ Link Here
13	MAINTAINER= gecko@FreeBSD.org	13	MAINTAINER= gecko@FreeBSD.org
14	COMMENT= Web browser based on the browser portion of Mozilla	14	COMMENT= Web browser based on the browser portion of Mozilla
15		15
16	BUILD_DEPENDS= nspr>=4.14:devel/nspr \	16	BUILD_DEPENDS= nspr>=4.15:devel/nspr \
17	nss>=3.30.2:security/nss \	17	nss>=3.31:security/nss \
18	libevent>=2.0.22:devel/libevent \	18	libevent>=2.0.22:devel/libevent \
19	harfbuzz>=1.4.3:print/harfbuzz \	19	harfbuzz>=1.4.6:print/harfbuzz \
20	graphite2>=1.3.10:graphics/graphite2 \	20	graphite2>=1.3.10:graphics/graphite2 \
21	png>=1.6.28:graphics/png \	21	png>=1.6.28:graphics/png \
22	libvorbis>=1.3.5,3:audio/libvorbis \	22	libvorbis>=1.3.5,3:audio/libvorbis \
23	libvpx>=1.5.0:multimedia/libvpx \	23	libvpx>=1.5.0:multimedia/libvpx \
24	sqlite3>=3.17.0:databases/sqlite3 \	24	sqlite3>=3.19.2:databases/sqlite3 \
25	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 \	25	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 \
26	v4l_compat>0:multimedia/v4l_compat \	26	v4l_compat>0:multimedia/v4l_compat \
27	autoconf-2.13:devel/autoconf213 \	27	autoconf-2.13:devel/autoconf213 \
Lines 47-52 MOZ_OPTIONS= --enable-application=browser \ Link Here
47		47
48	OPTIONS_DEFINE= RUST	48	OPTIONS_DEFINE= RUST
49	OPTIONS_DEFAULT= BUNDLED_CAIRO	49	OPTIONS_DEFAULT= BUNDLED_CAIRO
		50	OPTIONS_EXCLUDE= GNOMEUI
50	# XXX lang/rust and devel/cargo currently build only on these platforms	51	# XXX lang/rust and devel/cargo currently build only on these platforms
51	OPTIONS_DEFAULT_aarch64=RUST	52	OPTIONS_DEFAULT_aarch64=RUST
52	OPTIONS_DEFAULT_amd64= RUST	53	OPTIONS_DEFAULT_amd64= RUST

Lines 122-128 index 57bcb4c13652..68be024f4a68 100644 Link Here

(-)b/www/firefox/files/patch-bug1021761 (-22 / +18 lines)
122		122
123	static int	123	static int
124	validate_stream_params(cubeb_stream_params * input_stream_params,	124	validate_stream_params(cubeb_stream_params * input_stream_params,
125	@@ -138,6 +141,9 @@ cubeb_init(cubeb ** context, char const * context_name)	125	@@ -155,6 +158,10 @@ cubeb_init(cubeb ** context, char const * context_name, char const * backend_nam
		126	#if defined(USE_KAI)
		127	init_oneshot = kai_init;
		128	#endif
		129	+ } else if (!strcmp(backend_name, "oss")) {
		130	+#if defined(USE_OSS)
		131	+ init_oneshot = oss_init;
		132	+#endif
		133	} else {
		134	/* Already set */
		135	}
		136	@@ -196,6 +203,9 @@ cubeb_init(cubeb ** context, char const * context_name, char const * backend_nam
126	#if defined(USE_KAI)	137	#if defined(USE_KAI)
127	kai_init,	138	kai_init,
128	#endif	139	#endif
Lines 246-252 index 05ad27fef53b..3ea78e994f59 100644 Link Here
246	+ char * buftail = stm->buffer + WRAP(snd_pcm_frames_to_bytes)(stm->pcm, stm->bufframes);	257	+ char * buftail = stm->buffer + WRAP(snd_pcm_frames_to_bytes)(stm->pcm, stm->bufframes);
247		258
248	/* Correct read size to the other stream available frames */	259	/* Correct read size to the other stream available frames */
249	if (stm->other_stream && got > stm->other_stream->bufframes) {	260	if (stm->other_stream && got > (snd_pcm_sframes_t) stm->other_stream->bufframes) {
250	@@ -372,8 +421,8 @@ alsa_process_stream(cubeb_stream * stm)	261	@@ -372,8 +421,8 @@ alsa_process_stream(cubeb_stream * stm)
251	long drain_frames = avail - stm->bufframes;	262	long drain_frames = avail - stm->bufframes;
252	double drain_time = (double) drain_frames / stm->params.rate;	263	double drain_time = (double) drain_frames / stm->params.rate;
Lines 579-585 index 05ad27fef53b..3ea78e994f59 100644 Link Here
579	+ r = WRAP(snd_pcm_poll_descriptors)(stm->pcm, stm->saved_fds, stm->nfds);	590	+ r = WRAP(snd_pcm_poll_descriptors)(stm->pcm, stm->saved_fds, stm->nfds);
580	assert((nfds_t) r == stm->nfds);	591	assert((nfds_t) r == stm->nfds);
581		592
582	r = pthread_cond_init(&stm->cond, NULL);	593	if (alsa_register_stream(ctx, stm) != 0) {
583	@@ -1048,7 +1156,7 @@ alsa_stream_destroy(cubeb_stream * stm)	594	@@ -1048,7 +1156,7 @@ alsa_stream_destroy(cubeb_stream * stm)
584	pthread_mutex_lock(&stm->mutex);	595	pthread_mutex_lock(&stm->mutex);
585	if (stm->pcm) {	596	if (stm->pcm) {
Lines 1182-1210 diff --git media/libcubeb/update.sh media/libcubeb/update.sh Link Here
1182	index b139b8f497fd..d1f8a223c6d8 100755	1193	index b139b8f497fd..d1f8a223c6d8 100755
1183	--- media/libcubeb/update.sh	1194	--- media/libcubeb/update.sh
1184	+++ media/libcubeb/update.sh	1195	+++ media/libcubeb/update.sh
1185	@@ -17,6 +17,7 @@ cp $1/src/cubeb_audiounit.cpp src	1196	@@ -20,6 +20,7 @@ cp $1/src/cubeb_log.h src
1186	cp $1/src/cubeb_osx_run_loop.h src	1197	cp $1/src/cubeb_mixer.cpp src
1187	cp $1/src/cubeb_jack.cpp src	1198	cp $1/src/cubeb_mixer.h src
1188	cp $1/src/cubeb_opensl.c src	1199	cp $1/src/cubeb_opensl.c src
1189	+cp $1/src/cubeb_oss.c src	1200	+cp $1/src/cubeb_oss.c src
1190	cp $1/src/cubeb_array_queue.h src	1201	cp $1/src/cubeb_osx_run_loop.h src
1191	cp $1/src/cubeb_panner.cpp src	1202	cp $1/src/cubeb_panner.cpp src
1192	cp $1/src/cubeb_panner.h src	1203	cp $1/src/cubeb_panner.h src
1193	diff --git media/webrtc/signaling/test/common.build media/webrtc/signaling/test/common.build
1194	index 3e5450f5d63a..dd45427f655a 100644
1195	--- media/webrtc/signaling/test/common.build
1196	+++ media/webrtc/signaling/test/common.build
1197	@@ -99,8 +99,8 @@ USE_LIBS += ['mozglue']
1198	OS_LIBS += CONFIG['MOZ_WEBRTC_X11_LIBS']
1199	OS_LIBS += CONFIG['REALTIME_LIBS']
1200
1201	-if CONFIG['MOZ_ALSA']:
1202	- OS_LIBS += CONFIG['MOZ_ALSA_LIBS']
1203	+if CONFIG['MOZ_OSS']:
1204	+ OS_LIBS += CONFIG['MOZ_OSS_LIBS']
1205
1206	if CONFIG['MOZ_SYSTEM_JPEG']:
1207	OS_LIBS += CONFIG['MOZ_JPEG_LIBS']
1208	diff --git toolkit/library/moz.build toolkit/library/moz.build	1204	diff --git toolkit/library/moz.build toolkit/library/moz.build
1209	index a61c689c83c3..7764df6f8a6b 100644	1205	index a61c689c83c3..7764df6f8a6b 100644
1210	--- toolkit/library/moz.build	1206	--- toolkit/library/moz.build

Removed Link Here

(-)a/www/firefox/files/patch-bug1356709 (-170 lines)
1	commit acc36099bfc1
2	Author: Steve Fink <sfink@mozilla.com>
3	Date: Mon Apr 17 21:04:08 2017 -0700
4
5	Bug 1356709 - Fix uses of uninitialized values in arm64 code, r=sstangl
6
7	--HG--
8	extra : rebase_source : 2f9a59c88f21dd467fbc4232e2f6b20850fd53ed
9	extra : histedit_source : b5110806cf04a3ca056ea89709bcc707368a2e57
10	---
11	js/src/jit/arm64/MacroAssembler-arm64.cpp \| 4 +++-
12	js/src/jit/arm64/vixl/Debugger-vixl.cpp \| 10 ++++++----
13	js/src/jit/arm64/vixl/Decoder-vixl.cpp \| 12 ++++++------
14	js/src/jit/arm64/vixl/Instrument-vixl.cpp \| 4 +++-
15	js/src/jit/arm64/vixl/MozSimulator-vixl.cpp \| 8 ++++++--
16	5 files changed, 24 insertions(+), 14 deletions(-)
17
18	diff --git js/src/jit/arm64/MacroAssembler-arm64.cpp js/src/jit/arm64/MacroAssembler-arm64.cpp
19	index 013fefd85e9b..f1704c622cb6 100644
20	--- js/src/jit/arm64/MacroAssembler-arm64.cpp
21	+++ js/src/jit/arm64/MacroAssembler-arm64.cpp
22	@@ -682,7 +682,9 @@ MacroAssembler::callWithABIPre(uint32_t* stackAdjust, bool callFromWasm)
23	*stackAdjust = stackForCall;
24	reserveStack(*stackAdjust);
25	{
26	- moveResolver_.resolve();
27	+ enoughMemory_ &= moveResolver_.resolve();
28	+ if (!enoughMemory_)
29	+ return;
30	MoveEmitter emitter(*this);
31	emitter.emit(moveResolver_);
32	emitter.finish();
33	diff --git js/src/jit/arm64/vixl/Debugger-vixl.cpp js/src/jit/arm64/vixl/Debugger-vixl.cpp
34	index 85097ed5a086..2f4966fbef15 100644
35	--- js/src/jit/arm64/vixl/Debugger-vixl.cpp
36	+++ js/src/jit/arm64/vixl/Debugger-vixl.cpp
37	@@ -30,6 +30,7 @@
38
39	#include "jit/arm64/vixl/Debugger-vixl.h"
40
41	+#include "mozilla/Unused.h"
42	#include "mozilla/Vector.h"
43
44	#include "jsalloc.h"
45	@@ -1109,6 +1110,7 @@ bool DebugCommand::Match(const char* name, const char** aliases) {
46
47
48	DebugCommand* DebugCommand::Parse(char* line) {
49	+ using mozilla::Unused;
50	TokenVector args;
51
52	for (char* chunk = strtok(line, " \t");
53	@@ -1120,15 +1122,15 @@ DebugCommand* DebugCommand::Parse(char* line) {
54	Token* format = FormatToken::Tokenize(dot + 1);
55	if (format != NULL) {
56	*dot = '\0';
57	- args.append(Token::Tokenize(chunk));
58	- args.append(format);
59	+ Unused << args.append(Token::Tokenize(chunk));
60	+ Unused << args.append(format);
61	} else {
62	// Error while parsing the format, push the UnknownToken so an error
63	// can be accurately reported.
64	- args.append(Token::Tokenize(chunk));
65	+ Unused << args.append(Token::Tokenize(chunk));
66	}
67	} else {
68	- args.append(Token::Tokenize(chunk));
69	+ Unused << args.append(Token::Tokenize(chunk));
70	}
71	}
72
73	diff --git js/src/jit/arm64/vixl/Decoder-vixl.cpp js/src/jit/arm64/vixl/Decoder-vixl.cpp
74	index 5865689ae6fa..c74f71a11b24 100644
75	--- js/src/jit/arm64/vixl/Decoder-vixl.cpp
76	+++ js/src/jit/arm64/vixl/Decoder-vixl.cpp
77	@@ -112,12 +112,12 @@ void Decoder::DecodeInstruction(const Instruction *instr) {
78	}
79
80	void Decoder::AppendVisitor(DecoderVisitor* new_visitor) {
81	- visitors_.append(new_visitor);
82	+ MOZ_ALWAYS_TRUE(visitors_.append(new_visitor));
83	}
84
85
86	void Decoder::PrependVisitor(DecoderVisitor* new_visitor) {
87	- visitors_.insert(visitors_.begin(), new_visitor);
88	+ MOZ_ALWAYS_TRUE(visitors_.insert(visitors_.begin(), new_visitor));
89	}
90
91
92	@@ -125,12 +125,12 @@ void Decoder::InsertVisitorBefore(DecoderVisitor* new_visitor,
93	DecoderVisitor* registered_visitor) {
94	for (auto it = visitors_.begin(); it != visitors_.end(); it++) {
95	if (*it == registered_visitor) {
96	- visitors_.insert(it, new_visitor);
97	+ MOZ_ALWAYS_TRUE(visitors_.insert(it, new_visitor));
98	return;
99	}
100	}
101	// We reached the end of the list without finding registered_visitor.
102	- visitors_.append(new_visitor);
103	+ MOZ_ALWAYS_TRUE(visitors_.append(new_visitor));
104	}
105
106
107	@@ -139,12 +139,12 @@ void Decoder::InsertVisitorAfter(DecoderVisitor* new_visitor,
108	for (auto it = visitors_.begin(); it != visitors_.end(); it++) {
109	if (*it == registered_visitor) {
110	it++;
111	- visitors_.insert(it, new_visitor);
112	+ MOZ_ALWAYS_TRUE(visitors_.insert(it, new_visitor));
113	return;
114	}
115	}
116	// We reached the end of the list without finding registered_visitor.
117	- visitors_.append(new_visitor);
118	+ MOZ_ALWAYS_TRUE(visitors_.append(new_visitor));
119	}
120
121
122	diff --git js/src/jit/arm64/vixl/Instrument-vixl.cpp js/src/jit/arm64/vixl/Instrument-vixl.cpp
123	index 7653e0856281..15d143c8ec13 100644
124	--- js/src/jit/arm64/vixl/Instrument-vixl.cpp
125	+++ js/src/jit/arm64/vixl/Instrument-vixl.cpp
126	@@ -26,6 +26,8 @@
127
128	#include "jit/arm64/vixl/Instrument-vixl.h"
129
130	+#include "mozilla/Unused.h"
131	+
132	namespace vixl {
133
134	Counter::Counter(const char* name, CounterType type)
135	@@ -139,7 +141,7 @@ Instrument::Instrument(const char* datafile, uint64_t sample_period)
136	// Construct Counter objects from counter description array.
137	for (int i = 0; i < num_counters; i++) {
138	if (Counter* counter = js_new<Counter>(kCounterList[i].name, kCounterList[i].type))
139	- counters_.append(counter);
140	+ mozilla::Unused << counters_.append(counter);
141	}
142
143	DumpCounterNames();
144	diff --git js/src/jit/arm64/vixl/MozSimulator-vixl.cpp js/src/jit/arm64/vixl/MozSimulator-vixl.cpp
145	index 0f8acebf9de6..284413bc5875 100644
146	--- js/src/jit/arm64/vixl/MozSimulator-vixl.cpp
147	+++ js/src/jit/arm64/vixl/MozSimulator-vixl.cpp
148	@@ -29,6 +29,7 @@
149	#include "jit/arm64/vixl/Debugger-vixl.h"
150	#include "jit/arm64/vixl/Simulator-vixl.h"
151	#include "jit/IonTypes.h"
152	+#include "js/Utility.h"
153	#include "threading/LockGuard.h"
154	#include "vm/Runtime.h"
155	#include "wasm/WasmCode.h"
156	@@ -427,9 +428,12 @@ void Simulator::VisitException(const Instruction* instr) {
157	case kCallRtRedirected:
158	VisitCallRedirection(instr);
159	return;
160	- case kMarkStackPointer:
161	- spStack_.append(xreg(31, Reg31IsStackPointer));
162	+ case kMarkStackPointer: {
163	+ js::AutoEnterOOMUnsafeRegion oomUnsafe;
164	+ if (!spStack_.append(xreg(31, Reg31IsStackPointer)))
165	+ oomUnsafe.crash("tracking stack for ARM64 simulator");
166	return;
167	+ }
168	case kCheckStackPointer: {
169	int64_t current = xreg(31, Reg31IsStackPointer);
170	int64_t expected = spStack_.popCopy();

Removed Link Here

(-)a/www/firefox/files/patch-bug1357874 (-43 lines)
1	commit 50d30e203b35
2	Author: Jim Chen <nchen@mozilla.com>
3	Date: Mon May 1 14:46:00 2017 -0400
4
5	Bug 1357874 - Add more AArch64 support to JS code; r=luke
6
7	* Fix a parentheses warning when compiling testGCAllocator.cpp.
8
9	* Enable trace logging in TraceLogging.cpp.
10	---
11	js/src/jsapi-tests/testGCAllocator.cpp \| 2 +-
12	js/src/jsmath.cpp \| 2 ++
13	js/src/jsnativestack.cpp \| 10 +++++-----
14	js/src/vm/TraceLogging.cpp \| 2 +-
15	js/src/wasm/WasmSignalHandlers.cpp \| 2 ++
16	5 files changed, 11 insertions(+), 7 deletions(-)
17
18	diff --git js/src/jsapi-tests/testGCAllocator.cpp js/src/jsapi-tests/testGCAllocator.cpp
19	index 229e56422fdf..ec5407e8cca1 100644
20	--- js/src/jsapi-tests/testGCAllocator.cpp
21	+++ js/src/jsapi-tests/testGCAllocator.cpp
22	@@ -315,7 +315,7 @@ mapMemoryAt(void* desired, size_t length)
23
24	#if defined(__ia64__) \|\| defined(__aarch64__) \|\| \
25	(defined(__sparc__) && defined(__arch64__) && (defined(__NetBSD__) \|\| defined(__linux__)))
26	- MOZ_RELEASE_ASSERT(0xffff800000000000ULL & (uintptr_t(desired) + length - 1) == 0);
27	+ MOZ_RELEASE_ASSERT((0xffff800000000000ULL & (uintptr_t(desired) + length - 1)) == 0);
28	#endif
29	void* region = mmap(desired, length, PROT_READ \| PROT_WRITE, MAP_PRIVATE \| MAP_ANON, -1, 0);
30	if (region == MAP_FAILED)
31	diff --git js/src/vm/TraceLogging.cpp js/src/vm/TraceLogging.cpp
32	index c7bc6a84b2e9..82fdf7c77e8a 100644
33	--- js/src/vm/TraceLogging.cpp
34	+++ js/src/vm/TraceLogging.cpp
35	@@ -61,7 +61,7 @@ rdtsc(void)
36	return result;
37
38	}
39	-#elif defined(__arm__)
40	+#elif defined(__arm__) \|\| defined(__aarch64__)
41
42	#include <sys/time.h>
43

Removed Link Here

(-)a/www/firefox/files/patch-bug1360321 (-49 lines)
1	commit a2dff5ad917b
2	Author: Jim Chen <nchen@mozilla.com>
3	Date: Wed May 17 13:06:23 2017 -0400
4
5	Bug 1360321 - 10. Fix opt build warnings in VIXL; r=me
6
7	Fix an unused variable warning for `visitor` because it's only used in
8	the assertion macro.
9
10	Fix several no-return-value errors because the compiler cannot assume
11	the VIXL_UNREACHABLE() macro is actually unreachable.
12
13	r=me for trivial patch.
14
15	MozReview-Commit-ID: 13IlMyUsXUN
16	---
17	js/src/jit/arm64/vixl/Decoder-vixl.h \| 2 ++
18	js/src/jit/arm64/vixl/Globals-vixl.h \| 2 +-
19	2 files changed, 3 insertions(+), 1 deletion(-)
20
21	diff --git js/src/jit/arm64/vixl/Decoder-vixl.h js/src/jit/arm64/vixl/Decoder-vixl.h
22	index 95dd589e8ab0..742c6f954c72 100644
23	--- js/src/jit/arm64/vixl/Decoder-vixl.h
24	+++ js/src/jit/arm64/vixl/Decoder-vixl.h
25	@@ -151,9 +151,11 @@ class Decoder {
26
27	// Top-level wrappers around the actual decoding function.
28	void Decode(const Instruction* instr) {
29	+#ifdef DEBUG
30	for (auto visitor : visitors_) {
31	VIXL_ASSERT(visitor->IsConstVisitor());
32	}
33	+#endif
34	DecodeInstruction(instr);
35	}
36	void Decode(Instruction* instr) {
37	diff --git js/src/jit/arm64/vixl/Globals-vixl.h js/src/jit/arm64/vixl/Globals-vixl.h
38	index 8a7418eb8c47..39d9c1d3f37d 100644
39	--- js/src/jit/arm64/vixl/Globals-vixl.h
40	+++ js/src/jit/arm64/vixl/Globals-vixl.h
41	@@ -76,7 +76,7 @@ const int MBytes = 1024 * KBytes;
42	#define VIXL_ASSERT(condition) ((void) 0)
43	#define VIXL_CHECK(condition) ((void) 0)
44	#define VIXL_UNIMPLEMENTED() ((void) 0)
45	- #define VIXL_UNREACHABLE() ((void) 0)
46	+ #define VIXL_UNREACHABLE() MOZ_MAKE_COMPILER_ASSUME_IS_UNREACHABLE()
47	#endif
48	// This is not as powerful as template based assertions, but it is simple.
49	// It assumes that the descriptions are unique. If this starts being a problem,

Lines 51-68 index b483cd1..f1dd1f0 100644 Link Here

(-)b/www/firefox/files/patch-bug826985 (-12 lines)
51	# basic stuff for everything	51	# basic stuff for everything
52	'include_internal_video_render': 0,	52	'include_internal_video_render': 0,
53	'clang_use_chrome_plugins': 0,	53	'clang_use_chrome_plugins': 0,
54	diff --git media/webrtc/signaling/test/common.build media/webrtc/signaling/test/common.build
55	index b483cd1..f1dd1f0 100644
56	--- media/webrtc/signaling/test/common.build
57	+++ media/webrtc/signaling/test/common.build
58	@@ -99,6 +99,7 @@ if CONFIG['JS_SHARED_LIBRARY']:
59
60	USE_LIBS += ['mozglue']
61
62	+OS_LIBS += CONFIG['MOZ_LIBV4L2_LIBS']
63	OS_LIBS += CONFIG['MOZ_WEBRTC_X11_LIBS']
64	OS_LIBS += CONFIG['REALTIME_LIBS']
65
66	diff --git media/webrtc/trunk/webrtc/modules/video_capture/linux/device_info_linux.cc media/webrtc/trunk/webrtc/modules/video_capture/linux/device_info_linux.cc	54	diff --git media/webrtc/trunk/webrtc/modules/video_capture/linux/device_info_linux.cc media/webrtc/trunk/webrtc/modules/video_capture/linux/device_info_linux.cc
67	index 239a292..bab496c 100644	55	index 239a292..bab496c 100644
68	--- media/webrtc/trunk/webrtc/modules/video_capture/linux/device_info_linux.cc	56	--- media/webrtc/trunk/webrtc/modules/video_capture/linux/device_info_linux.cc

Removed Link Here

(-)a/www/firefox/files/patch-bug981348 (-61 lines)
1	diff --git dom/system/OSFileConstants.cpp dom/system/OSFileConstants.cpp
2	index 88bba9baa401..99f240952dfe 100644
3	--- dom/system/OSFileConstants.cpp
4	+++ dom/system/OSFileConstants.cpp
5	@@ -16,14 +16,17 @@
6	#include "dirent.h"
7	#include "poll.h"
8	#include "sys/stat.h"
9	-#if defined(ANDROID)
10	+#if defined(XP_LINUX)
11	#include <sys/vfs.h>
12	#define statvfs statfs
13	+#define f_frsize f_bsize
14	#else
15	#include "sys/statvfs.h"
16	+#endif // defined(XP_LINUX)
17	+#if !defined(ANDROID)
18	#include "sys/wait.h"
19	#include <spawn.h>
20	-#endif // defined(ANDROID)
21	+#endif // !defined(ANDROID)
22	#endif // defined(XP_UNIX)
23
24	#if defined(XP_LINUX)
25	@@ -699,7 +702,7 @@ static const dom::ConstantSpec gLibcProperties[] =
26
27	{ "OSFILE_SIZEOF_STATVFS", JS::Int32Value(sizeof (struct statvfs)) },
28
29	- { "OSFILE_OFFSETOF_STATVFS_F_BSIZE", JS::Int32Value(offsetof (struct statvfs, f_bsize)) },
30	+ { "OSFILE_OFFSETOF_STATVFS_F_FRSIZE", JS::Int32Value(offsetof (struct statvfs, f_frsize)) },
31	{ "OSFILE_OFFSETOF_STATVFS_F_BAVAIL", JS::Int32Value(offsetof (struct statvfs, f_bavail)) },
32
33	#endif // defined(XP_UNIX)
34	diff --git toolkit/components/osfile/modules/osfile_unix_back.jsm toolkit/components/osfile/modules/osfile_unix_back.jsm
35	index a028dda7d5ec..f5c632e3d7e5 100644
36	--- toolkit/components/osfile/modules/osfile_unix_back.jsm
37	+++ toolkit/components/osfile/modules/osfile_unix_back.jsm
38	@@ -228,8 +228,8 @@
39	let statvfs = new SharedAll.HollowStructure("statvfs",
40	Const.OSFILE_SIZEOF_STATVFS);
41
42	- statvfs.add_field_at(Const.OSFILE_OFFSETOF_STATVFS_F_BSIZE,
43	- "f_bsize", Type.unsigned_long.implementation);
44	+ statvfs.add_field_at(Const.OSFILE_OFFSETOF_STATVFS_F_FRSIZE,
45	+ "f_frsize", Type.unsigned_long.implementation);
46	statvfs.add_field_at(Const.OSFILE_OFFSETOF_STATVFS_F_BAVAIL,
47	"f_bavail", Type.fsblkcnt_t.implementation);
48
49	diff --git toolkit/components/osfile/modules/osfile_unix_front.jsm toolkit/components/osfile/modules/osfile_unix_front.jsm
50	index bd60d4d8419c..a8cd6b546b0e 100644
51	--- toolkit/components/osfile/modules/osfile_unix_front.jsm
52	+++ toolkit/components/osfile/modules/osfile_unix_front.jsm
53	@@ -399,7 +399,7 @@
54	throw_on_negative("statvfs", (UnixFile.statvfs \|\| UnixFile.statfs)(sourcePath, fileSystemInfoPtr));
55
56	let bytes = new Type.uint64_t.implementation(
57	- fileSystemInfo.f_bsize * fileSystemInfo.f_bavail);
58	+ fileSystemInfo.f_frsize * fileSystemInfo.f_bavail);
59
60	return bytes.value;
61	};

Removed Link Here

(-)a/www/firefox/files/patch-python_futures_concurrent_futures_process.py (-15 lines)
1	--- python/futures/concurrent/futures/process.py.orig 2017-04-11 04:15:19 UTC
2	+++ python/futures/concurrent/futures/process.py
3	@@ -247,7 +247,11 @@ def _check_system_limits():
4	_system_limits_checked = True
5	try:
6	import os
7	- nsems_max = os.sysconf("SC_SEM_NSEMS_MAX")
8	+ if sys.platform.startswith('freebsd'):
9	+ # sem(4) confuses sysconf(3) on FreeBSD < 11.1
10	+ nsems_max = -1
11	+ else:
12	+ nsems_max = os.sysconf("SC_SEM_NSEMS_MAX")
13	except (AttributeError, ValueError):
14	# sysconf not available or setting not available
15	return

Added Link Here

(-)b/www/firefox/files/patch-third__party_python_futures_concurrent_futures_process.py (+15 lines)
1	--- third_party/python/futures/concurrent/futures/process.py.orig 2017-04-11 04:15:19 UTC
2	+++ third_party/python/futures/concurrent/futures/process.py
3	@@ -247,7 +247,11 @@ def _check_system_limits():
4	_system_limits_checked = True
5	try:
6	import os
7	- nsems_max = os.sysconf("SC_SEM_NSEMS_MAX")
8	+ if sys.platform.startswith('freebsd'):
9	+ # sem(4) confuses sysconf(3) on FreeBSD < 11.1
10	+ nsems_max = -1
11	+ else:
12	+ nsems_max = os.sysconf("SC_SEM_NSEMS_MAX")
13	except (AttributeError, ValueError):
14	# sysconf not available or setting not available
15	return