Attachment #187899 for bug #223425




.elif ${gecko_ARGS:Mfirefox}

_GECKO_DEFAULT_VERSION=	52
_GECKO_VERSIONS=		52 58
_GECKO_TYPE=	firefox

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

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




MESA_LLVM_VER?=	40
BUILD_DEPENDS+=	llvm${MESA_LLVM_VER}>0:devel/llvm${MESA_LLVM_VER}
MOZ_EXPORT+=	LLVM_CONFIG=llvm-config${MESA_LLVM_VER}
MOZ_EXPORT+=	BINDGEN_CFLAGS="${BINDGEN_CFLAGS}"
# XXX bug 1341234
. if ! ${USE_MOZILLA:M-nspr}
BINDGEN_CFLAGS+=-isystem${LOCALBASE}/include/nspr
. endif
. if ! ${USE_MOZILLA:M-pixman}
BINDGEN_CFLAGS+=-isystem${LOCALBASE}/include/pixman-1
. endif
.endif

.if ${OPSYS} == FreeBSD && ${OSREL} == 11.1




# $FreeBSD$

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


EXTRACT_DEPENDS=	zip:archivers/zip

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

NO_ARCH=	yes




TIMESTAMP = 1510249816
SHA256 (xpi/firefox-i18n-58.0b2/ach.xpi) = 9c0f8e2ddfdb192884a7d2df2745d26d1f7075ef785ac5024327864faf17908a
SIZE (xpi/firefox-i18n-58.0b2/ach.xpi) = 439563
SHA256 (xpi/firefox-i18n-58.0b2/af.xpi) = 0417273b1076a107230f0e6a1460f72abad677012c544803afd16ac7c53e1be7
SIZE (xpi/firefox-i18n-58.0b2/af.xpi) = 440336
SHA256 (xpi/firefox-i18n-58.0b2/an.xpi) = b68201b8d52492e43c9141f294575d9ba01c2c55fe0b0c0f38ce20783559463e
SIZE (xpi/firefox-i18n-58.0b2/an.xpi) = 461261
SHA256 (xpi/firefox-i18n-58.0b2/ar.xpi) = 4efe22fc01787e6e74c84a10833afff4d30dbbf40c96a3600537dcb84b673283
SIZE (xpi/firefox-i18n-58.0b2/ar.xpi) = 486293
SHA256 (xpi/firefox-i18n-58.0b2/as.xpi) = 82ad9c0c5393ea45c118465c086a6b4c726ff1be9fe1f7da7066b2b008a30f33
SIZE (xpi/firefox-i18n-58.0b2/as.xpi) = 488400
SHA256 (xpi/firefox-i18n-58.0b2/ast.xpi) = c4cf2ed6cab0fed9d7eee261c4fa71056f91041e3090cbbbaa0c7815d82c1c8e
SIZE (xpi/firefox-i18n-58.0b2/ast.xpi) = 453991
SHA256 (xpi/firefox-i18n-58.0b2/az.xpi) = d2b7e82733a9cfe39d0e760bd9161254542a4f8f71e9da2f77d2dff6b28f3aba
SIZE (xpi/firefox-i18n-58.0b2/az.xpi) = 464224
SHA256 (xpi/firefox-i18n-58.0b2/be.xpi) = db3827489e85965170d70febc0501978c6c32af281381478316b343e35eff41f
SIZE (xpi/firefox-i18n-58.0b2/be.xpi) = 513458
SHA256 (xpi/firefox-i18n-58.0b2/bg.xpi) = 013a7e576674587f7986d7166e9ba0345ce519753e66848b34868ca21e9cf358
SIZE (xpi/firefox-i18n-58.0b2/bg.xpi) = 507599
SHA256 (xpi/firefox-i18n-58.0b2/bn-BD.xpi) = 750d45a619b5587f9719f41a33df737bb715907f272c0fd61074747730668d41
SIZE (xpi/firefox-i18n-58.0b2/bn-BD.xpi) = 523526
SHA256 (xpi/firefox-i18n-58.0b2/bn-IN.xpi) = a41a67431d89c9afa82a63296664869673d5f1c58feea28ca620aca6cf9c35d7
SIZE (xpi/firefox-i18n-58.0b2/bn-IN.xpi) = 513909
SHA256 (xpi/firefox-i18n-58.0b2/br.xpi) = 046cb24047296930fcff0c53b57655df39a68754a8c7935f561e3a8d41aed548
SIZE (xpi/firefox-i18n-58.0b2/br.xpi) = 450485
SHA256 (xpi/firefox-i18n-58.0b2/bs.xpi) = 13c16f908ea44672596227ae9fb4abd7ca07a48fbe32a818500d3421dbdb514d
SIZE (xpi/firefox-i18n-58.0b2/bs.xpi) = 457338
SHA256 (xpi/firefox-i18n-58.0b2/ca.xpi) = f6c3e0c79f85dd69242002e778d43735a02108c69f1edb525b46e09c2907c551
SIZE (xpi/firefox-i18n-58.0b2/ca.xpi) = 465419
SHA256 (xpi/firefox-i18n-58.0b2/cak.xpi) = 0472e55b4e6a900f86ff6d1a1a60f559e60a25bb924a22be09b0089296adcf86
SIZE (xpi/firefox-i18n-58.0b2/cak.xpi) = 473528
SHA256 (xpi/firefox-i18n-58.0b2/cs.xpi) = 7774695c23c30f9011ad18ce3432c40550a40bd6cedf2aa032efb87143d5548c
SIZE (xpi/firefox-i18n-58.0b2/cs.xpi) = 467108
SHA256 (xpi/firefox-i18n-58.0b2/cy.xpi) = b8a76cd7260e8dea55891a9f07c340d132a1b42c2c5a649a2b238efd757b888b
SIZE (xpi/firefox-i18n-58.0b2/cy.xpi) = 453428
SHA256 (xpi/firefox-i18n-58.0b2/da.xpi) = f09f9eafb6afe88929bfe3d242cd85c435c1a1166152249d033037985e462626
SIZE (xpi/firefox-i18n-58.0b2/da.xpi) = 446180
SHA256 (xpi/firefox-i18n-58.0b2/de.xpi) = adc3b4c71532c0dc9091f6ced7fa0eab929071040844d12f6774c467452ae0b3
SIZE (xpi/firefox-i18n-58.0b2/de.xpi) = 460350
SHA256 (xpi/firefox-i18n-58.0b2/dsb.xpi) = f13e0bed9deaa49e291dd3783a5dcba0da01926a3c8924d3746ee18f141a7bd1
SIZE (xpi/firefox-i18n-58.0b2/dsb.xpi) = 477055
SHA256 (xpi/firefox-i18n-58.0b2/el.xpi) = 5b5c6fa3b96bb178568ef65cd1e062de34e9f10ee7561b5f73e0aa010b70552e
SIZE (xpi/firefox-i18n-58.0b2/el.xpi) = 532669
SHA256 (xpi/firefox-i18n-58.0b2/en-GB.xpi) = 8fdb6489eeb7f955a18a5c696797496043126ecfb53da05564b69c172617036b
SIZE (xpi/firefox-i18n-58.0b2/en-GB.xpi) = 434662
SHA256 (xpi/firefox-i18n-58.0b2/en-US.xpi) = 1ab7096697b69df735ef54f49613241128b58f65e875240c2c8deed2cd33913e
SIZE (xpi/firefox-i18n-58.0b2/en-US.xpi) = 433788
SHA256 (xpi/firefox-i18n-58.0b2/en-ZA.xpi) = 37147ac7bc2cc6532ef015013fd2ada3ec06c4484a47c9642502511bad8829fc
SIZE (xpi/firefox-i18n-58.0b2/en-ZA.xpi) = 430617
SHA256 (xpi/firefox-i18n-58.0b2/eo.xpi) = 165eeaec626fbe5bfba5c66edb026a2b6c9770f729f5e9af52f92c44b21b1114
SIZE (xpi/firefox-i18n-58.0b2/eo.xpi) = 452524
SHA256 (xpi/firefox-i18n-58.0b2/es-AR.xpi) = 6e0bd89c3acd6dff7a8b0167294ceb1b162c905494b8447ecda586e42ad58bf9
SIZE (xpi/firefox-i18n-58.0b2/es-AR.xpi) = 460525
SHA256 (xpi/firefox-i18n-58.0b2/es-CL.xpi) = f9cc288342457a1b71d26d2a3673baf367e53c4b535abfc54d1b196ff481f35d
SIZE (xpi/firefox-i18n-58.0b2/es-CL.xpi) = 463236
SHA256 (xpi/firefox-i18n-58.0b2/es-ES.xpi) = 0a5ff36f211125f7f72f410b197a4908d3e1387818c8e53a415f9c0800167fb3
SIZE (xpi/firefox-i18n-58.0b2/es-ES.xpi) = 351168
SHA256 (xpi/firefox-i18n-58.0b2/es-MX.xpi) = 49900a9e3b2d5698a55bdb8d2af5143f092484b93f1126927e8f8525aba8a85c
SIZE (xpi/firefox-i18n-58.0b2/es-MX.xpi) = 465632
SHA256 (xpi/firefox-i18n-58.0b2/et.xpi) = 4719739d574331aefb18ad5ae9a9ea28ef99dec6f2fe6a462783f3d06f422228
SIZE (xpi/firefox-i18n-58.0b2/et.xpi) = 446122
SHA256 (xpi/firefox-i18n-58.0b2/eu.xpi) = 1eafa5cd50aa2d0bfb3d49d3b5bb49eecbf79fc1a976009531ad283371b7ef22
SIZE (xpi/firefox-i18n-58.0b2/eu.xpi) = 453444
SHA256 (xpi/firefox-i18n-58.0b2/fa.xpi) = 8496887eec8407491d376c6b216d795e72b5c1917cca658d89e0bf55b75dd38b
SIZE (xpi/firefox-i18n-58.0b2/fa.xpi) = 507922
SHA256 (xpi/firefox-i18n-58.0b2/ff.xpi) = b78ce1aa001d2f749d99ee38f3810ad9808e39253bf384f414b6f2046cece6bd
SIZE (xpi/firefox-i18n-58.0b2/ff.xpi) = 454190
SHA256 (xpi/firefox-i18n-58.0b2/fi.xpi) = 8264e12c4ab21c5901630e5435d2a1aacac408a11fc844c0c151804dec707689
SIZE (xpi/firefox-i18n-58.0b2/fi.xpi) = 444924
SHA256 (xpi/firefox-i18n-58.0b2/fr.xpi) = af8df2c2b68da0ab67321380b0ce2710b6526a04d117dc97941f5617e2c04c68
SIZE (xpi/firefox-i18n-58.0b2/fr.xpi) = 470430
SHA256 (xpi/firefox-i18n-58.0b2/fy-NL.xpi) = b4a171b58c18cbb4b998bd5b229a8d14aa12094a26d5600e1d59edaa0bdfc4c5
SIZE (xpi/firefox-i18n-58.0b2/fy-NL.xpi) = 462805
SHA256 (xpi/firefox-i18n-58.0b2/ga-IE.xpi) = 0d4ee269ec073f3844ae081aefd63dfa1037ae3ace10c7da1bc5f698c6fd3ca5
SIZE (xpi/firefox-i18n-58.0b2/ga-IE.xpi) = 475014
SHA256 (xpi/firefox-i18n-58.0b2/gd.xpi) = fd8bcda5a6d812ce18bab8a74e879c188a47b34173e5718b4d265f722ef52e08
SIZE (xpi/firefox-i18n-58.0b2/gd.xpi) = 462668
SHA256 (xpi/firefox-i18n-58.0b2/gl.xpi) = afd9597f435b1fb94395eaac06a50a6a6f6c1b3faffbab84b85b457cc56cf238
SIZE (xpi/firefox-i18n-58.0b2/gl.xpi) = 450097
SHA256 (xpi/firefox-i18n-58.0b2/gn.xpi) = fc659064a043cce3b91b566dd178970ba7d923a31fb99db3f896d0f857830f4a
SIZE (xpi/firefox-i18n-58.0b2/gn.xpi) = 471066
SHA256 (xpi/firefox-i18n-58.0b2/gu-IN.xpi) = d98372884f166246f6fa57dab6bea9144e9bc838173875ee507e2b2720cca781
SIZE (xpi/firefox-i18n-58.0b2/gu-IN.xpi) = 510559
SHA256 (xpi/firefox-i18n-58.0b2/he.xpi) = c29758ee2da9cf3004a5421254a73c19c3468c8e0359b9f973782daf5e108268
SIZE (xpi/firefox-i18n-58.0b2/he.xpi) = 470675
SHA256 (xpi/firefox-i18n-58.0b2/hi-IN.xpi) = 92c84332f921477239bd134bfbeccee5dd9c8b6d0fdff17da87eae874a6964b9
SIZE (xpi/firefox-i18n-58.0b2/hi-IN.xpi) = 523459
SHA256 (xpi/firefox-i18n-58.0b2/hr.xpi) = b4c1f3b48a056f662a82bf7241bd97a57413d79cb3106992f25bfa15f272b709
SIZE (xpi/firefox-i18n-58.0b2/hr.xpi) = 459322
SHA256 (xpi/firefox-i18n-58.0b2/hsb.xpi) = 41e370b82c3736b12f50683029a1ed75e9a458811b980bec6413d46a6b40974d
SIZE (xpi/firefox-i18n-58.0b2/hsb.xpi) = 474070
SHA256 (xpi/firefox-i18n-58.0b2/hu.xpi) = 4f2b06923f6c5027233868c196cb5964c9067908bbdc3121a78ba8abe0d4f8d7
SIZE (xpi/firefox-i18n-58.0b2/hu.xpi) = 474261
SHA256 (xpi/firefox-i18n-58.0b2/hy-AM.xpi) = 88b20967b9a69cbb1b76cd9f64832bfadc672626f2583f5a3debe25b589d2ace
SIZE (xpi/firefox-i18n-58.0b2/hy-AM.xpi) = 508558
SHA256 (xpi/firefox-i18n-58.0b2/id.xpi) = f9c1981249b5d0d5c53f3551361ed3d7aa96336364b64d4f6c083503f3ffafad
SIZE (xpi/firefox-i18n-58.0b2/id.xpi) = 441784
SHA256 (xpi/firefox-i18n-58.0b2/is.xpi) = 8760c6f34c218157d66d7170a52384e66c7f5061cacffddaa7a150f7a68d37b6
SIZE (xpi/firefox-i18n-58.0b2/is.xpi) = 451360
SHA256 (xpi/firefox-i18n-58.0b2/it.xpi) = 7ff8d5e881118a1dd0fef80a0856e1f5859476018b30cca66239cd9fabdb205b
SIZE (xpi/firefox-i18n-58.0b2/it.xpi) = 343816
SHA256 (xpi/firefox-i18n-58.0b2/ja.xpi) = 9067f819a6b36a91fb875705eef38a7566b9eee0ea17a901829213f4cd69e21e
SIZE (xpi/firefox-i18n-58.0b2/ja.xpi) = 507743
SHA256 (xpi/firefox-i18n-58.0b2/ka.xpi) = 787b5a6811cd827426143b2d86733484a95cbd2fb291d9cfdba9682b946a535d
SIZE (xpi/firefox-i18n-58.0b2/ka.xpi) = 489568
SHA256 (xpi/firefox-i18n-58.0b2/kab.xpi) = 5ce9bf9507fa98d3cad536d38772445f97aa9a0ed78295dc45303b19ea94792a
SIZE (xpi/firefox-i18n-58.0b2/kab.xpi) = 460087
SHA256 (xpi/firefox-i18n-58.0b2/kk.xpi) = 7beb6098ea3a72746a57c420e7839834b690654591e5c258717b54129f813672
SIZE (xpi/firefox-i18n-58.0b2/kk.xpi) = 516528
SHA256 (xpi/firefox-i18n-58.0b2/km.xpi) = bd0e1260987685d9b709567809144a7de6081f562651387fbb3a0100019d45b7
SIZE (xpi/firefox-i18n-58.0b2/km.xpi) = 527904
SHA256 (xpi/firefox-i18n-58.0b2/kn.xpi) = cd791cfdfd4be7f0e934695495e124a86e19b56d6a52de7a2fc0be559d8ba764
SIZE (xpi/firefox-i18n-58.0b2/kn.xpi) = 529226
SHA256 (xpi/firefox-i18n-58.0b2/ko.xpi) = d1420ac9eb9c85292abc5364f8a42b0082645ad7de4995c18de63076350c6cdf
SIZE (xpi/firefox-i18n-58.0b2/ko.xpi) = 484969
SHA256 (xpi/firefox-i18n-58.0b2/lij.xpi) = cd664977444310270bc66a44506226c35abedbfea0a0c3abc8a0a9c050c732e5
SIZE (xpi/firefox-i18n-58.0b2/lij.xpi) = 451154
SHA256 (xpi/firefox-i18n-58.0b2/lt.xpi) = e0ea6bb3cf083cd9e494aa6f0b0774ea014e64d0fcdcd835ad9be24a5da7b7c5
SIZE (xpi/firefox-i18n-58.0b2/lt.xpi) = 472453
SHA256 (xpi/firefox-i18n-58.0b2/lv.xpi) = 2e3f3d82b847d166b03e35ef111bc74c5a046e9b6dce4a66e2f9429c2d5683b1
SIZE (xpi/firefox-i18n-58.0b2/lv.xpi) = 464175
SHA256 (xpi/firefox-i18n-58.0b2/mai.xpi) = f37ff2537e39699073eca8672a76bf2ac2c677cdf2a224854af4c650617df952
SIZE (xpi/firefox-i18n-58.0b2/mai.xpi) = 505102
SHA256 (xpi/firefox-i18n-58.0b2/mk.xpi) = fc5c8de5d5bf4d2bffb0c601deacdad1b780e20677137912b15bbc74c0bc8484
SIZE (xpi/firefox-i18n-58.0b2/mk.xpi) = 487715
SHA256 (xpi/firefox-i18n-58.0b2/ml.xpi) = c3df73bc6879f30d5051e62a9ec94b102ce8a5f9f88810db4b477fe8a09d20e6
SIZE (xpi/firefox-i18n-58.0b2/ml.xpi) = 525614
SHA256 (xpi/firefox-i18n-58.0b2/mr.xpi) = 3c743fb1b6d56d996d9790b3ae4311589bcef6686ae763f7e8aad1f9e5c8082e
SIZE (xpi/firefox-i18n-58.0b2/mr.xpi) = 518657
SHA256 (xpi/firefox-i18n-58.0b2/ms.xpi) = 5b15097daa53b06c630c21957abb926db27bc82b90427d40f6d3885a0756c1c4
SIZE (xpi/firefox-i18n-58.0b2/ms.xpi) = 448890
SHA256 (xpi/firefox-i18n-58.0b2/my.xpi) = 114295e9a1487cfa934c5a4d188c89a8325c184240ed1a2e6ca36790e76040f7
SIZE (xpi/firefox-i18n-58.0b2/my.xpi) = 514445
SHA256 (xpi/firefox-i18n-58.0b2/nb-NO.xpi) = 557df95e0e6a4a694c8834608af935456dddbfcfd8d98d2269d3f04b38729a56
SIZE (xpi/firefox-i18n-58.0b2/nb-NO.xpi) = 449089
SHA256 (xpi/firefox-i18n-58.0b2/nl.xpi) = 4a66b72a5a686b4f712e9825d19c5612878076c04a1fc847ddd38fe30042f48c
SIZE (xpi/firefox-i18n-58.0b2/nl.xpi) = 455404
SHA256 (xpi/firefox-i18n-58.0b2/nn-NO.xpi) = f9c481ff7ea414d86ed6a40ac7261adc1e013fd2a05be0e5015146831a925e08
SIZE (xpi/firefox-i18n-58.0b2/nn-NO.xpi) = 449499
SHA256 (xpi/firefox-i18n-58.0b2/or.xpi) = 7b96d338a263e363bd3798020dd412de2350c0828f681cceb781d814004e5bf8
SIZE (xpi/firefox-i18n-58.0b2/or.xpi) = 498166
SHA256 (xpi/firefox-i18n-58.0b2/pa-IN.xpi) = 501ecc7f595a9958c74f5e9b46ff05ca0d9235152b0fde888d7c357ec2f95f66
SIZE (xpi/firefox-i18n-58.0b2/pa-IN.xpi) = 492762
SHA256 (xpi/firefox-i18n-58.0b2/pl.xpi) = d63aa36379058d3cbda747b5c931923f37e3315e27e60368aff5d0ca701d2e44
SIZE (xpi/firefox-i18n-58.0b2/pl.xpi) = 360821
SHA256 (xpi/firefox-i18n-58.0b2/pt-BR.xpi) = b6b4fd0d39df20c37e03b9736c61b8f2fe8869087cdaf4bbfddc9f7225a79abb
SIZE (xpi/firefox-i18n-58.0b2/pt-BR.xpi) = 453965
SHA256 (xpi/firefox-i18n-58.0b2/pt-PT.xpi) = e9119699d472afacb02da31d8e10fb2f5c0a8bef0922c845f808b939de450c8f
SIZE (xpi/firefox-i18n-58.0b2/pt-PT.xpi) = 457451
SHA256 (xpi/firefox-i18n-58.0b2/rm.xpi) = 198658cfb5ab006060cb71c4bae518a7c1d537fc4475b0f2c40006a1f7928850
SIZE (xpi/firefox-i18n-58.0b2/rm.xpi) = 450264
SHA256 (xpi/firefox-i18n-58.0b2/ro.xpi) = cd02479b4d898228b3d6e703a586dc12041bfe3b219d55bf8344a4440a237d71
SIZE (xpi/firefox-i18n-58.0b2/ro.xpi) = 453804
SHA256 (xpi/firefox-i18n-58.0b2/ru.xpi) = 6294795bdb45ff09acc5888b52d5a80db962d443447aa40bf47039eaadc04bdc
SIZE (xpi/firefox-i18n-58.0b2/ru.xpi) = 524303
SHA256 (xpi/firefox-i18n-58.0b2/si.xpi) = 0b74101080ecadadb159297ca418253f9923fc75a4eed300f976e11161d04e06
SIZE (xpi/firefox-i18n-58.0b2/si.xpi) = 495805
SHA256 (xpi/firefox-i18n-58.0b2/sk.xpi) = 1a53b25f652466f9ff7a7991c70c8e2fec9fc847ef8f6e3de8646dc20d91b7bf
SIZE (xpi/firefox-i18n-58.0b2/sk.xpi) = 478004
SHA256 (xpi/firefox-i18n-58.0b2/sl.xpi) = ed87503706f82f8bd01637c34f1124f528c1ffd3dc0180df4b64201799e45690
SIZE (xpi/firefox-i18n-58.0b2/sl.xpi) = 457328
SHA256 (xpi/firefox-i18n-58.0b2/son.xpi) = 478fb9c6741eb070286247fb7a20428487329b9c12cdb234804d336da92b2c35
SIZE (xpi/firefox-i18n-58.0b2/son.xpi) = 449684
SHA256 (xpi/firefox-i18n-58.0b2/sq.xpi) = aa5e739af9e0c3914058cb09ab37854e2332acd4ecf9c4a0f3f825b2518b959a
SIZE (xpi/firefox-i18n-58.0b2/sq.xpi) = 463898
SHA256 (xpi/firefox-i18n-58.0b2/sr.xpi) = 3783b3e82cac169c22bef3417a689de08edf229c4a6a24b04bbb3f9e643be5f6
SIZE (xpi/firefox-i18n-58.0b2/sr.xpi) = 484417
SHA256 (xpi/firefox-i18n-58.0b2/sv-SE.xpi) = 843f8a0d9add00abd8fd9181da970bbb9b06d83fc8c2a23b11e832c32aa55ee2
SIZE (xpi/firefox-i18n-58.0b2/sv-SE.xpi) = 457222
SHA256 (xpi/firefox-i18n-58.0b2/ta.xpi) = e595c485b9865e331aa6f4667862ed77272b7a21f0d870c28355aa664bfa3463
SIZE (xpi/firefox-i18n-58.0b2/ta.xpi) = 511180
SHA256 (xpi/firefox-i18n-58.0b2/te.xpi) = 5de1576a8dc218df80c278fbe8a8ded29d6073b956c9454e779258388195e9bc
SIZE (xpi/firefox-i18n-58.0b2/te.xpi) = 528612
SHA256 (xpi/firefox-i18n-58.0b2/th.xpi) = fcec636e807b07206e5c09b61c54b69092497b12aba527c27c6a1b91ee7d1779
SIZE (xpi/firefox-i18n-58.0b2/th.xpi) = 500354
SHA256 (xpi/firefox-i18n-58.0b2/tr.xpi) = b7b0a7ebf6a22c6e170341a430a9802c89e55493f669547a993b3b9db3fd0cd1
SIZE (xpi/firefox-i18n-58.0b2/tr.xpi) = 463130
SHA256 (xpi/firefox-i18n-58.0b2/uk.xpi) = 06a0e5c50799cdc8f6f38797291b2e9406401c45d2df86bc09750d0b2bfa2365
SIZE (xpi/firefox-i18n-58.0b2/uk.xpi) = 515428
SHA256 (xpi/firefox-i18n-58.0b2/ur.xpi) = 53d24a20bd0c6bee9b0e2c245af7a9d9108ba3c316c146656b33903682b8a064
SIZE (xpi/firefox-i18n-58.0b2/ur.xpi) = 509315
SHA256 (xpi/firefox-i18n-58.0b2/uz.xpi) = 48f135d8b0b9da5cb0715f4091ec64f3efeba112f72a6d658a6a828e6fb0b8d6
SIZE (xpi/firefox-i18n-58.0b2/uz.xpi) = 460303
SHA256 (xpi/firefox-i18n-58.0b2/vi.xpi) = b1bcda196f2f661b44f31719d62cf6d9635378c8fc4f4c70ad7fd994d757ecdb
SIZE (xpi/firefox-i18n-58.0b2/vi.xpi) = 469512
SHA256 (xpi/firefox-i18n-58.0b2/xh.xpi) = d94821e3676ac263615ae6ef5ed5596976a28388f742a27cd5f4fd82e2c8cbba
SIZE (xpi/firefox-i18n-58.0b2/xh.xpi) = 463007
SHA256 (xpi/firefox-i18n-58.0b2/zh-CN.xpi) = 267839fb771dd41ee357e31c2f8ab15594c33ab469b81da8053399826164983e
SIZE (xpi/firefox-i18n-58.0b2/zh-CN.xpi) = 480951
SHA256 (xpi/firefox-i18n-58.0b2/zh-TW.xpi) = b95129fef61f282d65eb6a671ff1f1e1be52a39ae08f63731d4d7d2a53d6e7c6
SIZE (xpi/firefox-i18n-58.0b2/zh-TW.xpi) = 478540




# $FreeBSD$

PORTNAME=	firefox
DISTVERSION=	58.0b2
DISTVERSIONSUFFIX=.source
PORTEPOCH=	1
CATEGORIES=	www ipv6
MASTER_SITES=	MOZILLA/devedition/releases/${DISTVERSION}/source \
		MOZILLA/devedition/candidates/${DISTVERSION}-candidates/build1/source

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

		libevent>=2.1.8:devel/libevent \
		harfbuzz>=1.5.1:print/harfbuzz \
		graphite2>=1.3.10:graphics/graphite2 \
		png>=1.6.34:graphics/png \
		libvorbis>=1.3.5,3:audio/libvorbis \
		libvpx>=1.5.0:multimedia/libvpx \
		sqlite3>=3.20.1:databases/sqlite3 \

Lines 1-3 Link Here

(-)b/www/firefox/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1510265773	1	TIMESTAMP = 1510249816
2	SHA256 (firefox-57.0.source.tar.xz) = a68e0a891af2e52423aa8416e2812361da04675f243f6465d805d8b3d4ca7494	2	SHA256 (firefox-58.0b2.source.tar.xz) = 5dfbdbf8a74ab03f65ae039015f405d320ca9086917364eefb3a106ab2095286
3	SIZE (firefox-57.0.source.tar.xz) = 250650020	3	SIZE (firefox-58.0b2.source.tar.xz) = 248507344




commit 64bb4e051b50
Author: Martin Stransky <stransky@redhat.com>
Date:   Tue Oct 17 09:50:18 2017 +0200

    Bug 1186967 - ignore double-click on WM without _NET_WM_MOVERESIZE support, r=jhorak
    
    MozReview-Commit-ID: 2Vs6i5leero
    
    --HG--
    extra : rebase_source : d8f2bbaf9ef9b2025478f029a68ee7e87e07de79
---
 widget/gtk/nsWindow.cpp | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git widget/gtk/nsWindow.cpp widget/gtk/nsWindow.cpp
index eb2f0e5e95cd..955327297ac9 100644
--- widget/gtk/nsWindow.cpp
+++ widget/gtk/nsWindow.cpp
@@ -6444,6 +6444,22 @@ nsWindow::GetDragInfo(WidgetMouseEvent* aMouseEvent,
         return false;
     }
 
+    if (mIsX11Display) {
+      // Workaround for https://bugzilla.gnome.org/show_bug.cgi?id=789054
+      // To avoid crashes disable double-click on WM without _NET_WM_MOVERESIZE.
+      // See _should_perform_ewmh_drag() at gdkwindow-x11.c
+      GdkScreen* screen = gdk_window_get_screen(gdk_window);
+      GdkAtom atom = gdk_atom_intern("_NET_WM_MOVERESIZE", FALSE);
+      if (!gdk_x11_screen_supports_net_wm_hint(screen, atom)) {
+          static unsigned int lastTimeStamp = 0;
+          if (lastTimeStamp != aMouseEvent->mTime) {
+              lastTimeStamp = aMouseEvent->mTime;
+          } else {
+              return false;
+          }
+      }
+    }
+
     // FIXME: It would be nice to have the widget position at the time
     // of the event, but it's relatively unlikely that the widget has
     // moved since the mousedown.  (On the other hand, it's quite likely




diff --git build/autoconf/config.status.m4 build/autoconf/config.status.m4
index cede9d36928d..c75575386129 100644
--- build/autoconf/config.status.m4
+++ build/autoconf/config.status.m4
@@ -12,25 +12,27 @@ dnl    AC_SOMETHING(foo,AC_SUBST(),bar)
 define([AC_SUBST],
 [ifdef([AC_SUBST_SET_$1], [m4_fatal([Cannot use AC_SUBST and AC_SUBST_SET on the same variable ($1)])],
 [ifdef([AC_SUBST_LIST_$1], [m4_fatal([Cannot use AC_SUBST and AC_SUBST_LIST on the same variable ($1)])],
+[ifdef([AC_SUBST_TOML_LIST_$1], [m4_fatal([Cannot use AC_SUBST and AC_SUBST_TOML_LIST on the same variable ($1)])],
 [ifdef([AC_SUBST_$1], ,
 [define([AC_SUBST_$1], )dnl
 AC_DIVERT_PUSH(MOZ_DIVERSION_SUBST)dnl
     (''' $1 ''', r''' [$]$1 ''')
 AC_DIVERT_POP()dnl
-])])])])
+])])])])])
 
 dnl Like AC_SUBST, but makes the value available as a set in python,
 dnl with values got from the value of the environment variable, split on
 dnl whitespaces.
 define([AC_SUBST_SET],
 [ifdef([AC_SUBST_$1], [m4_fatal([Cannot use AC_SUBST and AC_SUBST_SET on the same variable ($1)])],
-[ifdef([AC_SUBST_LIST$1], [m4_fatal([Cannot use AC_SUBST_LIST and AC_SUBST_SET on the same variable ($1)])],
+[ifdef([AC_SUBST_LIST_$1], [m4_fatal([Cannot use AC_SUBST_LIST and AC_SUBST_SET on the same variable ($1)])],
+[ifdef([AC_SUBST_TOML_LIST_$1], [m4_fatal([Cannot use AC_SUBST_TOML_LIST and AC_SUBST_SET on the same variable ($1)])],
 [ifdef([AC_SUBST_SET_$1], ,
 [define([AC_SUBST_SET_$1], )dnl
 AC_DIVERT_PUSH(MOZ_DIVERSION_SUBST)dnl
     (''' $1 ''', unique_list(split(r''' [$]$1 ''')))
 AC_DIVERT_POP()dnl
-])])])])
+])])])])])
 
 dnl Like AC_SUBST, but makes the value available as a list in python,
 dnl with values got from the value of the environment variable, split on
@@ -38,12 +40,29 @@ dnl whitespaces.
 define([AC_SUBST_LIST],
 [ifdef([AC_SUBST_$1], [m4_fatal([Cannot use AC_SUBST and AC_SUBST_LIST on the same variable ($1)])],
 [ifdef([AC_SUBST_SET_$1], [m4_fatal([Cannot use AC_SUBST_SET and AC_SUBST_LIST on the same variable ($1)])],
+[ifdef([AC_SUBST_TOML_LIST_$1], [m4_fatal([Cannot use AC_SUBST_TOML_LIST and AC_SUBST_LIST on the same variable ($1)])],
 [ifdef([AC_SUBST_LIST_$1], ,
 [define([AC_SUBST_LIST_$1], )dnl
 AC_DIVERT_PUSH(MOZ_DIVERSION_SUBST)dnl
     (''' $1 ''', list(split(r''' [$]$1 ''')))
 AC_DIVERT_POP()dnl
-])])])])
+])])])])])
+
+dnl Like AC_SUBST, but makes the value available as a string of comma-separated
+dnl quoted strings in python, with values got from the value of the environment
+dnl variable, split on whitespaces. The value is suitable for embedding into a
+dnl .toml list.
+define([AC_SUBST_TOML_LIST],
+[ifdef([AC_SUBST_$1], [m4_fatal([Cannot use AC_SUBST and AC_SUBST_TOML_LIST on the same variable ($1)])],
+[ifdef([AC_SUBST_SET_$1], [m4_fatal([Cannot use AC_SUBST_SET and AC_SUBST_TOML_LIST on the same variable ($1)])],
+[ifdef([AC_SUBST_LIST_$1], [m4_fatal([Cannot use AC_SUBST_LIST and AC_SUBST_TOML_LIST on the same variable ($1)])],
+[ifdef([AC_SUBST_TOML_LIST_$1], ,
+[define([AC_SUBST_TOML_LIST_$1], )dnl
+AC_DIVERT_PUSH(MOZ_DIVERSION_SUBST)dnl
+    (''' $1 ''', r''' %s ''' % str(', '.join("'%s'" % s for s in split(r''' [$]$1 '''))))
+AC_DIVERT_POP()dnl
+])])])])])
+
 
 dnl Ignore AC_SUBSTs for variables we don't have use for but that autoconf
 dnl itself exports.
diff --git build/moz.configure/toolchain.configure build/moz.configure/toolchain.configure
index 002a4cbbc2f0..f0d7b0aa57f4 100755
--- build/moz.configure/toolchain.configure
+++ build/moz.configure/toolchain.configure
@@ -1072,16 +1072,15 @@ option(env='BINDGEN_CFLAGS',
 
 
 @depends('BINDGEN_CFLAGS')
-@checking('bindgen cflags', lambda s: s if s and s.strip() else 'no')
+@checking('bindgen cflags', lambda s: s if s else 'no')
 def bindgen_cflags(value):
     if value and len(value):
         # Reformat the env value for substitution into a toml list.
         flags = value[0].split()
-        return ', '.join('"' + flag + '"' for flag in flags)
-    return ''
+        return flags
 
 
-set_config('BINDGEN_CFLAGS', bindgen_cflags)
+add_old_configure_assignment('_BINDGEN_CFLAGS', bindgen_cflags)
 
 
 @depends(c_compiler)
diff --git layout/style/bindgen.toml.in layout/style/bindgen.toml.in
index 7b1c72c86ec7..894008d0cfb6 100644
--- layout/style/bindgen.toml.in
+++ layout/style/bindgen.toml.in
@@ -1,4 +1,4 @@
 [build]
 args = [
-    @BINDGEN_CFLAGS@
+    @BINDGEN_SYSTEM_FLAGS@
 ]
diff --git old-configure.in old-configure.in
index 4c1ebad242be..2b7dc5d1d708 100644
--- old-configure.in
+++ old-configure.in
@@ -4595,6 +4595,9 @@ AC_SUBST_LIST(MOZ_CAIRO_LIBS)
 AC_SUBST_LIST(MOZ_CAIRO_OSLIBS)
 AC_SUBST(MOZ_TREE_PIXMAN)
 
+BINDGEN_SYSTEM_FLAGS="$_BINDGEN_CFLAGS $NSPR_CFLAGS $NSS_CFLAGS $MOZ_PIXMAN_CFLAGS $MOZ_CAIRO_CFLAGS"
+AC_SUBST_TOML_LIST(BINDGEN_SYSTEM_FLAGS)
+
 dnl ========================================================
 dnl disable xul
 dnl ========================================================




commit 139967a109c1
Author: Jean-Yves Avenard <jyavenard@mozilla.com>
Date:   Wed Oct 25 18:25:37 2017 +0200

    Bug 1366201 - P5. Get around FFmpeg bug with corrupted data. r=gerald
    
    According to FFmpeg documentation, the out parameter is "set to size of parsed buffer or zero if not yet finished. " however this is only the case if no error occurred; otherwise it is left untouched.
    
    We want the invalid content to generate a decoding error, so we set size to inputSize to ensure decoding failed later.
    
    MozReview-Commit-ID: FZeiZUdUtLG
---
 dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp
index 6acc8fef4dd8..fdee880c9e3b 100644
--- dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp
+++ dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp
@@ -212,18 +212,18 @@ FFmpegVideoDecoder<LIBAV_VER>::DoDecode(MediaRawData* aSample, bool* aGotFrame,
 
 #if LIBAVCODEC_VERSION_MAJOR >= 54
   if (inputSize && mCodecParser && (mCodecID == AV_CODEC_ID_VP8
 #if LIBAVCODEC_VERSION_MAJOR >= 55
       || mCodecID == AV_CODEC_ID_VP9
 #endif
       )) {
     while (inputSize) {
-      uint8_t* data;
-      int size;
+      uint8_t* data = inputData;
+      int size = inputSize;
       int len = mLib->av_parser_parse2(
         mCodecParser, mCodecContext, &data, &size, inputData, inputSize,
         aSample->mTime.ToMicroseconds(), aSample->mTimecode.ToMicroseconds(),
         aSample->mOffset);
       if (size_t(len) > inputSize) {
         return NS_ERROR_DOM_MEDIA_DECODE_ERR;
       }
       inputData += len;




diff --git dom/media/flac/FlacDecoder.cpp dom/media/flac/FlacDecoder.cpp
index 53fc3c9937f7..b23771ab80fa 100644
--- dom/media/flac/FlacDecoder.cpp
+++ dom/media/flac/FlacDecoder.cpp
@@ -7,6 +7,7 @@
 #include "FlacDecoder.h"
 #include "MediaContainerType.h"
 #include "MediaPrefs.h"
+#include "PDMFactory.h"
 
 namespace mozilla {
 
@@ -15,6 +16,10 @@ FlacDecoder::IsEnabled()
 {
 #ifdef MOZ_FFVPX
   return MediaPrefs::FlacEnabled();
+#elif defined(MOZ_FFMPEG)
+  RefPtr<PDMFactory> platform = new PDMFactory();
+  return MediaPrefs::FlacEnabled() && platform->SupportsMimeType(NS_LITERAL_CSTRING("audio/flac"),
+                                    /* DecoderDoctorDiagnostics* */ nullptr);
 #else
   // Until bug 1295886 is fixed.
   return false;
diff --git media/ffvpx/README_MOZILLA media/ffvpx/README_MOZILLA
index 5d3a6037efe0..43144b726a92 100644
--- media/ffvpx/README_MOZILLA
+++ media/ffvpx/README_MOZILLA
@@ -17,14 +17,6 @@ configuration files were generated as follow using the configure script:
 config*:
 replace: /HAVE_(MALLOC_H|ARC4RANDOM|LOCALTIME_R|MEMALIGN|POSIX_MEMALIGN)/d
 
-config_darwin32.h:
-add to configure command: --disable-asm --disable-yasm --cc='clang -m32'
-
-config_unix32.h:
-add to configure command: --disable-asm --disable-yasm --cc='clang -m32'
-replace: s/HAVE_SYSCTL 1/HAVE_SYSCTL 0/ and s/HAVE_MEMALIGN 1/HAVE_MEMALIGN 0/ and s/HAVE_POSIX_MEMALIGN 1/HAVE_POSIX_MEMALIGN 0/
-
-
 config_unix64.h/config_unix64.asm:
 replace: s/HAVE_SYSCTL 1/HAVE_SYSCTL 0
 
diff --git media/ffvpx/config.h media/ffvpx/config.h
index c4cbd97c60e9..2061782954c8 100644
--- media/ffvpx/config.h
+++ media/ffvpx/config.h
@@ -7,7 +7,7 @@
 #ifndef MOZ_FFVPX_CONFIG_H
 #define MOZ_FFVPX_CONFIG_H
 #if defined(MOZ_FFVPX_FLACONLY)
-#if defined(MOZ_WIDGET_ANDROID) && !defined(HAVE_64BIT_BUILD)
+#if defined(MOZ_WIDGET_ANDROID) && defined(__arm__)
 #include "config_android32.h"
 #else
 #include "config_flac.h"
diff --git media/ffvpx/libavcodec/avcodec.symbols media/ffvpx/libavcodec/avcodec.symbols
index cf507f7222e5..486d4a3e22e8 100644
--- media/ffvpx/libavcodec/avcodec.symbols
+++ media/ffvpx/libavcodec/avcodec.symbols
@@ -1,7 +1,3 @@
-av_bitstream_filter_close
-av_bitstream_filter_filter
-av_bitstream_filter_init
-av_bitstream_filter_next
 av_codec_ffversion
 av_codec_get_chroma_intra_matrix
 av_codec_get_codec_descriptor
@@ -57,17 +53,8 @@ av_parser_close
 av_parser_init
 av_parser_next
 av_parser_parse2
-av_picture_copy
-av_picture_crop
-av_picture_pad
-av_qsv_alloc_context
-av_register_bitstream_filter
 av_register_codec_parser
 av_register_hwaccel
-av_resample
-av_resample_close
-av_resample_compensate
-av_resample_init
 av_shrink_packet
 av_vorbis_parse_frame
 av_vorbis_parse_frame_flags
@@ -94,36 +81,25 @@ avcodec_descriptor_get_by_name
 avcodec_descriptor_next
 avcodec_enum_to_chroma_pos
 avcodec_fill_audio_frame
-avcodec_find_best_pix_fmt2
-avcodec_find_best_pix_fmt_of_2
-avcodec_find_best_pix_fmt_of_list
 avcodec_find_decoder
 avcodec_find_decoder_by_name
 avcodec_find_encoder
 avcodec_find_encoder_by_name
 avcodec_flush_buffers
 avcodec_free_context
-avcodec_get_chroma_sub_sample
 avcodec_get_class
 avcodec_get_context_defaults3
 avcodec_get_edge_width
 avcodec_get_frame_class
 avcodec_get_name
-avcodec_get_pix_fmt_loss
 avcodec_get_subtitle_rect_class
 avcodec_get_type
 avcodec_is_open
 avcodec_license
 avcodec_open2
-avcodec_pix_fmt_to_codec_tag
 avcodec_register
 avcodec_register_all
 avcodec_set_dimensions
 avcodec_string
 avcodec_version
-avpicture_alloc
-avpicture_fill
-avpicture_free
-avpicture_get_size
-avpicture_layout
 avsubtitle_free
diff --git media/ffvpx/libavutil/avutil.symbols media/ffvpx/libavutil/avutil.symbols
index ba68dc33c48b..baa533d3fa61 100644
--- media/ffvpx/libavutil/avutil.symbols
+++ media/ffvpx/libavutil/avutil.symbols
@@ -1,10 +1,7 @@
 av_add_q
 av_add_stable
-av_adler32_update
 av_append_path_component
 av_asprintf
-av_base64_decode
-av_base64_encode
 av_basename
 av_bprint_append_data
 av_bprint_channel_layout
@@ -177,8 +174,10 @@ av_image_get_buffer_size
 av_image_get_linesize
 av_int_list_length_for_size
 av_log
+#ifndef MOZ_FFVPX_FLACONLY
 av_log2
 av_log2_16bit
+#endif
 av_log_default_callback
 av_log_format_line
 av_log_get_flags
@@ -257,7 +256,6 @@ av_pix_fmt_desc_get_id
 av_pix_fmt_desc_next
 av_pix_fmt_get_chroma_sub_sample
 av_pix_fmt_swap_endianness
-av_pixelutils_get_sad_fn
 av_q2intfloat
 av_read_image_line
 av_realloc
@@ -296,20 +294,6 @@ av_strstart
 av_strtod
 av_strtok
 av_sub_q
-av_thread_message_queue_alloc
-av_thread_message_queue_free
-av_thread_message_queue_recv
-av_thread_message_queue_send
-av_thread_message_queue_set_err_recv
-av_thread_message_queue_set_err_send
-av_timecode_adjust_ntsc_framenum2
-av_timecode_check_frame_rate
-av_timecode_get_smpte_from_framenum
-av_timecode_init
-av_timecode_init_from_string
-av_timecode_make_mpeg_tc_string
-av_timecode_make_smpte_tc_string
-av_timecode_make_string
 av_timegm
 av_usleep
 av_utf8_decode
@@ -321,13 +305,10 @@ av_write_image_line
 avpriv_alloc_fixed_dsp
 avpriv_float_dsp_alloc
 avpriv_frame_get_metadatap
-avpriv_get_gamma_from_trc
-avpriv_init_lls
 avpriv_report_missing_feature
 avpriv_request_sample
 avpriv_scalarproduct_float_c
 avpriv_set_systematic_pal2
-avpriv_solve_lls
 avutil_configuration
 avutil_license
 avutil_version
diff --git old-configure.in old-configure.in
index a60f08edb8aa..b77ba543b3c5 100644
--- old-configure.in
+++ old-configure.in
@@ -3219,7 +3219,14 @@ case "$CPU_ARCH" in
   x86|x86_64)
 
 MOZ_FFVPX=
-case "$CPU_ARCH" in
-  x86)
+case "$OS_ARCH:$CPU_ARCH" in
+  WINNT:x86)
       MOZ_FFVPX=1
       dnl Use same conditional as MOZ_LIBAV_FFT to enable FFmpeg's ffvpx assembly decoder.
-      FFVPX_ASFLAGS=$LIBAV_FFT_ASFLAGS
+      if test -n "$LIBAV_FFT_ASFLAGS"; then
+          FFVPX_ASFLAGS=$LIBAV_FFT_ASFLAGS
+      else
+          dnl On x86 system with assembly optimizations disabled, the ffvp9 and
+          dnl ffvp8 decoders give worse performance than libvpx ones. So we only
+          dnl enable the FFmpeg FLAC decoder on those machines.
+          MOZ_FFVPX_FLACONLY=1
+      fi
   ;;
   arm*|aarch64)
+  *:x86_64)
       MOZ_FFVPX=1
   ;;
 esac




commit d6b070b42a1f
Author: Franziskus Kiefer <franziskuskiefer@gmail.com>
Date:   Thu Nov 9 13:02:07 2017 +0100

    Bug 1415795 - revert name change of NSS API, r=ttaubert
    
    MozReview-Commit-ID: Jj72zkfaRh
    
    --HG--
    extra : rebase_source : f9610f85611e2debc3fd527346db5ba73b4d66fa
---
 security/manager/ssl/nsNSSIOLayer.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git security/manager/ssl/nsNSSIOLayer.cpp security/manager/ssl/nsNSSIOLayer.cpp
index d6abfb75d23d..4c44838cff14 100644
--- security/manager/ssl/nsNSSIOLayer.cpp
+++ security/manager/ssl/nsNSSIOLayer.cpp
@@ -2605,7 +2605,7 @@ nsSSLIOLayerSetOptions(PRFileDesc* fd, bool forSTARTTLS,
   if (getTLSProviderFlagAltHandshake(infoObject->GetProviderTlsFlags())) {
     MOZ_LOG(gPIPNSSLog, LogLevel::Debug,
             ("[%p] nsSSLIOLayerSetOptions: Use AltHandshake\n", fd));
-    if (SECSuccess != SSL_UseAltHandshakeType(fd, PR_TRUE)) {
+    if (SECSuccess != SSL_UseAltServerHelloType(fd, PR_TRUE)) {
           MOZ_LOG(gPIPNSSLog, LogLevel::Error,
                   ("[%p] nsSSLIOLayerSetOptions: Use AltHandshake failed\n", fd));
           // continue on default path




index 55e4cd1..76567b3 100644
--- old-configure.in
+++ old-configure.in
@@ -2558,6 +2558,9 @@ if test -n "$MOZ_WEBRTC"; then
     if test -n "$MOZ_X11"; then
       MOZ_WEBRTC_X11_LIBS="-lXext -lXdamage -lXfixes -lXcomposite"
     fi
+
+    dnl with libv4l2 we can support more cameras
+    PKG_CHECK_MODULES(MOZ_LIBV4L2, libv4l2)
 else
     MOZ_SYNTH_PICO=
 fi
     AC_DEFINE(MOZ_WEBRTC_SIGNALING)
diff --git build/gyp.mozbuild build/gyp.mozbuild
index b483cd1..f1dd1f0 100644
--- build/gyp.mozbuild




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

index 79c26e3e7001..c4d93bc5f7dc 100644
--- netwerk/dns/moz.build
+++ netwerk/dns/moz.build
@@ -73,3 +73,6 @@ USE_LIBS += ['icu']
     '/netwerk/base',
 ]
 
 if CONFIG['GNU_CXX']:
     CXXFLAGS += ['-Wno-error=shadow']
+
+if CONFIG['MOZ_SYSTEM_HARFBUZZ']:
+    CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS']
+
 if CONFIG['ENABLE_INTL_API']:
     DEFINES['IDNA2008'] = True
     USE_LIBS += ['icu']
diff --git old-configure.in old-configure.in
index 95a58b634593..b614eef85c89 100644
--- old-configure.in




Enable FLAC on platforms without ffvpx like powerpc*

diff --git dom/media/flac/FlacDecoder.cpp dom/media/flac/FlacDecoder.cpp
index 53fc3c9937f7..b23771ab80fa 100644
--- dom/media/flac/FlacDecoder.cpp
+++ dom/media/flac/FlacDecoder.cpp
@@ -7,6 +7,7 @@
 #include "FlacDecoder.h"
 #include "MediaContainerType.h"
 #include "MediaPrefs.h"
+#include "PDMFactory.h"
 
 namespace mozilla {
 
@@ -15,6 +16,10 @@ FlacDecoder::IsEnabled()
 {
 #ifdef MOZ_FFVPX
   return MediaPrefs::FlacEnabled();
+#elif defined(MOZ_FFMPEG)
+  RefPtr<PDMFactory> platform = new PDMFactory();
+  return MediaPrefs::FlacEnabled() && platform->SupportsMimeType(NS_LITERAL_CSTRING("audio/flac"),
+                                    /* DecoderDoctorDiagnostics* */ nullptr);
 #else
   // Until bug 1295886 is fixed.
   return false;




diff --git old-configure.in old-configure.in
index 6f358ecf741b..4c1ebad242be 100644
--- old-configure.in
+++ old-configure.in
@@ -1915,7 +1915,7 @@ MOZ_ARG_WITH_BOOL(system-nss,
     _USE_SYSTEM_NSS=1 )
 
 if test -n "$_USE_SYSTEM_NSS"; then
-    AM_PATH_NSS(3.35, [MOZ_SYSTEM_NSS=1], [AC_MSG_ERROR([you don't have NSS installed or your version is too old])])
+    AM_PATH_NSS(3.33, [MOZ_SYSTEM_NSS=1], [AC_MSG_ERROR([you don't have NSS installed or your version is too old])])
 fi
 
 if test -n "$MOZ_SYSTEM_NSS"; then




diff --git toolkit/moz.configure toolkit/moz.configure
index 1befea00c485..7999b7acd5bd 100644
--- toolkit/moz.configure
+++ toolkit/moz.configure
@@ -842,8 +842,8 @@ def webrender(value, milestone):
     enable_webrender = None
 
     if value.origin == 'default':
-        # if nothing is specified, default to just building on Nightly
-        build_webrender = milestone.is_nightly
+        # build by default downstream
+        build_webrender = True
     elif len(value) and value[0] == 'build':
         # if explicitly set to 'build', then we build but don't enable
         build_webrender = True

Return to bug 223425

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

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

Lines 109-122 USE_XORG+= xcb Link Here

(-)b/Mk/bsd.gecko.mk (-8 lines)
109	MESA_LLVM_VER?= 40	109	MESA_LLVM_VER?= 40
110	BUILD_DEPENDS+= llvm${MESA_LLVM_VER}>0:devel/llvm${MESA_LLVM_VER}	110	BUILD_DEPENDS+= llvm${MESA_LLVM_VER}>0:devel/llvm${MESA_LLVM_VER}
111	MOZ_EXPORT+= LLVM_CONFIG=llvm-config${MESA_LLVM_VER}	111	MOZ_EXPORT+= LLVM_CONFIG=llvm-config${MESA_LLVM_VER}
112	MOZ_EXPORT+= BINDGEN_CFLAGS="${BINDGEN_CFLAGS}"
113	# XXX bug 1341234
114	. if ! ${USE_MOZILLA:M-nspr}
115	BINDGEN_CFLAGS+=-isystem${LOCALBASE}/include/nspr
116	. endif
117	. if ! ${USE_MOZILLA:M-pixman}
118	BINDGEN_CFLAGS+=-isystem${LOCALBASE}/include/pixman-1
119	. endif
120	.endif	112	.endif
121		113
122	.if ${OPSYS} == FreeBSD && ${OSREL} == 11.1	114	.if ${OPSYS} == FreeBSD && ${OSREL} == 11.1

Lines 2-11 Link Here

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

Lines 2-13 Link Here

(-)b/www/firefox/Makefile (-4 / +4 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= firefox	4	PORTNAME= firefox
5	DISTVERSION= 57.0	5	DISTVERSION= 58.0b2
6	DISTVERSIONSUFFIX=.source	6	DISTVERSIONSUFFIX=.source
7	PORTEPOCH= 1	7	PORTEPOCH= 1
8	CATEGORIES= www ipv6	8	CATEGORIES= www ipv6
9	MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \	9	MASTER_SITES= MOZILLA/devedition/releases/${DISTVERSION}/source \
10	MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build3/source	10	MOZILLA/devedition/candidates/${DISTVERSION}-candidates/build1/source
11		11
12	MAINTAINER= gecko@FreeBSD.org	12	MAINTAINER= gecko@FreeBSD.org
13	COMMENT= Web browser based on the browser portion of Mozilla	13	COMMENT= Web browser based on the browser portion of Mozilla
Lines 18-24 BUILD_DEPENDS= nspr>=4.17:devel/nspr \ Link Here
18	libevent>=2.1.8:devel/libevent \	18	libevent>=2.1.8:devel/libevent \
19	harfbuzz>=1.5.1:print/harfbuzz \	19	harfbuzz>=1.5.1:print/harfbuzz \
20	graphite2>=1.3.10:graphics/graphite2 \	20	graphite2>=1.3.10:graphics/graphite2 \
21	png>=1.6.31:graphics/png \	21	png>=1.6.34: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.20.1:databases/sqlite3 \	24	sqlite3>=3.20.1:databases/sqlite3 \

Removed Link Here

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

Added Link Here

(-)b/www/firefox/files/patch-bug1341234 (+114 lines)
1	diff --git build/autoconf/config.status.m4 build/autoconf/config.status.m4
2	index cede9d36928d..c75575386129 100644
3	--- build/autoconf/config.status.m4
4	+++ build/autoconf/config.status.m4
5	@@ -12,25 +12,27 @@ dnl AC_SOMETHING(foo,AC_SUBST(),bar)
6	define([AC_SUBST],
7	[ifdef([AC_SUBST_SET_$1], [m4_fatal([Cannot use AC_SUBST and AC_SUBST_SET on the same variable ($1)])],
8	[ifdef([AC_SUBST_LIST_$1], [m4_fatal([Cannot use AC_SUBST and AC_SUBST_LIST on the same variable ($1)])],
9	+[ifdef([AC_SUBST_TOML_LIST_$1], [m4_fatal([Cannot use AC_SUBST and AC_SUBST_TOML_LIST on the same variable ($1)])],
10	[ifdef([AC_SUBST_$1], ,
11	[define([AC_SUBST_$1], )dnl
12	AC_DIVERT_PUSH(MOZ_DIVERSION_SUBST)dnl
13	(''' $1 ''', r''' [$]$1 ''')
14	AC_DIVERT_POP()dnl
15	-])])])])
16	+])])])])])
17
18	dnl Like AC_SUBST, but makes the value available as a set in python,
19	dnl with values got from the value of the environment variable, split on
20	dnl whitespaces.
21	define([AC_SUBST_SET],
22	[ifdef([AC_SUBST_$1], [m4_fatal([Cannot use AC_SUBST and AC_SUBST_SET on the same variable ($1)])],
23	-[ifdef([AC_SUBST_LIST$1], [m4_fatal([Cannot use AC_SUBST_LIST and AC_SUBST_SET on the same variable ($1)])],
24	+[ifdef([AC_SUBST_LIST_$1], [m4_fatal([Cannot use AC_SUBST_LIST and AC_SUBST_SET on the same variable ($1)])],
25	+[ifdef([AC_SUBST_TOML_LIST_$1], [m4_fatal([Cannot use AC_SUBST_TOML_LIST and AC_SUBST_SET on the same variable ($1)])],
26	[ifdef([AC_SUBST_SET_$1], ,
27	[define([AC_SUBST_SET_$1], )dnl
28	AC_DIVERT_PUSH(MOZ_DIVERSION_SUBST)dnl
29	(''' $1 ''', unique_list(split(r''' [$]$1 ''')))
30	AC_DIVERT_POP()dnl
31	-])])])])
32	+])])])])])
33
34	dnl Like AC_SUBST, but makes the value available as a list in python,
35	dnl with values got from the value of the environment variable, split on
36	@@ -38,12 +40,29 @@ dnl whitespaces.
37	define([AC_SUBST_LIST],
38	[ifdef([AC_SUBST_$1], [m4_fatal([Cannot use AC_SUBST and AC_SUBST_LIST on the same variable ($1)])],
39	[ifdef([AC_SUBST_SET_$1], [m4_fatal([Cannot use AC_SUBST_SET and AC_SUBST_LIST on the same variable ($1)])],
40	+[ifdef([AC_SUBST_TOML_LIST_$1], [m4_fatal([Cannot use AC_SUBST_TOML_LIST and AC_SUBST_LIST on the same variable ($1)])],
41	[ifdef([AC_SUBST_LIST_$1], ,
42	[define([AC_SUBST_LIST_$1], )dnl
43	AC_DIVERT_PUSH(MOZ_DIVERSION_SUBST)dnl
44	(''' $1 ''', list(split(r''' [$]$1 ''')))
45	AC_DIVERT_POP()dnl
46	-])])])])
47	+])])])])])
48	+
49	+dnl Like AC_SUBST, but makes the value available as a string of comma-separated
50	+dnl quoted strings in python, with values got from the value of the environment
51	+dnl variable, split on whitespaces. The value is suitable for embedding into a
52	+dnl .toml list.
53	+define([AC_SUBST_TOML_LIST],
54	+[ifdef([AC_SUBST_$1], [m4_fatal([Cannot use AC_SUBST and AC_SUBST_TOML_LIST on the same variable ($1)])],
55	+[ifdef([AC_SUBST_SET_$1], [m4_fatal([Cannot use AC_SUBST_SET and AC_SUBST_TOML_LIST on the same variable ($1)])],
56	+[ifdef([AC_SUBST_LIST_$1], [m4_fatal([Cannot use AC_SUBST_LIST and AC_SUBST_TOML_LIST on the same variable ($1)])],
57	+[ifdef([AC_SUBST_TOML_LIST_$1], ,
58	+[define([AC_SUBST_TOML_LIST_$1], )dnl
59	+AC_DIVERT_PUSH(MOZ_DIVERSION_SUBST)dnl
60	+ (''' $1 ''', r''' %s ''' % str(', '.join("'%s'" % s for s in split(r''' [$]$1 '''))))
61	+AC_DIVERT_POP()dnl
62	+])])])])])
63	+
64
65	dnl Ignore AC_SUBSTs for variables we don't have use for but that autoconf
66	dnl itself exports.
67	diff --git build/moz.configure/toolchain.configure build/moz.configure/toolchain.configure
68	index 002a4cbbc2f0..f0d7b0aa57f4 100755
69	--- build/moz.configure/toolchain.configure
70	+++ build/moz.configure/toolchain.configure
71	@@ -1072,16 +1072,15 @@ option(env='BINDGEN_CFLAGS',
72
73
74	@depends('BINDGEN_CFLAGS')
75	-@checking('bindgen cflags', lambda s: s if s and s.strip() else 'no')
76	+@checking('bindgen cflags', lambda s: s if s else 'no')
77	def bindgen_cflags(value):
78	if value and len(value):
79	# Reformat the env value for substitution into a toml list.
80	flags = value[0].split()
81	- return ', '.join('"' + flag + '"' for flag in flags)
82	- return ''
83	+ return flags
84
85
86	-set_config('BINDGEN_CFLAGS', bindgen_cflags)
87	+add_old_configure_assignment('_BINDGEN_CFLAGS', bindgen_cflags)
88
89
90	@depends(c_compiler)
91	diff --git layout/style/bindgen.toml.in layout/style/bindgen.toml.in
92	index 7b1c72c86ec7..894008d0cfb6 100644
93	--- layout/style/bindgen.toml.in
94	+++ layout/style/bindgen.toml.in
95	@@ -1,4 +1,4 @@
96	[build]
97	args = [
98	- @BINDGEN_CFLAGS@
99	+ @BINDGEN_SYSTEM_FLAGS@
100	]
101	diff --git old-configure.in old-configure.in
102	index 4c1ebad242be..2b7dc5d1d708 100644
103	--- old-configure.in
104	+++ old-configure.in
105	@@ -4595,6 +4595,9 @@ AC_SUBST_LIST(MOZ_CAIRO_LIBS)
106	AC_SUBST_LIST(MOZ_CAIRO_OSLIBS)
107	AC_SUBST(MOZ_TREE_PIXMAN)
108
109	+BINDGEN_SYSTEM_FLAGS="$_BINDGEN_CFLAGS $NSPR_CFLAGS $NSS_CFLAGS $MOZ_PIXMAN_CFLAGS $MOZ_CAIRO_CFLAGS"
110	+AC_SUBST_TOML_LIST(BINDGEN_SYSTEM_FLAGS)
111	+
112	dnl ========================================================
113	dnl disable xul
114	dnl ========================================================

Removed Link Here

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

Lines 1-83 Link Here

(-)b/www/firefox/files/patch-bug1412558 (-74 / +160 lines)
1	diff --git dom/media/flac/FlacDecoder.cpp dom/media/flac/FlacDecoder.cpp
2	index 53fc3c9937f7..b23771ab80fa 100644
3	--- dom/media/flac/FlacDecoder.cpp
4	+++ dom/media/flac/FlacDecoder.cpp
5	@@ -7,6 +7,7 @@
6	#include "FlacDecoder.h"
7	#include "MediaContainerType.h"
8	#include "MediaPrefs.h"
9	+#include "PDMFactory.h"
10
11	namespace mozilla {
12
13	@@ -15,6 +16,10 @@ FlacDecoder::IsEnabled()
14	{
15	#ifdef MOZ_FFVPX
16	return MediaPrefs::FlacEnabled();
17	+#elif defined(MOZ_FFMPEG)
18	+ RefPtr<PDMFactory> platform = new PDMFactory();
19	+ return MediaPrefs::FlacEnabled() && platform->SupportsMimeType(NS_LITERAL_CSTRING("audio/flac"),
20	+ /* DecoderDoctorDiagnostics* */ nullptr);
21	#else
22	// Until bug 1295886 is fixed.
23	return false;
24	diff --git media/ffvpx/README_MOZILLA media/ffvpx/README_MOZILLA
25	index 5d3a6037efe0..43144b726a92 100644
26	--- media/ffvpx/README_MOZILLA
27	+++ media/ffvpx/README_MOZILLA
28	@@ -17,14 +17,6 @@ configuration files were generated as follow using the configure script:
29	config*:
30	replace: /HAVE_(MALLOC_H\|ARC4RANDOM\|LOCALTIME_R\|MEMALIGN\|POSIX_MEMALIGN)/d
31
32	-config_darwin32.h:
33	-add to configure command: --disable-asm --disable-yasm --cc='clang -m32'
34	-
35	-config_unix32.h:
36	-add to configure command: --disable-asm --disable-yasm --cc='clang -m32'
37	-replace: s/HAVE_SYSCTL 1/HAVE_SYSCTL 0/ and s/HAVE_MEMALIGN 1/HAVE_MEMALIGN 0/ and s/HAVE_POSIX_MEMALIGN 1/HAVE_POSIX_MEMALIGN 0/
38	-
39	-
40	config_unix64.h/config_unix64.asm:
41	replace: s/HAVE_SYSCTL 1/HAVE_SYSCTL 0
42
43	diff --git media/ffvpx/config.h media/ffvpx/config.h	1	diff --git media/ffvpx/config.h media/ffvpx/config.h
44	index dab01e05cd65..26ebe529bd98 100644	2	index c4cbd97c60e9..2061782954c8 100644
45	--- media/ffvpx/config.h	3	--- media/ffvpx/config.h
46	+++ media/ffvpx/config.h	4	+++ media/ffvpx/config.h
47	@@ -27,17 +27,9 @@	5	@@ -7,7 +7,7 @@
48	#define HAVE_LIBC_MSVCRT 0	6	#ifndef MOZ_FFVPX_CONFIG_H
49	#endif	7	#define MOZ_FFVPX_CONFIG_H
50	#elif defined(XP_DARWIN)	8	#if defined(MOZ_FFVPX_FLACONLY)
51	-#if defined(HAVE_64BIT_BUILD)	9	-#if defined(MOZ_WIDGET_ANDROID) && !defined(HAVE_64BIT_BUILD)
52	#include "config_darwin64.h"	10	+#if defined(MOZ_WIDGET_ANDROID) && defined(__arm__)
53	-#else	11	#include "config_android32.h"
54	-#include "config_darwin32.h"	12	#else
55	-#endif	13	#include "config_flac.h"
56	#elif defined(XP_UNIX)	14	diff --git media/ffvpx/libavcodec/avcodec.symbols media/ffvpx/libavcodec/avcodec.symbols
57	-#if defined(HAVE_64BIT_BUILD)	15	index cf507f7222e5..486d4a3e22e8 100644
58	#include "config_unix64.h"	16	--- media/ffvpx/libavcodec/avcodec.symbols
59	-#else	17	+++ media/ffvpx/libavcodec/avcodec.symbols
60	-#include "config_unix32.h"	18	@@ -1,7 +1,3 @@
61	-#endif	19	-av_bitstream_filter_close
62	#endif	20	-av_bitstream_filter_filter
63	#include "config_common.h"	21	-av_bitstream_filter_init
64	#endif // MOZ_FFVPX_CONFIG_H	22	-av_bitstream_filter_next
		23	av_codec_ffversion
		24	av_codec_get_chroma_intra_matrix
		25	av_codec_get_codec_descriptor
		26	@@ -57,17 +53,8 @@ av_parser_close
		27	av_parser_init
		28	av_parser_next
		29	av_parser_parse2
		30	-av_picture_copy
		31	-av_picture_crop
		32	-av_picture_pad
		33	-av_qsv_alloc_context
		34	-av_register_bitstream_filter
		35	av_register_codec_parser
		36	av_register_hwaccel
		37	-av_resample
		38	-av_resample_close
		39	-av_resample_compensate
		40	-av_resample_init
		41	av_shrink_packet
		42	av_vorbis_parse_frame
		43	av_vorbis_parse_frame_flags
		44	@@ -94,36 +81,25 @@ avcodec_descriptor_get_by_name
		45	avcodec_descriptor_next
		46	avcodec_enum_to_chroma_pos
		47	avcodec_fill_audio_frame
		48	-avcodec_find_best_pix_fmt2
		49	-avcodec_find_best_pix_fmt_of_2
		50	-avcodec_find_best_pix_fmt_of_list
		51	avcodec_find_decoder
		52	avcodec_find_decoder_by_name
		53	avcodec_find_encoder
		54	avcodec_find_encoder_by_name
		55	avcodec_flush_buffers
		56	avcodec_free_context
		57	-avcodec_get_chroma_sub_sample
		58	avcodec_get_class
		59	avcodec_get_context_defaults3
		60	avcodec_get_edge_width
		61	avcodec_get_frame_class
		62	avcodec_get_name
		63	-avcodec_get_pix_fmt_loss
		64	avcodec_get_subtitle_rect_class
		65	avcodec_get_type
		66	avcodec_is_open
		67	avcodec_license
		68	avcodec_open2
		69	-avcodec_pix_fmt_to_codec_tag
		70	avcodec_register
		71	avcodec_register_all
		72	avcodec_set_dimensions
		73	avcodec_string
		74	avcodec_version
		75	-avpicture_alloc
		76	-avpicture_fill
		77	-avpicture_free
		78	-avpicture_get_size
		79	-avpicture_layout
		80	avsubtitle_free
		81	diff --git media/ffvpx/libavutil/avutil.symbols media/ffvpx/libavutil/avutil.symbols
		82	index ba68dc33c48b..baa533d3fa61 100644
		83	--- media/ffvpx/libavutil/avutil.symbols
		84	+++ media/ffvpx/libavutil/avutil.symbols
		85	@@ -1,10 +1,7 @@
		86	av_add_q
87	av_add_stable
88	-av_adler32_update
89	av_append_path_component
90	av_asprintf
91	-av_base64_decode
92	-av_base64_encode
93	av_basename
94	av_bprint_append_data
95	av_bprint_channel_layout
96	@@ -177,8 +174,10 @@ av_image_get_buffer_size
97	av_image_get_linesize
98	av_int_list_length_for_size
99	av_log
100	+#ifndef MOZ_FFVPX_FLACONLY
101	av_log2
102	av_log2_16bit
103	+#endif
104	av_log_default_callback
105	av_log_format_line
106	av_log_get_flags
107	@@ -257,7 +256,6 @@ av_pix_fmt_desc_get_id
108	av_pix_fmt_desc_next
109	av_pix_fmt_get_chroma_sub_sample
110	av_pix_fmt_swap_endianness
111	-av_pixelutils_get_sad_fn
112	av_q2intfloat
113	av_read_image_line
114	av_realloc
115	@@ -296,20 +294,6 @@ av_strstart
116	av_strtod
117	av_strtok
118	av_sub_q
119	-av_thread_message_queue_alloc
120	-av_thread_message_queue_free
121	-av_thread_message_queue_recv
122	-av_thread_message_queue_send
123	-av_thread_message_queue_set_err_recv
124	-av_thread_message_queue_set_err_send
125	-av_timecode_adjust_ntsc_framenum2
126	-av_timecode_check_frame_rate
127	-av_timecode_get_smpte_from_framenum
128	-av_timecode_init
129	-av_timecode_init_from_string
130	-av_timecode_make_mpeg_tc_string
131	-av_timecode_make_smpte_tc_string
132	-av_timecode_make_string
133	av_timegm
134	av_usleep
135	av_utf8_decode
136	@@ -321,13 +305,10 @@ av_write_image_line
137	avpriv_alloc_fixed_dsp
138	avpriv_float_dsp_alloc
139	avpriv_frame_get_metadatap
140	-avpriv_get_gamma_from_trc
141	-avpriv_init_lls
142	avpriv_report_missing_feature
143	avpriv_request_sample
144	avpriv_scalarproduct_float_c
145	avpriv_set_systematic_pal2
146	-avpriv_solve_lls
147	avutil_configuration
148	avutil_license
149	avutil_version
65	diff --git old-configure.in old-configure.in	150	diff --git old-configure.in old-configure.in
66	index b8ce71278548..410be683c2f6 100644	151	index a60f08edb8aa..b77ba543b3c5 100644
67	--- old-configure.in	152	--- old-configure.in
68	+++ old-configure.in	153	+++ old-configure.in
69	@@ -3279,11 +3279,11 @@ dnl = FFmpeg's ffvpx configuration	154	@@ -3219,7 +3219,14 @@ case "$CPU_ARCH" in
70	dnl ========================================================	155	x86\|x86_64)
71
72	MOZ_FFVPX=
73	-case "$CPU_ARCH" in
74	- x86)
75	+case "$OS_ARCH:$CPU_ARCH" in
76	+ WINNT:x86)
77	MOZ_FFVPX=1	156	MOZ_FFVPX=1
		157	dnl Use same conditional as MOZ_LIBAV_FFT to enable FFmpeg's ffvpx assembly decoder.
		158	- FFVPX_ASFLAGS=$LIBAV_FFT_ASFLAGS
		159	+ if test -n "$LIBAV_FFT_ASFLAGS"; then
		160	+ FFVPX_ASFLAGS=$LIBAV_FFT_ASFLAGS
		161	+ else
		162	+ dnl On x86 system with assembly optimizations disabled, the ffvp9 and
		163	+ dnl ffvp8 decoders give worse performance than libvpx ones. So we only
		164	+ dnl enable the FFmpeg FLAC decoder on those machines.
		165	+ MOZ_FFVPX_FLACONLY=1
		166	+ fi
78	;;	167	;;
79	- x86_64)	168	arm*\|aarch64)
80	+ *:x86_64)
81	MOZ_FFVPX=1	169	MOZ_FFVPX=1
82	;;
83	esac

Added Link Here

(-)b/www/firefox/files/patch-bug1415795 (+27 lines)
1	commit d6b070b42a1f
2	Author: Franziskus Kiefer <franziskuskiefer@gmail.com>
3	Date: Thu Nov 9 13:02:07 2017 +0100
4
5	Bug 1415795 - revert name change of NSS API, r=ttaubert
6
7	MozReview-Commit-ID: Jj72zkfaRh
8
9	--HG--
10	extra : rebase_source : f9610f85611e2debc3fd527346db5ba73b4d66fa
11	---
12	security/manager/ssl/nsNSSIOLayer.cpp \| 2 +-
13	1 file changed, 1 insertion(+), 1 deletion(-)
14
15	diff --git security/manager/ssl/nsNSSIOLayer.cpp security/manager/ssl/nsNSSIOLayer.cpp
16	index d6abfb75d23d..4c44838cff14 100644
17	--- security/manager/ssl/nsNSSIOLayer.cpp
18	+++ security/manager/ssl/nsNSSIOLayer.cpp
19	@@ -2605,7 +2605,7 @@ nsSSLIOLayerSetOptions(PRFileDesc* fd, bool forSTARTTLS,
20	if (getTLSProviderFlagAltHandshake(infoObject->GetProviderTlsFlags())) {
21	MOZ_LOG(gPIPNSSLog, LogLevel::Debug,
22	("[%p] nsSSLIOLayerSetOptions: Use AltHandshake\n", fd));
23	- if (SECSuccess != SSL_UseAltHandshakeType(fd, PR_TRUE)) {
24	+ if (SECSuccess != SSL_UseAltServerHelloType(fd, PR_TRUE)) {
25	MOZ_LOG(gPIPNSSLog, LogLevel::Error,
26	("[%p] nsSSLIOLayerSetOptions: Use AltHandshake failed\n", fd));
27	// continue on default path

Lines 29-44 diff --git old-configure.in configure.in Link Here

(-)b/www/firefox/files/patch-bug826985 (-8 / +8 lines)
29	index 55e4cd1..76567b3 100644	29	index 55e4cd1..76567b3 100644
30	--- old-configure.in	30	--- old-configure.in
31	+++ old-configure.in	31	+++ old-configure.in
32	@@ -5309,6 +5309,9 @@ if test -n "$MOZ_WEBRTC"; then	32	@@ -2558,6 +2558,9 @@ if test -n "$MOZ_WEBRTC"; then
33	MOZ_VP8_ENCODER=1	33	if test -n "$MOZ_X11"; then
34	MOZ_VP8_ERROR_CONCEALMENT=1	34	MOZ_WEBRTC_X11_LIBS="-lXext -lXdamage -lXfixes -lXcomposite"
35		35	fi
		36	+
36	+ dnl with libv4l2 we can support more cameras	37	+ dnl with libv4l2 we can support more cameras
37	+ PKG_CHECK_MODULES(MOZ_LIBV4L2, libv4l2)	38	+ PKG_CHECK_MODULES(MOZ_LIBV4L2, libv4l2)
38	+	39	else
39	dnl enable once Signaling lands	40	MOZ_SYNTH_PICO=
40	MOZ_WEBRTC_SIGNALING=1	41	fi
41	AC_DEFINE(MOZ_WEBRTC_SIGNALING)
42	diff --git build/gyp.mozbuild build/gyp.mozbuild	42	diff --git build/gyp.mozbuild build/gyp.mozbuild
43	index b483cd1..f1dd1f0 100644	43	index b483cd1..f1dd1f0 100644
44	--- build/gyp.mozbuild	44	--- build/gyp.mozbuild

Lines 167-175 diff --git intl/unicharutil/util/moz.build intl/unicharutil/util/moz.build Link Here

(-)b/www/firefox/files/patch-bug847568 (-10 / +7 lines)
167	index cb1233c56d7e..06fb1f9f174b 100644	167	index cb1233c56d7e..06fb1f9f174b 100644
168	--- intl/unicharutil/util/moz.build	168	--- intl/unicharutil/util/moz.build
169	+++ intl/unicharutil/util/moz.build	169	+++ intl/unicharutil/util/moz.build
170	@@ -29,4 +29,7 @@ if CONFIG['ENABLE_INTL_API']:	170	@@ -25,4 +25,7 @@ UNIFIED_SOURCES += [
171	'ICUUtils.cpp',	171	'nsUnicodeProperties.cpp',
172	]	172	]
173		173
174	+if CONFIG['MOZ_SYSTEM_HARFBUZZ']:	174	+if CONFIG['MOZ_SYSTEM_HARFBUZZ']:
175	+ CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS']	175	+ CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS']
Lines 179-194 diff --git netwerk/dns/moz.build netwerk/dns/moz.build Link Here
179	index 79c26e3e7001..c4d93bc5f7dc 100644	179	index 79c26e3e7001..c4d93bc5f7dc 100644
180	--- netwerk/dns/moz.build	180	--- netwerk/dns/moz.build
181	+++ netwerk/dns/moz.build	181	+++ netwerk/dns/moz.build
182	@@ -69,6 +69,9 @@ LOCAL_INCLUDES += [	182	@@ -73,3 +73,6 @@ USE_LIBS += ['icu']
183	'/netwerk/base',
184	]
185		183
		184	if CONFIG['GNU_CXX']:
		185	CXXFLAGS += ['-Wno-error=shadow']
		186	+
186	+if CONFIG['MOZ_SYSTEM_HARFBUZZ']:	187	+if CONFIG['MOZ_SYSTEM_HARFBUZZ']:
187	+ CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS']	188	+ CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS']
188	+
189	if CONFIG['ENABLE_INTL_API']:
190	DEFINES['IDNA2008'] = True
191	USE_LIBS += ['icu']
192	diff --git old-configure.in old-configure.in	189	diff --git old-configure.in old-configure.in
193	index 95a58b634593..b614eef85c89 100644	190	index 95a58b634593..b614eef85c89 100644
194	--- old-configure.in	191	--- old-configure.in

Added Link Here

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

Added Link Here

(-)b/www/firefox/files/patch-old-configure.in (+13 lines)
1	diff --git old-configure.in old-configure.in
2	index 6f358ecf741b..4c1ebad242be 100644
3	--- old-configure.in
4	+++ old-configure.in
5	@@ -1915,7 +1915,7 @@ MOZ_ARG_WITH_BOOL(system-nss,
6	_USE_SYSTEM_NSS=1 )
7
8	if test -n "$_USE_SYSTEM_NSS"; then
9	- AM_PATH_NSS(3.35, [MOZ_SYSTEM_NSS=1], [AC_MSG_ERROR([you don't have NSS installed or your version is too old])])
10	+ AM_PATH_NSS(3.33, [MOZ_SYSTEM_NSS=1], [AC_MSG_ERROR([you don't have NSS installed or your version is too old])])
11	fi
12
13	if test -n "$MOZ_SYSTEM_NSS"; then

Added Link Here

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