@@ -, +, @@ --- Mk/Uses/gecko.mk | 4 +- Mk/bsd.gecko.mk | 6 +- www/firefox-i18n/Makefile | 6 +- www/firefox-i18n/Makefile.lang | 5 +- www/firefox-i18n/Makefile.option | 2 + www/firefox-i18n/distinfo | 384 +++++++++++---------- www/firefox/Makefile | 8 +- www/firefox/distinfo | 6 +- www/firefox/files/patch-bug1186967 | 41 --- www/firefox/files/patch-bug1366201 | 40 --- www/firefox/files/patch-bug1412558 | 83 ----- www/firefox/files/patch-bug1414440 | 108 ------ www/firefox/files/patch-bug826985 | 40 +-- www/firefox/files/patch-bug847568 | 100 +++--- .../files/patch-dom_media_flac_FlacDecoder.cpp | 25 ++ www/firefox/files/patch-toolkit_moz.configure | 15 + www/firefox/files/patch-z-bug517422 | 119 +++---- 17 files changed, 376 insertions(+), 616 deletions(-) delete mode 100644 www/firefox/files/patch-bug1186967 delete mode 100644 www/firefox/files/patch-bug1366201 delete mode 100644 www/firefox/files/patch-bug1412558 delete mode 100644 www/firefox/files/patch-bug1414440 create mode 100644 www/firefox/files/patch-dom_media_flac_FlacDecoder.cpp create mode 100644 www/firefox/files/patch-toolkit_moz.configure --- b/Mk/Uses/gecko.mk +++ b/Mk/Uses/gecko.mk @@ -37,12 +37,12 @@ RUN_DEPENDS+= libxul>=45:www/libxul .elif ${gecko_ARGS:Mfirefox} _GECKO_DEFAULT_VERSION= 52 -_GECKO_VERSIONS= 52 57 +_GECKO_VERSIONS= 52 58 _GECKO_TYPE= firefox # Dependence lines for different Firefox versions 52_DEPENDS= ${LOCALBASE}/lib/firefox/firefox:www/firefox-esr -57_DEPENDS= ${LOCALBASE}/lib/firefox/firefox:www/firefox +58_DEPENDS= ${LOCALBASE}/lib/firefox/firefox:www/firefox .if exists(${LOCALBASE}/bin/firefox) _GECKO_INSTALLED_VER!= ${LOCALBASE}/bin/firefox --version 2>/dev/null --- b/Mk/bsd.gecko.mk +++ b/Mk/bsd.gecko.mk @@ -109,14 +109,15 @@ USE_XORG+= xcb 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} +.if ${MOZILLA_VER:R:R} < 58 MOZ_EXPORT+= BINDGEN_CFLAGS="${BINDGEN_CFLAGS}" -# XXX bug 1341234 . if ! ${USE_MOZILLA:M-nspr} BINDGEN_CFLAGS+=-isystem${LOCALBASE}/include/nspr . endif . if ! ${USE_MOZILLA:M-pixman} BINDGEN_CFLAGS+=-isystem${LOCALBASE}/include/pixman-1 . endif +.endif # MOZILLA_VER < 58 .endif .if ${OPSYS} == FreeBSD && ${OSREL} == 11.1 @@ -144,6 +145,7 @@ PKGDEINSTALL_INC?= ${.CURDIR}/../../www/firefox/files/pkg-deinstall.in MOZ_PKGCONFIG_FILES?= ${MOZILLA}-gtkmozembed ${MOZILLA}-js \ ${MOZILLA}-xpcom ${MOZILLA}-plugin +MAKE_ENV+= MACH=1 # XXX bug 1412398 ALL_TARGET?= build MOZ_EXPORT+= ${CONFIGURE_ENV} \ @@ -389,7 +391,7 @@ post-patch-SNDIO-on: .endif .if ${PORT_OPTIONS:MRUST} || ${MOZILLA_VER:R:R} >= 54 -BUILD_DEPENDS+= ${RUST_PORT:T}>=1.19.0_2:${RUST_PORT} +BUILD_DEPENDS+= ${RUST_PORT:T}>=1.21.0:${RUST_PORT} RUST_PORT?= lang/rust . if ${MOZILLA_VER:R:R} < 54 MOZ_OPTIONS+= --enable-rust --- b/www/firefox-i18n/Makefile +++ b/www/firefox-i18n/Makefile @@ -2,10 +2,10 @@ # $FreeBSD$ PORTNAME= firefox-i18n -PORTVERSION= 57.0.2 +PORTVERSION= 58.0b10 CATEGORIES= www MASTER_SITES= MOZILLA/${PORTNAME:S|-i18n||}/releases/${DISTVERSION}/linux-i686/xpi \ - MOZILLA/${PORTNAME:S|-i18n||}/candidates/${DISTVERSION}-candidates/build2/linux-i686/xpi + MOZILLA/${PORTNAME:S|-i18n||}/candidates/${DISTVERSION}-candidates/build1/linux-i686/xpi PKGNAMEPREFIX= DISTFILES= ${FIREFOX_I18N_:S/$/.xpi/} DIST_SUBDIR= xpi/${DISTNAME} @@ -15,7 +15,7 @@ COMMENT= Localized interface for Firefox EXTRACT_DEPENDS= zip:archivers/zip -USES= zip:infozip gecko:firefox,57,build +USES= zip:infozip gecko:firefox,58,build USE_XPI= firefox NO_ARCH= yes --- b/www/firefox-i18n/Makefile.lang +++ b/www/firefox-i18n/Makefile.lang @@ -5,7 +5,7 @@ FIREFOX_I18N_ALL_= ach af an ar as ast az be bg bn-BD bn-IN br bs ca cak \ cs cy da de dsb el en-GB en-US en-ZA eo es-AR es-CL \ es-ES es-MX et eu fa ff fi fr fy-NL ga-IE gd gl gn \ gu-IN he hi-IN hr hsb hu hy-AM id is it ja ka kab \ - kk km kn ko lij lt lv mai mk ml mr ms my nb-NO nl \ + kk km kn ko lij lt lv mai mk ml mr ms my nb-NO ne-NP nl \ nn-NO or pa-IN pl pt-BR pt-PT rm ro ru si sk sl son \ sq sr sv-SE ta te th tr uk ur uz vi xh zh-CN zh-TW @@ -213,6 +213,9 @@ FIREFOX_I18N+= my .if ${PORT_OPTIONS:MLANG_NB} FIREFOX_I18N+= nb-NO .endif +.if ${PORT_OPTIONS:MLANG_NE} +FIREFOX_I18N+= ne-NP +.endif .if ${PORT_OPTIONS:MLANG_NL} FIREFOX_I18N+= nl .endif --- b/www/firefox-i18n/Makefile.option +++ b/www/firefox-i18n/Makefile.option @@ -69,6 +69,7 @@ OPTIONS_DEFINE= LANG_ACH \ LANG_MS \ LANG_MY \ LANG_NB \ + LANG_NE \ LANG_NL \ LANG_NN \ LANG_OR \ @@ -118,6 +119,7 @@ LANG_KM_DESC?= Khmer language support LANG_LIJ_DESC?= Ligurian (Genoa) language support LANG_MS_DESC?= Malay language support LANG_MY_DESC?= Burmese language support +LANG_NE_DESC?= Nepali language support LANG_SW_DESC?= Swahili language support LANG_UR_DESC?= Urdu (Pakistan) language support LANG_UZ_DESC?= Uzbek language support --- b/www/firefox-i18n/distinfo +++ b/www/firefox-i18n/distinfo @@ -1,191 +1,193 @@ -TIMESTAMP = 1511907528 -SHA256 (xpi/firefox-i18n-57.0.2/ach.xpi) = e4997e2ec4ac9b164d0f1a0e69c539fcd62f4f3ad8781b62bc91161d87244ca6 -SIZE (xpi/firefox-i18n-57.0.2/ach.xpi) = 441113 -SHA256 (xpi/firefox-i18n-57.0.2/af.xpi) = 049dbcbddd71bc640a192f0412660b49b9635fb3c95c69bc6bc39921efc858b6 -SIZE (xpi/firefox-i18n-57.0.2/af.xpi) = 442206 -SHA256 (xpi/firefox-i18n-57.0.2/an.xpi) = cd8551e2217b018ac4b77cf7ac556b0e3d337ada79faa05e8b433d82bfce2563 -SIZE (xpi/firefox-i18n-57.0.2/an.xpi) = 462778 -SHA256 (xpi/firefox-i18n-57.0.2/ar.xpi) = 4ab6c8a349b84c80a60093dd24e12e32cd3674cefc95a7d7f4399b87c7e68f43 -SIZE (xpi/firefox-i18n-57.0.2/ar.xpi) = 488160 -SHA256 (xpi/firefox-i18n-57.0.2/as.xpi) = b9bcf4ef2bc5d55a5861de8efa8451174a420e4032cafe9fe463c78fa029963b -SIZE (xpi/firefox-i18n-57.0.2/as.xpi) = 491075 -SHA256 (xpi/firefox-i18n-57.0.2/ast.xpi) = a812abe6c44bde6e39820bccc3c7448a658ef9d9d7d98639ad7fdf39229ce6ae -SIZE (xpi/firefox-i18n-57.0.2/ast.xpi) = 455504 -SHA256 (xpi/firefox-i18n-57.0.2/az.xpi) = ed972e2fc9c7aad3196b5db6c82812acd37d08bb83c1b9f276cb73f99cb10e44 -SIZE (xpi/firefox-i18n-57.0.2/az.xpi) = 466043 -SHA256 (xpi/firefox-i18n-57.0.2/be.xpi) = 5ff30769b04e5953c33cc9f64c66d8bbdc0ce8b0b1929910ffd82071964e138d -SIZE (xpi/firefox-i18n-57.0.2/be.xpi) = 516092 -SHA256 (xpi/firefox-i18n-57.0.2/bg.xpi) = 11984db8c70e3bd49a96c3e893c3681108bb9e9f698167c91f221799c5b26c23 -SIZE (xpi/firefox-i18n-57.0.2/bg.xpi) = 510351 -SHA256 (xpi/firefox-i18n-57.0.2/bn-BD.xpi) = 9140e4b831f42d17d738515a104613b1632c6c39cd7165514e99dfdd561fddc3 -SIZE (xpi/firefox-i18n-57.0.2/bn-BD.xpi) = 527189 -SHA256 (xpi/firefox-i18n-57.0.2/bn-IN.xpi) = 7d6c277c61341ecd01d154a0c63e1d6d6d30139b22efa4dc050297194ef6ee54 -SIZE (xpi/firefox-i18n-57.0.2/bn-IN.xpi) = 516180 -SHA256 (xpi/firefox-i18n-57.0.2/br.xpi) = acda7accd57dd95b5a48ec7baf25b29cc6938027e5bfbe9dd4ce999a31e448c1 -SIZE (xpi/firefox-i18n-57.0.2/br.xpi) = 451866 -SHA256 (xpi/firefox-i18n-57.0.2/bs.xpi) = 69accf3f165f7feabdc3d3d59ef19af4b01811a89dfc3cff89798f71bb1759cb -SIZE (xpi/firefox-i18n-57.0.2/bs.xpi) = 459650 -SHA256 (xpi/firefox-i18n-57.0.2/ca.xpi) = b409e3f6d3359fbe1885bed346d04f856910704258be6235ac4b8d677ac87e8b -SIZE (xpi/firefox-i18n-57.0.2/ca.xpi) = 466641 -SHA256 (xpi/firefox-i18n-57.0.2/cak.xpi) = fa9159287516e9c84f11fab742147c767c405a5ba51036cd8251af9f83dcc295 -SIZE (xpi/firefox-i18n-57.0.2/cak.xpi) = 475935 -SHA256 (xpi/firefox-i18n-57.0.2/cs.xpi) = ceae997c6945d2bbcda249433c72299d42e7798c19b7f2c71deebe77afc0ef33 -SIZE (xpi/firefox-i18n-57.0.2/cs.xpi) = 469457 -SHA256 (xpi/firefox-i18n-57.0.2/cy.xpi) = 1fd06e46a5cc6d4ae771fbc148b71e9e53e2a53396a44097bc9068714e94a805 -SIZE (xpi/firefox-i18n-57.0.2/cy.xpi) = 455788 -SHA256 (xpi/firefox-i18n-57.0.2/da.xpi) = c8fe1d4d5fa996f43c4ee9206fcd0519725d55221ba53017c482f8dae8880b70 -SIZE (xpi/firefox-i18n-57.0.2/da.xpi) = 448415 -SHA256 (xpi/firefox-i18n-57.0.2/de.xpi) = 5bd6244175c8cd96a0938eec42aeb470bbe833d25c1f1745afbb9bb3e66eb814 -SIZE (xpi/firefox-i18n-57.0.2/de.xpi) = 460813 -SHA256 (xpi/firefox-i18n-57.0.2/dsb.xpi) = c9be692a527ac9934ca28bcbb6be3a1c1a7a6d5471cfe75809100c3941d55a37 -SIZE (xpi/firefox-i18n-57.0.2/dsb.xpi) = 479511 -SHA256 (xpi/firefox-i18n-57.0.2/el.xpi) = 2e1ee6612d7ed621aa5e43843de253b5ae3b31185e3d9d2607bb5518e27e864b -SIZE (xpi/firefox-i18n-57.0.2/el.xpi) = 534484 -SHA256 (xpi/firefox-i18n-57.0.2/en-GB.xpi) = 64c001b0a31985485269c870adf37f0652898f22774a1042030faf8a9af5f362 -SIZE (xpi/firefox-i18n-57.0.2/en-GB.xpi) = 435623 -SHA256 (xpi/firefox-i18n-57.0.2/en-US.xpi) = 7c830511020b3c3d941d6b699b569a3a7a0897affe70ae4f55229af657b4696b -SIZE (xpi/firefox-i18n-57.0.2/en-US.xpi) = 441880 -SHA256 (xpi/firefox-i18n-57.0.2/en-ZA.xpi) = d09067757c1d240253fd4a28c41955163677f2198b9ca8967120b876bb206109 -SIZE (xpi/firefox-i18n-57.0.2/en-ZA.xpi) = 432020 -SHA256 (xpi/firefox-i18n-57.0.2/eo.xpi) = b9f4311f6aabccb3abb87198a56e34ad6560fb2802e227a557603b7dfe811cd6 -SIZE (xpi/firefox-i18n-57.0.2/eo.xpi) = 454910 -SHA256 (xpi/firefox-i18n-57.0.2/es-AR.xpi) = fc5fc1f2126c2c87757efcaaa90d4cd5e5d1ce05af4c0e74cca1d144589416e2 -SIZE (xpi/firefox-i18n-57.0.2/es-AR.xpi) = 462980 -SHA256 (xpi/firefox-i18n-57.0.2/es-CL.xpi) = 2138bc886d134a7a3c9511f25acf984e83f05b0940de4ccf1ed5c15b5388a2d1 -SIZE (xpi/firefox-i18n-57.0.2/es-CL.xpi) = 465514 -SHA256 (xpi/firefox-i18n-57.0.2/es-ES.xpi) = 880c74c8994f4353f7b5149b88795cb84b6b66f26ee3a5fe181bc3cffc48db9a -SIZE (xpi/firefox-i18n-57.0.2/es-ES.xpi) = 353625 -SHA256 (xpi/firefox-i18n-57.0.2/es-MX.xpi) = 79cb2491f93e1e77710b7f946e46ad2dd1d2ea1d99353ac513159a5ea05edabf -SIZE (xpi/firefox-i18n-57.0.2/es-MX.xpi) = 468761 -SHA256 (xpi/firefox-i18n-57.0.2/et.xpi) = 321d33ef3bf6faffa2bc5f333ac247773742402a597017b07cc6ea02b6d0c564 -SIZE (xpi/firefox-i18n-57.0.2/et.xpi) = 447279 -SHA256 (xpi/firefox-i18n-57.0.2/eu.xpi) = 55ebe6b49e65bd84c5d4a7dd54d98457979d9d58abfe7ebc861ed16bf1e23957 -SIZE (xpi/firefox-i18n-57.0.2/eu.xpi) = 454673 -SHA256 (xpi/firefox-i18n-57.0.2/fa.xpi) = 4adce2a2efc8d02fbeee08fcc4442ca9bacd2ee4efaac9ab5639cc39dd7e0441 -SIZE (xpi/firefox-i18n-57.0.2/fa.xpi) = 510829 -SHA256 (xpi/firefox-i18n-57.0.2/ff.xpi) = 527edbec7d942e34714f234509985738125cb751011ed781e17a8888a40e2b29 -SIZE (xpi/firefox-i18n-57.0.2/ff.xpi) = 454015 -SHA256 (xpi/firefox-i18n-57.0.2/fi.xpi) = e51f8f137b63cbac65bc8d1a63e301f128b58a502d090bd05838320829d28eb5 -SIZE (xpi/firefox-i18n-57.0.2/fi.xpi) = 446244 -SHA256 (xpi/firefox-i18n-57.0.2/fr.xpi) = e6c47c559b647b9e2e2ad7b7dadbd9c92680bfaa26a706181d7d15d6b3b80189 -SIZE (xpi/firefox-i18n-57.0.2/fr.xpi) = 472721 -SHA256 (xpi/firefox-i18n-57.0.2/fy-NL.xpi) = 80c291b1e480765fdcf012c460c172297e25bb022290f72c3e742cf4a0113fb1 -SIZE (xpi/firefox-i18n-57.0.2/fy-NL.xpi) = 465911 -SHA256 (xpi/firefox-i18n-57.0.2/ga-IE.xpi) = 8f575e976a6b2580344957ae13809aaaff7f64f29722ff7e339c3535ca713346 -SIZE (xpi/firefox-i18n-57.0.2/ga-IE.xpi) = 475963 -SHA256 (xpi/firefox-i18n-57.0.2/gd.xpi) = 5c78506787b4e207f2e5cfd9a387d566ee9d964b2e29d41c9c1500171b33d81e -SIZE (xpi/firefox-i18n-57.0.2/gd.xpi) = 465122 -SHA256 (xpi/firefox-i18n-57.0.2/gl.xpi) = 24cc04f7de1401540069fe12231c69d53d72bf48b21ad0158a57a199e324a97c -SIZE (xpi/firefox-i18n-57.0.2/gl.xpi) = 452032 -SHA256 (xpi/firefox-i18n-57.0.2/gn.xpi) = 0cb1ba780dbf7e71dad2182dadc3d157261e479d2eb9ac847a5eb93274af83b2 -SIZE (xpi/firefox-i18n-57.0.2/gn.xpi) = 471956 -SHA256 (xpi/firefox-i18n-57.0.2/gu-IN.xpi) = bbb0c993585759536559ce2cca98827a5915dbe3880507a8681bc09a54e44901 -SIZE (xpi/firefox-i18n-57.0.2/gu-IN.xpi) = 511990 -SHA256 (xpi/firefox-i18n-57.0.2/he.xpi) = fafc4772fbb6b96857d3f42402da2a556c20a0f291b479ac66e0c53745d29abe -SIZE (xpi/firefox-i18n-57.0.2/he.xpi) = 471921 -SHA256 (xpi/firefox-i18n-57.0.2/hi-IN.xpi) = 978e0c8cb2985aa8906f35bb49fb4e4e2bec3492bc9c7c5b0a66cdbd9acde794 -SIZE (xpi/firefox-i18n-57.0.2/hi-IN.xpi) = 526110 -SHA256 (xpi/firefox-i18n-57.0.2/hr.xpi) = 2eb787c77113156ab23d0986c234c12142981f73486af8474d011f1d89d03e7e -SIZE (xpi/firefox-i18n-57.0.2/hr.xpi) = 460722 -SHA256 (xpi/firefox-i18n-57.0.2/hsb.xpi) = 6d5537e0b83586d2561030eb480c21f9560c764c5c9d53cff6a109ff0e4a0849 -SIZE (xpi/firefox-i18n-57.0.2/hsb.xpi) = 476505 -SHA256 (xpi/firefox-i18n-57.0.2/hu.xpi) = 363848557e54c141f7aaa065ba9fc658217b85cac901e71877d912e176004d50 -SIZE (xpi/firefox-i18n-57.0.2/hu.xpi) = 476604 -SHA256 (xpi/firefox-i18n-57.0.2/hy-AM.xpi) = c36719ef55557538fec0d7a011adda063494428f07495fc7cc3a592ec3c28aaa -SIZE (xpi/firefox-i18n-57.0.2/hy-AM.xpi) = 510825 -SHA256 (xpi/firefox-i18n-57.0.2/id.xpi) = ecdd58c5c92133cc92e0c3cac9c2e3de06e4ab5520c031ad74a03813e3ed0fe4 -SIZE (xpi/firefox-i18n-57.0.2/id.xpi) = 444041 -SHA256 (xpi/firefox-i18n-57.0.2/is.xpi) = 900a1823028928d24247cf707f98cfa5226f04cf5045b7d50889f68a9c35f735 -SIZE (xpi/firefox-i18n-57.0.2/is.xpi) = 452660 -SHA256 (xpi/firefox-i18n-57.0.2/it.xpi) = 8723506b966f04413dd5b20ca7bbfdf82373637b9d791e4eecd36f6aa0028aac -SIZE (xpi/firefox-i18n-57.0.2/it.xpi) = 347171 -SHA256 (xpi/firefox-i18n-57.0.2/ja.xpi) = ed1f6920353721d64167b93b85bd2119c370553ef914aef1f18e2f01739cb0b9 -SIZE (xpi/firefox-i18n-57.0.2/ja.xpi) = 508552 -SHA256 (xpi/firefox-i18n-57.0.2/ka.xpi) = ebd1b1bbb217a1b93726b8fd720dd63680d28fa76b9fb55768e87f7b9565470f -SIZE (xpi/firefox-i18n-57.0.2/ka.xpi) = 492355 -SHA256 (xpi/firefox-i18n-57.0.2/kab.xpi) = 47105e123349f68f071d748fb2a654fd2b8445dcb9bc1006a83401d759a5d71e -SIZE (xpi/firefox-i18n-57.0.2/kab.xpi) = 462531 -SHA256 (xpi/firefox-i18n-57.0.2/kk.xpi) = 7504d2e8e224240aa1a2d0761fec7f36c6c6427a529021f5aa7f33f35185072d -SIZE (xpi/firefox-i18n-57.0.2/kk.xpi) = 519249 -SHA256 (xpi/firefox-i18n-57.0.2/km.xpi) = c5b950cd3fc7b1b2dcfea70508da8f8fbe327ab4ec662bf4ab8e9796482bd109 -SIZE (xpi/firefox-i18n-57.0.2/km.xpi) = 530080 -SHA256 (xpi/firefox-i18n-57.0.2/kn.xpi) = 114e741a4ff2c75863ff217b4df778f4c2f4c3307bbeab6eacadcb9b0b2821fc -SIZE (xpi/firefox-i18n-57.0.2/kn.xpi) = 531316 -SHA256 (xpi/firefox-i18n-57.0.2/ko.xpi) = 8d0a46effa9d4dea17ec8f32538494ef903dd6f2908fd7e4d12cf89b9f514dcf -SIZE (xpi/firefox-i18n-57.0.2/ko.xpi) = 487306 -SHA256 (xpi/firefox-i18n-57.0.2/lij.xpi) = d6d97b8381806d315448eae8ac3071d57aae58a2f7ab89f419ae21430e71736e -SIZE (xpi/firefox-i18n-57.0.2/lij.xpi) = 452343 -SHA256 (xpi/firefox-i18n-57.0.2/lt.xpi) = c1de5e657eaf33e1336162c06e9a643de44cae2083c6d8f7dfc026852aa2c33f -SIZE (xpi/firefox-i18n-57.0.2/lt.xpi) = 474957 -SHA256 (xpi/firefox-i18n-57.0.2/lv.xpi) = a6720e6734307e659ca989b3131cbbc51ac3cee8f75b40da2748ee4b26ac8bb2 -SIZE (xpi/firefox-i18n-57.0.2/lv.xpi) = 465243 -SHA256 (xpi/firefox-i18n-57.0.2/mai.xpi) = 0548e9b8e574db76432a231fc9e6bb281328e22413bcaf73be79ac0d815cb4cc -SIZE (xpi/firefox-i18n-57.0.2/mai.xpi) = 507396 -SHA256 (xpi/firefox-i18n-57.0.2/mk.xpi) = 9727349fce8a362e83acb24cf403dff55dbf788e77d367cb236db8453b3d1e7f -SIZE (xpi/firefox-i18n-57.0.2/mk.xpi) = 490853 -SHA256 (xpi/firefox-i18n-57.0.2/ml.xpi) = aed732d507da43096c2666c7082394382b57d8f5db57f9469819c1c461ba1eff -SIZE (xpi/firefox-i18n-57.0.2/ml.xpi) = 528256 -SHA256 (xpi/firefox-i18n-57.0.2/mr.xpi) = a6da2ad562c248b922e9329511d649a7ff30edafba512585ff9824a047fa9b5c -SIZE (xpi/firefox-i18n-57.0.2/mr.xpi) = 521291 -SHA256 (xpi/firefox-i18n-57.0.2/ms.xpi) = 29278b6bb2f86c00b47bc1555bdf39901fbae933bfb8da332c6fb4d9bb98eb93 -SIZE (xpi/firefox-i18n-57.0.2/ms.xpi) = 451255 -SHA256 (xpi/firefox-i18n-57.0.2/my.xpi) = 85b542b1df86fbaf5e72dcbdcdb1902cb4c9399bf9d8358864189748bc40be4f -SIZE (xpi/firefox-i18n-57.0.2/my.xpi) = 517703 -SHA256 (xpi/firefox-i18n-57.0.2/nb-NO.xpi) = fcbdaca8ade333dcc6a9907d25826c96a3bdd38b738d767e8dd0e4d136cd0a04 -SIZE (xpi/firefox-i18n-57.0.2/nb-NO.xpi) = 451557 -SHA256 (xpi/firefox-i18n-57.0.2/nl.xpi) = f11ebb89292b1f6ea4b23aa1ebc9d2cf06eca70f74e3716bdf212813fa27d1f8 -SIZE (xpi/firefox-i18n-57.0.2/nl.xpi) = 458318 -SHA256 (xpi/firefox-i18n-57.0.2/nn-NO.xpi) = 62f6b27b921403b5eb66ed6cd756ae58158c576113fdab7e22c2e0d6addeee0d -SIZE (xpi/firefox-i18n-57.0.2/nn-NO.xpi) = 452004 -SHA256 (xpi/firefox-i18n-57.0.2/or.xpi) = 51add79881216d6b0b6b6a0e542312077c90a2f4bfecde7cfab50c021922c255 -SIZE (xpi/firefox-i18n-57.0.2/or.xpi) = 500867 -SHA256 (xpi/firefox-i18n-57.0.2/pa-IN.xpi) = c50223c03c0a988592f6ff6faf988b0decd20ffcbf86a4094095795aae1a191b -SIZE (xpi/firefox-i18n-57.0.2/pa-IN.xpi) = 495271 -SHA256 (xpi/firefox-i18n-57.0.2/pl.xpi) = 3363080d6e6f3f64f0f65fd5dfbae135afb9fa7ac581dc11eb1f6b1d729c3419 -SIZE (xpi/firefox-i18n-57.0.2/pl.xpi) = 364230 -SHA256 (xpi/firefox-i18n-57.0.2/pt-BR.xpi) = 122a54c218fd4f0968815a4bf5211952225194c1cdae6c87d5236f14775cfd08 -SIZE (xpi/firefox-i18n-57.0.2/pt-BR.xpi) = 457155 -SHA256 (xpi/firefox-i18n-57.0.2/pt-PT.xpi) = a287438f5494388161055e2cec97ed4656423431697a244cb35c77ef722655e9 -SIZE (xpi/firefox-i18n-57.0.2/pt-PT.xpi) = 460000 -SHA256 (xpi/firefox-i18n-57.0.2/rm.xpi) = a99b89dbc7cd74f212edc93435ec28f8ec07cc09b815a07cd247eb5f9db51eef -SIZE (xpi/firefox-i18n-57.0.2/rm.xpi) = 451059 -SHA256 (xpi/firefox-i18n-57.0.2/ro.xpi) = 481f65471392779bc115b78e9b743092e807ba623cfdb7fe1a5f0c6ef140c790 -SIZE (xpi/firefox-i18n-57.0.2/ro.xpi) = 455511 -SHA256 (xpi/firefox-i18n-57.0.2/ru.xpi) = b25dd55d5d046ef80f5dbabba18008a53074dfb5b10694c3a1ef0bfa2ed47768 -SIZE (xpi/firefox-i18n-57.0.2/ru.xpi) = 526955 -SHA256 (xpi/firefox-i18n-57.0.2/si.xpi) = 0aa9b90d9ee33055fd45ce508906231efae349a7fe902dff42d8f52477d9d572 -SIZE (xpi/firefox-i18n-57.0.2/si.xpi) = 498324 -SHA256 (xpi/firefox-i18n-57.0.2/sk.xpi) = 4e23b6888f767ce131b440679025cfa523cd29673985b32e4693233780ddc1fd -SIZE (xpi/firefox-i18n-57.0.2/sk.xpi) = 480397 -SHA256 (xpi/firefox-i18n-57.0.2/sl.xpi) = 9a5bb0644c00fea4eaf1e0cc5491340769a011a64ad106b2fd0c6fbbffba73b6 -SIZE (xpi/firefox-i18n-57.0.2/sl.xpi) = 459377 -SHA256 (xpi/firefox-i18n-57.0.2/son.xpi) = 94bdf395d5fc7650a2af468f011b937f8fdf60d5d3803985d557978af1f8310f -SIZE (xpi/firefox-i18n-57.0.2/son.xpi) = 450931 -SHA256 (xpi/firefox-i18n-57.0.2/sq.xpi) = 16f41d29b8afabb32e7e488c476fee2bc84bcf0e6fb348c1a4c6a8157f465cbd -SIZE (xpi/firefox-i18n-57.0.2/sq.xpi) = 465051 -SHA256 (xpi/firefox-i18n-57.0.2/sr.xpi) = 333722711aa715f65cd79b98f9edc109d151706b71ccec052cad1c3f55530e0b -SIZE (xpi/firefox-i18n-57.0.2/sr.xpi) = 487003 -SHA256 (xpi/firefox-i18n-57.0.2/sv-SE.xpi) = b1547d3a366944f2f2eb2efe5bb2140d5be98590983bc9a5375bf92516835df2 -SIZE (xpi/firefox-i18n-57.0.2/sv-SE.xpi) = 459666 -SHA256 (xpi/firefox-i18n-57.0.2/ta.xpi) = fb8ca50c06430e851aa7f27812e223f80ac46770ce243b8fbd0785b574d9f822 -SIZE (xpi/firefox-i18n-57.0.2/ta.xpi) = 513228 -SHA256 (xpi/firefox-i18n-57.0.2/te.xpi) = 0cd211ae333511fb7047b0c9ff7643b1b34893cb6255139c8058ccb267c03a78 -SIZE (xpi/firefox-i18n-57.0.2/te.xpi) = 530693 -SHA256 (xpi/firefox-i18n-57.0.2/th.xpi) = fefbf5da1b82dc13057c322d1896834a44663369d849468acb1338fe8d2c0009 -SIZE (xpi/firefox-i18n-57.0.2/th.xpi) = 502451 -SHA256 (xpi/firefox-i18n-57.0.2/tr.xpi) = 3f42f3473a001ad4f04d5c0adbccc9a1eb467dd478d13577ac508dbf29da392c -SIZE (xpi/firefox-i18n-57.0.2/tr.xpi) = 465580 -SHA256 (xpi/firefox-i18n-57.0.2/uk.xpi) = 30bafef9fc22b8079e2ab3546a2589ad6899e9b5e45a6141d85419dbde0e86e9 -SIZE (xpi/firefox-i18n-57.0.2/uk.xpi) = 518138 -SHA256 (xpi/firefox-i18n-57.0.2/ur.xpi) = 2d3cc8579a83f5992e3b53f0f4ba1bf941400f075aab154c85c889069970cef7 -SIZE (xpi/firefox-i18n-57.0.2/ur.xpi) = 511138 -SHA256 (xpi/firefox-i18n-57.0.2/uz.xpi) = f72a755f23c77fbd7bde1f150d320ddf3516baf26131a795c3227f85a41d1b43 -SIZE (xpi/firefox-i18n-57.0.2/uz.xpi) = 461694 -SHA256 (xpi/firefox-i18n-57.0.2/vi.xpi) = 07718242af2d00df88cde15704e5af63149eafac507eaa903e9f094f7796be70 -SIZE (xpi/firefox-i18n-57.0.2/vi.xpi) = 471320 -SHA256 (xpi/firefox-i18n-57.0.2/xh.xpi) = e996e2042c168ec26fe8310343cb1d32fdebceecd633cdb403118bf679062526 -SIZE (xpi/firefox-i18n-57.0.2/xh.xpi) = 464461 -SHA256 (xpi/firefox-i18n-57.0.2/zh-CN.xpi) = d66d88d278fc54ff0081f83c0b15a4b2f47308f2bcb340332f6cf13e85dba160 -SIZE (xpi/firefox-i18n-57.0.2/zh-CN.xpi) = 483625 -SHA256 (xpi/firefox-i18n-57.0.2/zh-TW.xpi) = 9b669d4dd297915657f2d8dca25aeb51d49e9138d6d6c542e82256dfc477d696 -SIZE (xpi/firefox-i18n-57.0.2/zh-TW.xpi) = 482462 +TIMESTAMP = 1512678074 +SHA256 (xpi/firefox-i18n-58.0b10/ach.xpi) = ab740ec71bbee369e07c2445f8078e9a9be2acebcb4d9463622edb9482f3cad6 +SIZE (xpi/firefox-i18n-58.0b10/ach.xpi) = 441430 +SHA256 (xpi/firefox-i18n-58.0b10/af.xpi) = 208ba0d2424d8632f545b3cbcb90267d1534bf236322d4885927c35b5a2dbf24 +SIZE (xpi/firefox-i18n-58.0b10/af.xpi) = 442098 +SHA256 (xpi/firefox-i18n-58.0b10/an.xpi) = 07543a4195f75b624a1bf9dfa4cb3dfaa1f487e920d996d421505a207b209b1f +SIZE (xpi/firefox-i18n-58.0b10/an.xpi) = 463588 +SHA256 (xpi/firefox-i18n-58.0b10/ar.xpi) = 9dd74851c46ece73c61efc60b7ecfcd12e33b4d5c1904b702357d038333910a4 +SIZE (xpi/firefox-i18n-58.0b10/ar.xpi) = 488256 +SHA256 (xpi/firefox-i18n-58.0b10/as.xpi) = a705bd49d2099dadd5d5252a4bb7f5945aa8a9f46621823b1f83cc99e93cc749 +SIZE (xpi/firefox-i18n-58.0b10/as.xpi) = 490319 +SHA256 (xpi/firefox-i18n-58.0b10/ast.xpi) = 07e170c5421933163be2d1654a59e36fe2856bd209c88dab7e7f31629dfb6bc7 +SIZE (xpi/firefox-i18n-58.0b10/ast.xpi) = 458448 +SHA256 (xpi/firefox-i18n-58.0b10/az.xpi) = 34624296562b875e41850340d2745f590165694a95b62c78d7142fadebf84e96 +SIZE (xpi/firefox-i18n-58.0b10/az.xpi) = 466134 +SHA256 (xpi/firefox-i18n-58.0b10/be.xpi) = 1a9150d29629a93364cf973faa66fb90ee9bf8eed0e834b77b8a5907ae9a84fd +SIZE (xpi/firefox-i18n-58.0b10/be.xpi) = 515401 +SHA256 (xpi/firefox-i18n-58.0b10/bg.xpi) = 3ad3c58ef49158b182ef399ee6fe5a169dc70efb55ec8386d9436263ac76ac76 +SIZE (xpi/firefox-i18n-58.0b10/bg.xpi) = 509545 +SHA256 (xpi/firefox-i18n-58.0b10/bn-BD.xpi) = f260e6c8903b6981463b092e39c2ee00455d3fb9ff0c77e1e8342420bd70468b +SIZE (xpi/firefox-i18n-58.0b10/bn-BD.xpi) = 525568 +SHA256 (xpi/firefox-i18n-58.0b10/bn-IN.xpi) = d1ea2bd0e5bc96eea3e3ab9b1b920c7ecf7e2c7d7a3c5de69cc3a5698a00c2c0 +SIZE (xpi/firefox-i18n-58.0b10/bn-IN.xpi) = 515835 +SHA256 (xpi/firefox-i18n-58.0b10/br.xpi) = 95f003d9c9bb24bc9aac1e260d0cd4c765c9de04e1d74ab4bb209354d980233b +SIZE (xpi/firefox-i18n-58.0b10/br.xpi) = 452383 +SHA256 (xpi/firefox-i18n-58.0b10/bs.xpi) = 1273e6acf59e2da6a0fe3ce958eac04fdd8de49a02f234ba39f79e5bd948039f +SIZE (xpi/firefox-i18n-58.0b10/bs.xpi) = 459333 +SHA256 (xpi/firefox-i18n-58.0b10/ca.xpi) = 74070e81f4338806fc23307cd9c2db4957943f1e8f76f8dc33320fc4991bbcec +SIZE (xpi/firefox-i18n-58.0b10/ca.xpi) = 467483 +SHA256 (xpi/firefox-i18n-58.0b10/cak.xpi) = 67d4b9f2414b198bc9540631e99f4abeb28ee7ba7d72a5570b6ec804fb5d521f +SIZE (xpi/firefox-i18n-58.0b10/cak.xpi) = 475561 +SHA256 (xpi/firefox-i18n-58.0b10/cs.xpi) = 2084213147f863f0444281a2ecad2497f1c64c7b016e14bc45751b017738e44d +SIZE (xpi/firefox-i18n-58.0b10/cs.xpi) = 471801 +SHA256 (xpi/firefox-i18n-58.0b10/cy.xpi) = 7019caaaf956011699eb590d350080f105671a6c1c85859189c417e0308f2dab +SIZE (xpi/firefox-i18n-58.0b10/cy.xpi) = 455284 +SHA256 (xpi/firefox-i18n-58.0b10/da.xpi) = c7d466dd7f1dabc5aa1fc469e29d590b954cf5562692359b9c1c35557834369d +SIZE (xpi/firefox-i18n-58.0b10/da.xpi) = 448053 +SHA256 (xpi/firefox-i18n-58.0b10/de.xpi) = fc72b3cc6d07df4956e7eb241e59ec990135c40fcd784bf5c720d229f44b2e53 +SIZE (xpi/firefox-i18n-58.0b10/de.xpi) = 462216 +SHA256 (xpi/firefox-i18n-58.0b10/dsb.xpi) = 7a7438ef17deaa357553d0d6044436d419f67628ffacc74371fdae65f55e97b2 +SIZE (xpi/firefox-i18n-58.0b10/dsb.xpi) = 478929 +SHA256 (xpi/firefox-i18n-58.0b10/el.xpi) = 1eb7786ed8fd49a1483a2c1679c3d0cad3597570a8acd2577204230e9c1cfc8a +SIZE (xpi/firefox-i18n-58.0b10/el.xpi) = 534697 +SHA256 (xpi/firefox-i18n-58.0b10/en-GB.xpi) = bc395f6d258b83253d26f4603381cd2927998d3e66d1eabc90d42959469cb843 +SIZE (xpi/firefox-i18n-58.0b10/en-GB.xpi) = 436607 +SHA256 (xpi/firefox-i18n-58.0b10/en-US.xpi) = be8cb8a80ea06ea6355e2f06a080967955ac7d7d9d1c69d5bd2d202f7148321b +SIZE (xpi/firefox-i18n-58.0b10/en-US.xpi) = 440011 +SHA256 (xpi/firefox-i18n-58.0b10/en-ZA.xpi) = 461a9d8e1718af8a0f3cc8692cd109859c338a4bf22fbacb639cc474365ebc68 +SIZE (xpi/firefox-i18n-58.0b10/en-ZA.xpi) = 432336 +SHA256 (xpi/firefox-i18n-58.0b10/eo.xpi) = de03b7023d9abf43cecac5534106af125d2c90558372afe31ac07ddc5ad0cb2a +SIZE (xpi/firefox-i18n-58.0b10/eo.xpi) = 453839 +SHA256 (xpi/firefox-i18n-58.0b10/es-AR.xpi) = b7d18c408677698f4b012c5c59201bcac8f4a847e140e95d998d71a700446ba7 +SIZE (xpi/firefox-i18n-58.0b10/es-AR.xpi) = 462864 +SHA256 (xpi/firefox-i18n-58.0b10/es-CL.xpi) = 484514794b90954de265a00ff4bbf43e938877a49e85b71f1ee75e0c9a143d1c +SIZE (xpi/firefox-i18n-58.0b10/es-CL.xpi) = 466390 +SHA256 (xpi/firefox-i18n-58.0b10/es-ES.xpi) = 7539c54749bc04fcf82e49d6e51acebb1bd0c48d77a2f0bc3ff61ca51f0ebab9 +SIZE (xpi/firefox-i18n-58.0b10/es-ES.xpi) = 353186 +SHA256 (xpi/firefox-i18n-58.0b10/es-MX.xpi) = 1f7165f2d0d1d6e503676c153ac602268e462f0b119b41692f04a855997dbca6 +SIZE (xpi/firefox-i18n-58.0b10/es-MX.xpi) = 467914 +SHA256 (xpi/firefox-i18n-58.0b10/et.xpi) = 4b0f8905768f901d5aa9a7f96a36f607b4118b3554794f0c7b197b6c14fd162e +SIZE (xpi/firefox-i18n-58.0b10/et.xpi) = 447973 +SHA256 (xpi/firefox-i18n-58.0b10/eu.xpi) = 8e6d3df7d5fa705aff44fb86d2f927bdc8eef58688fb4ca9c013fc99622861ea +SIZE (xpi/firefox-i18n-58.0b10/eu.xpi) = 455393 +SHA256 (xpi/firefox-i18n-58.0b10/fa.xpi) = 3638cc647a7bff3e0824b20a4cd58066706a01cc7e3d7b4a398f17c2f848ddc3 +SIZE (xpi/firefox-i18n-58.0b10/fa.xpi) = 510360 +SHA256 (xpi/firefox-i18n-58.0b10/ff.xpi) = 1136580943892a8b011a4d21efb8e9a504c2bdbce824fe63be718bb330644596 +SIZE (xpi/firefox-i18n-58.0b10/ff.xpi) = 455987 +SHA256 (xpi/firefox-i18n-58.0b10/fi.xpi) = b6e046470a86b36100de71773358ae021fdf35d84f21a664d462d428fe9fe619 +SIZE (xpi/firefox-i18n-58.0b10/fi.xpi) = 447018 +SHA256 (xpi/firefox-i18n-58.0b10/fr.xpi) = 6dc017e4488082eeb2b1654e81fcc59fad5024d87c0381fa03c5635fee71b422 +SIZE (xpi/firefox-i18n-58.0b10/fr.xpi) = 472301 +SHA256 (xpi/firefox-i18n-58.0b10/fy-NL.xpi) = 4351a6794aac7eb83e1c73b1964030635bef9ff13fcbec4e6b7d0cd15b6d31bc +SIZE (xpi/firefox-i18n-58.0b10/fy-NL.xpi) = 465325 +SHA256 (xpi/firefox-i18n-58.0b10/ga-IE.xpi) = 8711580ab86ad29902e85b614c4e362f2a8c82ba57ec9ea49cf05718c769edbb +SIZE (xpi/firefox-i18n-58.0b10/ga-IE.xpi) = 476780 +SHA256 (xpi/firefox-i18n-58.0b10/gd.xpi) = 5e6b27f720702661a98028004f51637431dfba9e1b0ff7b5f5ec80e20874a02b +SIZE (xpi/firefox-i18n-58.0b10/gd.xpi) = 464518 +SHA256 (xpi/firefox-i18n-58.0b10/gl.xpi) = ce887c90a2c18bae58aee624a3951877e59e4c28803ec0ef61812fae0b5140cc +SIZE (xpi/firefox-i18n-58.0b10/gl.xpi) = 451847 +SHA256 (xpi/firefox-i18n-58.0b10/gn.xpi) = e6f6bd947da046f3190730df222e40a79c5e7896fb89cd7e74d2cc03b049b49a +SIZE (xpi/firefox-i18n-58.0b10/gn.xpi) = 472921 +SHA256 (xpi/firefox-i18n-58.0b10/gu-IN.xpi) = c716f5bd9210b3b92866da8a6ada237bbf68036cdf61741c3bbafc146607baf5 +SIZE (xpi/firefox-i18n-58.0b10/gu-IN.xpi) = 514105 +SHA256 (xpi/firefox-i18n-58.0b10/he.xpi) = 38f1bdc6ad1bfdbdd2960fc2e64bea78804e97f754b3db79d3fbaa6d0d238bbf +SIZE (xpi/firefox-i18n-58.0b10/he.xpi) = 473123 +SHA256 (xpi/firefox-i18n-58.0b10/hi-IN.xpi) = 1531b3a03889278657580f14a6f9e63f95ac23e042029ca49272640993d5a638 +SIZE (xpi/firefox-i18n-58.0b10/hi-IN.xpi) = 525403 +SHA256 (xpi/firefox-i18n-58.0b10/hr.xpi) = 4886d1cece443670a1244afa50582b09b7409ba58d452fa4320a119602793827 +SIZE (xpi/firefox-i18n-58.0b10/hr.xpi) = 463515 +SHA256 (xpi/firefox-i18n-58.0b10/hsb.xpi) = cf2457338daa0594fe79055d49000aae76a2bd07b33e25a853509f1cf2a57de4 +SIZE (xpi/firefox-i18n-58.0b10/hsb.xpi) = 475944 +SHA256 (xpi/firefox-i18n-58.0b10/hu.xpi) = da9d809983a9a0af244e802d7d1e57777384067fe370f9addcf17fd74d41f804 +SIZE (xpi/firefox-i18n-58.0b10/hu.xpi) = 476119 +SHA256 (xpi/firefox-i18n-58.0b10/hy-AM.xpi) = 947853183c856365c2cca2fcde56482cd87cd17b3b1c4d2d88c4879e63564326 +SIZE (xpi/firefox-i18n-58.0b10/hy-AM.xpi) = 511284 +SHA256 (xpi/firefox-i18n-58.0b10/id.xpi) = 62ec4f02acc26351c1422d65a2a2b7fccf83c24bb7a87af1c09acbd9eb22ec74 +SIZE (xpi/firefox-i18n-58.0b10/id.xpi) = 443290 +SHA256 (xpi/firefox-i18n-58.0b10/is.xpi) = 2dbf48c4409e462ecc6ca3056e2841eb5a70189db86fdf30cf3ce9942c366ce2 +SIZE (xpi/firefox-i18n-58.0b10/is.xpi) = 453718 +SHA256 (xpi/firefox-i18n-58.0b10/it.xpi) = 247511ed5a34c23d7dca2aeded55be8ae3dfa06be703a64733643c22c8f194fd +SIZE (xpi/firefox-i18n-58.0b10/it.xpi) = 346667 +SHA256 (xpi/firefox-i18n-58.0b10/ja.xpi) = a17aeb195c4af4fe54c54c58de60e413d933d1a5583f71556e1511f52a4735f6 +SIZE (xpi/firefox-i18n-58.0b10/ja.xpi) = 510301 +SHA256 (xpi/firefox-i18n-58.0b10/ka.xpi) = d46433f24d1a99b25744d702b174451cbaa95b8a196eb8ae09b61b9960b02c77 +SIZE (xpi/firefox-i18n-58.0b10/ka.xpi) = 491987 +SHA256 (xpi/firefox-i18n-58.0b10/kab.xpi) = 0455f5946d7dae30d6959d3123d770d37183643d2fdaf8640e53ce715ece934b +SIZE (xpi/firefox-i18n-58.0b10/kab.xpi) = 461949 +SHA256 (xpi/firefox-i18n-58.0b10/kk.xpi) = 6ed771c0028a71d65579f4d96818693501399a6a1413658cce950c025da5a181 +SIZE (xpi/firefox-i18n-58.0b10/kk.xpi) = 518497 +SHA256 (xpi/firefox-i18n-58.0b10/km.xpi) = 78616f28523c53e500e2bbff3d15bc1d811a154b7e36f7d4ddf90d2c52486944 +SIZE (xpi/firefox-i18n-58.0b10/km.xpi) = 529829 +SHA256 (xpi/firefox-i18n-58.0b10/kn.xpi) = 3fdfed6f920a31f70317d89c00e6a5d2251806b446a218b7c06c14bfa3c3822a +SIZE (xpi/firefox-i18n-58.0b10/kn.xpi) = 531974 +SHA256 (xpi/firefox-i18n-58.0b10/ko.xpi) = b7e14280aaac9b60eaab5007c8f25ec165c6f9ad927d326dbac24f7b395f3005 +SIZE (xpi/firefox-i18n-58.0b10/ko.xpi) = 486882 +SHA256 (xpi/firefox-i18n-58.0b10/lij.xpi) = 38f3f650a9d9371452e9ae669e01ee607555717a78b70413c5d40d21566cf420 +SIZE (xpi/firefox-i18n-58.0b10/lij.xpi) = 453060 +SHA256 (xpi/firefox-i18n-58.0b10/lt.xpi) = 30c3e7deb077e7df7c04fa63668d08f9387508f2ad634dc8b1a48ea80eff0d5b +SIZE (xpi/firefox-i18n-58.0b10/lt.xpi) = 474325 +SHA256 (xpi/firefox-i18n-58.0b10/lv.xpi) = cca5699c5783d716c6d447a0c1bf09477e751c53639176f5e6e07a89edd58eb0 +SIZE (xpi/firefox-i18n-58.0b10/lv.xpi) = 466036 +SHA256 (xpi/firefox-i18n-58.0b10/mai.xpi) = d88dced8b7cb7b7d168ebd389d1a2333248d2be92ac1743db5ee19986db438f3 +SIZE (xpi/firefox-i18n-58.0b10/mai.xpi) = 506590 +SHA256 (xpi/firefox-i18n-58.0b10/mk.xpi) = c5bdb231da1ed1bde12ca49dc480fd398bf65ec3e884854b1ea92dc5cff1dca4 +SIZE (xpi/firefox-i18n-58.0b10/mk.xpi) = 490037 +SHA256 (xpi/firefox-i18n-58.0b10/ml.xpi) = 1d845962d253214b490ae08a191338da5ea9aef2a5738b5e3a02f0011b9570e8 +SIZE (xpi/firefox-i18n-58.0b10/ml.xpi) = 544189 +SHA256 (xpi/firefox-i18n-58.0b10/mr.xpi) = a0013db4b525f3517f536beadf63b31f14cbf3c9ed47ecbda30b75fabbebaa92 +SIZE (xpi/firefox-i18n-58.0b10/mr.xpi) = 520641 +SHA256 (xpi/firefox-i18n-58.0b10/ms.xpi) = c8675a6e8836a35271d3a2b36d8298d42b8190192de0cdcd9c2e25c9b2784aea +SIZE (xpi/firefox-i18n-58.0b10/ms.xpi) = 450755 +SHA256 (xpi/firefox-i18n-58.0b10/my.xpi) = 0b80873c72a739e32e8cde4c1066f3052fd89d6b5192eef6367d9d212dbe43c1 +SIZE (xpi/firefox-i18n-58.0b10/my.xpi) = 516671 +SHA256 (xpi/firefox-i18n-58.0b10/nb-NO.xpi) = 055fee9d7ad6b6fe2f2881fde06e3a29ee391821cf67fdec565b54d1c5d35bd2 +SIZE (xpi/firefox-i18n-58.0b10/nb-NO.xpi) = 450959 +SHA256 (xpi/firefox-i18n-58.0b10/ne-NP.xpi) = bf36ac4c9a56b8acfa981a91f606a3e39c92134b7741c272e94291a3f56e57bd +SIZE (xpi/firefox-i18n-58.0b10/ne-NP.xpi) = 514239 +SHA256 (xpi/firefox-i18n-58.0b10/nl.xpi) = 56f15d34e96b935c3749a1e3cc2e8f03c8731074da33b507f86b1612179e283b +SIZE (xpi/firefox-i18n-58.0b10/nl.xpi) = 457920 +SHA256 (xpi/firefox-i18n-58.0b10/nn-NO.xpi) = 1020bf632b49d8dd97530d09b58e15e6b3bdb89166a911389897d2c6e5a9e484 +SIZE (xpi/firefox-i18n-58.0b10/nn-NO.xpi) = 451278 +SHA256 (xpi/firefox-i18n-58.0b10/or.xpi) = 23076bd9946773f79715c82337b926ca132baa93b462a104a3fb75e9b1313ebf +SIZE (xpi/firefox-i18n-58.0b10/or.xpi) = 500111 +SHA256 (xpi/firefox-i18n-58.0b10/pa-IN.xpi) = 9304d145515d888243999699aabe7aca29fe2e7d3178d99f8290d6b9ba2f8d56 +SIZE (xpi/firefox-i18n-58.0b10/pa-IN.xpi) = 495033 +SHA256 (xpi/firefox-i18n-58.0b10/pl.xpi) = a8b29db802fafca938544e3bd9e64ede8ca13d1649610bde17f768318996b3ad +SIZE (xpi/firefox-i18n-58.0b10/pl.xpi) = 362848 +SHA256 (xpi/firefox-i18n-58.0b10/pt-BR.xpi) = c8ab6888c578d5c3025409f39ef647b5fc498ace23e78c71db75b2bc97e5fc15 +SIZE (xpi/firefox-i18n-58.0b10/pt-BR.xpi) = 456478 +SHA256 (xpi/firefox-i18n-58.0b10/pt-PT.xpi) = f08b93c5600acadb2192b531f4592446c79adaa4a538f8793542e5e08bdc3cce +SIZE (xpi/firefox-i18n-58.0b10/pt-PT.xpi) = 459134 +SHA256 (xpi/firefox-i18n-58.0b10/rm.xpi) = f24fc2f683c21042aa13d6db625ac52d71ad91de606a0c40cd329fb84f0437d8 +SIZE (xpi/firefox-i18n-58.0b10/rm.xpi) = 452602 +SHA256 (xpi/firefox-i18n-58.0b10/ro.xpi) = 64f1437df8c30ec0a5a8728551cef13508b3e7f936931365d06ae8ed111b53f8 +SIZE (xpi/firefox-i18n-58.0b10/ro.xpi) = 456184 +SHA256 (xpi/firefox-i18n-58.0b10/ru.xpi) = a1a942db686ed23a0a07e4c8c546b8c6351238c4c3ea961dbe59ac7e72c1b405 +SIZE (xpi/firefox-i18n-58.0b10/ru.xpi) = 526132 +SHA256 (xpi/firefox-i18n-58.0b10/si.xpi) = 3a9b52086ebc64b923f2c2ded773fc700ca3c41c9ca51c7062bd8fbffa5e5583 +SIZE (xpi/firefox-i18n-58.0b10/si.xpi) = 497913 +SHA256 (xpi/firefox-i18n-58.0b10/sk.xpi) = de990779319a30e123c9a00cab286f0202e06d99ab92515872f7946adbd22d46 +SIZE (xpi/firefox-i18n-58.0b10/sk.xpi) = 479897 +SHA256 (xpi/firefox-i18n-58.0b10/sl.xpi) = 0f1180e52436d4c1f9d3c326cb36ec16cd7abf08f098dadecc585f1df3ecd01c +SIZE (xpi/firefox-i18n-58.0b10/sl.xpi) = 459133 +SHA256 (xpi/firefox-i18n-58.0b10/son.xpi) = 5c99d721dcb5873ea46cf307557520511a2cbcbd308e978dcbac653ac615d64d +SIZE (xpi/firefox-i18n-58.0b10/son.xpi) = 451480 +SHA256 (xpi/firefox-i18n-58.0b10/sq.xpi) = e17437fe3601f2fd754548d41ebfaab150957a7b713e7e2f8f710036c3a4b1ea +SIZE (xpi/firefox-i18n-58.0b10/sq.xpi) = 465919 +SHA256 (xpi/firefox-i18n-58.0b10/sr.xpi) = 318eac7dbaea71b59efe53df394d7e6bd96034a1f040ef22faaec9593a185147 +SIZE (xpi/firefox-i18n-58.0b10/sr.xpi) = 485926 +SHA256 (xpi/firefox-i18n-58.0b10/sv-SE.xpi) = 9e28aa7a6fb122eadbc75caeb551c46808b68ee6ea4ccf5fb243d4b616bdc163 +SIZE (xpi/firefox-i18n-58.0b10/sv-SE.xpi) = 459101 +SHA256 (xpi/firefox-i18n-58.0b10/ta.xpi) = 58b60322a6ea0832cc795386222461279bd03445d3c8e42622d89c270dedf4d9 +SIZE (xpi/firefox-i18n-58.0b10/ta.xpi) = 514169 +SHA256 (xpi/firefox-i18n-58.0b10/te.xpi) = 45d381819081810ad89cc80b22af4855426d3735708599a4429724b9858d227c +SIZE (xpi/firefox-i18n-58.0b10/te.xpi) = 530516 +SHA256 (xpi/firefox-i18n-58.0b10/th.xpi) = e534c80aee72e9e33aae69070e0f3a92906b481e434936183a1eac993b5a26a7 +SIZE (xpi/firefox-i18n-58.0b10/th.xpi) = 502309 +SHA256 (xpi/firefox-i18n-58.0b10/tr.xpi) = 0a0d38ce6c5040661cdd0a6ba413b1cc27723afe34a1fe42ec3ce71e49df5321 +SIZE (xpi/firefox-i18n-58.0b10/tr.xpi) = 465024 +SHA256 (xpi/firefox-i18n-58.0b10/uk.xpi) = 8185c44997b1112796ecc502f065d3443795d065d7cc6b5c2ad98380bccb2569 +SIZE (xpi/firefox-i18n-58.0b10/uk.xpi) = 517417 +SHA256 (xpi/firefox-i18n-58.0b10/ur.xpi) = 864f43988031288f5cff3d97240fbb563b5fb230b442a4aedf86295af6372ada +SIZE (xpi/firefox-i18n-58.0b10/ur.xpi) = 511530 +SHA256 (xpi/firefox-i18n-58.0b10/uz.xpi) = 962253cd296c0bb45b42faab51d19d3b709e5252151cff2a4a00bd3b3e2cdb60 +SIZE (xpi/firefox-i18n-58.0b10/uz.xpi) = 462045 +SHA256 (xpi/firefox-i18n-58.0b10/vi.xpi) = 7037c81255cd6d2e0c860b8cbcf1d849417aa3f839330b13dfaa9c709b1c19b7 +SIZE (xpi/firefox-i18n-58.0b10/vi.xpi) = 470334 +SHA256 (xpi/firefox-i18n-58.0b10/xh.xpi) = 5b173579e26a23878d09c22f5c9b55d2bf5559bf417e0ba481134dd471d29188 +SIZE (xpi/firefox-i18n-58.0b10/xh.xpi) = 464910 +SHA256 (xpi/firefox-i18n-58.0b10/zh-CN.xpi) = ad2a0b861ba66047e92de5237b6e62eb6196d63e387cb82c192b9c003b8f9513 +SIZE (xpi/firefox-i18n-58.0b10/zh-CN.xpi) = 482852 +SHA256 (xpi/firefox-i18n-58.0b10/zh-TW.xpi) = c9414fb840ee4e1ccb4dcece9d8b207ba00b89e4621ac396a480d6efd0d61af2 +SIZE (xpi/firefox-i18n-58.0b10/zh-TW.xpi) = 480461 --- b/www/firefox/Makefile +++ b/www/firefox/Makefile @@ -2,23 +2,23 @@ # $FreeBSD$ PORTNAME= firefox -DISTVERSION= 57.0.2 +DISTVERSION= 58.0b10 PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ - MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build2/source + MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source DISTFILES= ${DISTNAME}.source${EXTRACT_SUFX} MAINTAINER= gecko@FreeBSD.org COMMENT= Web browser based on the browser portion of Mozilla BUILD_DEPENDS= nspr>=4.17:devel/nspr \ - nss>=3.33:security/nss \ + nss>=3.34:security/nss \ icu>=59.1,1:devel/icu \ libevent>=2.1.8:devel/libevent \ harfbuzz>=1.5.1:print/harfbuzz \ graphite2>=1.3.10:graphics/graphite2 \ - png>=1.6.31:graphics/png \ + png>=1.6.34:graphics/png \ libvorbis>=1.3.5,3:audio/libvorbis \ libvpx>=1.5.0:multimedia/libvpx \ sqlite3>=3.20.1:databases/sqlite3 \ --- b/www/firefox/distinfo +++ b/www/firefox/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1512592860 -SHA256 (firefox-57.0.2.source.tar.xz) = cad021a13daf8fd2c951fab763e784c82aabef45e68a34c941fb64d62f1a5707 -SIZE (firefox-57.0.2.source.tar.xz) = 248772480 +TIMESTAMP = 1512678074 +SHA256 (firefox-58.0b10.source.tar.xz) = 0f2737a037e15c771fc09a75a418284e2d29f8ea15366f8ae55c1df0b9e15b5c +SIZE (firefox-58.0b10.source.tar.xz) = 248880924 --- a/www/firefox/files/patch-bug1186967 +++ /dev/null @@ -1,41 +0,0 @@ -commit 64bb4e051b50 -Author: Martin Stransky -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 --- a/www/firefox/files/patch-bug1366201 +++ /dev/null @@ -1,40 +0,0 @@ -commit 139967a109c1 -Author: Jean-Yves Avenard -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::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; --- a/www/firefox/files/patch-bug1412558 +++ /dev/null @@ -1,83 +0,0 @@ -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 platform = new PDMFactory(); -+ return MediaPrefs::FlacEnabled() && platform->SupportsMimeType(NS_LITERAL_CSTRING("audio/flac"), -+ /* DecoderDoctorDiagnostics* */ nullptr); - #else - // Until bug 1295886 is fixed. - return false; -diff --git media/ffvpx/README_MOZILLA media/ffvpx/README_MOZILLA -index 5d3a6037efe0..43144b726a92 100644 ---- media/ffvpx/README_MOZILLA -+++ media/ffvpx/README_MOZILLA -@@ -17,14 +17,6 @@ configuration files were generated as follow using the configure script: - config*: - replace: /HAVE_(MALLOC_H|ARC4RANDOM|LOCALTIME_R|MEMALIGN|POSIX_MEMALIGN)/d - --config_darwin32.h: --add to configure command: --disable-asm --disable-yasm --cc='clang -m32' -- --config_unix32.h: --add to configure command: --disable-asm --disable-yasm --cc='clang -m32' --replace: s/HAVE_SYSCTL 1/HAVE_SYSCTL 0/ and s/HAVE_MEMALIGN 1/HAVE_MEMALIGN 0/ and s/HAVE_POSIX_MEMALIGN 1/HAVE_POSIX_MEMALIGN 0/ -- -- - config_unix64.h/config_unix64.asm: - replace: s/HAVE_SYSCTL 1/HAVE_SYSCTL 0 - -diff --git media/ffvpx/config.h media/ffvpx/config.h -index dab01e05cd65..26ebe529bd98 100644 ---- media/ffvpx/config.h -+++ media/ffvpx/config.h -@@ -27,17 +27,9 @@ - #define HAVE_LIBC_MSVCRT 0 - #endif - #elif defined(XP_DARWIN) --#if defined(HAVE_64BIT_BUILD) - #include "config_darwin64.h" --#else --#include "config_darwin32.h" --#endif - #elif defined(XP_UNIX) --#if defined(HAVE_64BIT_BUILD) - #include "config_unix64.h" --#else --#include "config_unix32.h" --#endif - #endif - #include "config_common.h" - #endif // MOZ_FFVPX_CONFIG_H -diff --git old-configure.in old-configure.in -index b8ce71278548..410be683c2f6 100644 ---- old-configure.in -+++ old-configure.in -@@ -3279,11 +3279,11 @@ dnl = FFmpeg's ffvpx configuration - dnl ======================================================== - - MOZ_FFVPX= --case "$CPU_ARCH" in -- x86) -+case "$OS_ARCH:$CPU_ARCH" in -+ WINNT:x86) - MOZ_FFVPX=1 - ;; -- x86_64) -+ *:x86_64) - MOZ_FFVPX=1 - ;; - esac --- a/www/firefox/files/patch-bug1414440 +++ /dev/null @@ -1,108 +0,0 @@ -Always build libyuv x86 optimizations with Clang. - -diff --git media/libyuv/libyuv/include/libyuv/compare_row.h media/libyuv/libyuv/include/libyuv/compare_row.h -index 7abc2d4aef8f..542df1ef504b 100644 ---- media/libyuv/libyuv/include/libyuv/compare_row.h -+++ media/libyuv/libyuv/include/libyuv/compare_row.h -@@ -19,7 +19,7 @@ extern "C" { - #endif - - #if defined(__pnacl__) || defined(__CLR_VER) || \ -- (defined(__i386__) && !defined(__SSE2__)) -+ (defined(__i386__) && !defined(__SSE__) && !defined(__clang__)) - #define LIBYUV_DISABLE_X86 - #endif - // MemorySanitizer does not support assembly code yet. http://crbug.com/344505 -diff --git media/libyuv/libyuv/include/libyuv/planar_functions.h media/libyuv/libyuv/include/libyuv/planar_functions.h -index 040839c211b1..5f6a8034d209 100644 ---- media/libyuv/libyuv/include/libyuv/planar_functions.h -+++ media/libyuv/libyuv/include/libyuv/planar_functions.h -@@ -720,7 +720,7 @@ int I420Interpolate(const uint8* src0_y, - int interpolation); - - #if defined(__pnacl__) || defined(__CLR_VER) || \ -- (defined(__i386__) && !defined(__SSE2__)) -+ (defined(__i386__) && !defined(__SSE__) && !defined(__clang__)) - #define LIBYUV_DISABLE_X86 - #endif - // MemorySanitizer does not support assembly code yet. http://crbug.com/344505 -diff --git media/libyuv/libyuv/include/libyuv/rotate_row.h media/libyuv/libyuv/include/libyuv/rotate_row.h -index 2c51584eee8b..8e60a713c4cf 100644 ---- media/libyuv/libyuv/include/libyuv/rotate_row.h -+++ media/libyuv/libyuv/include/libyuv/rotate_row.h -@@ -19,7 +19,7 @@ extern "C" { - #endif - - #if defined(__pnacl__) || defined(__CLR_VER) || \ -- (defined(__i386__) && !defined(__SSE2__)) -+ (defined(__i386__) && !defined(__SSE__) && !defined(__clang__)) - #define LIBYUV_DISABLE_X86 - #endif - // MemorySanitizer does not support assembly code yet. http://crbug.com/344505 -diff --git media/libyuv/libyuv/include/libyuv/row.h media/libyuv/libyuv/include/libyuv/row.h -index f74bd9f7d17a..b8f674ba124d 100644 ---- media/libyuv/libyuv/include/libyuv/row.h -+++ media/libyuv/libyuv/include/libyuv/row.h -@@ -31,7 +31,7 @@ extern "C" { - var = 0 - - #if defined(__pnacl__) || defined(__CLR_VER) || \ -- (defined(__i386__) && !defined(__SSE2__)) -+ (defined(__i386__) && !defined(__SSE__) && !defined(__clang__)) - #define LIBYUV_DISABLE_X86 - #endif - // MemorySanitizer does not support assembly code yet. http://crbug.com/344505 -diff --git media/libyuv/libyuv/include/libyuv/scale_row.h media/libyuv/libyuv/include/libyuv/scale_row.h -index edb46cc8c647..2b2c7a0700ef 100644 ---- media/libyuv/libyuv/include/libyuv/scale_row.h -+++ media/libyuv/libyuv/include/libyuv/scale_row.h -@@ -20,7 +20,7 @@ extern "C" { - #endif - - #if defined(__pnacl__) || defined(__CLR_VER) || \ -- (defined(__i386__) && !defined(__SSE2__)) -+ (defined(__i386__) && !defined(__SSE__) && !defined(__clang__)) - #define LIBYUV_DISABLE_X86 - #endif - // MemorySanitizer does not support assembly code yet. http://crbug.com/344505 -diff --git media/libyuv/libyuv/linux.mk media/libyuv/libyuv/linux.mk -index 923345ae4d12..9e555e303913 100644 ---- media/libyuv/libyuv/linux.mk -+++ media/libyuv/libyuv/linux.mk -@@ -80,4 +80,4 @@ cpuid: util/cpuid.c libyuv.a - $(CC) $(CFLAGS) -o $@ util/cpuid.c libyuv.a - - clean: -- /bin/rm -f source/*.o *.ii *.s libyuv.a convert cpuid psnr -+ /bin/rm -f source/*.o *.ii *.s libyuv.a yuvconvert cpuid psnr -diff --git media/libyuv/libyuv/source/row_gcc.cc media/libyuv/libyuv/source/row_gcc.cc -index 8735070b619d..9df8c6a627db 100644 ---- media/libyuv/libyuv/source/row_gcc.cc -+++ media/libyuv/libyuv/source/row_gcc.cc -@@ -5479,7 +5479,7 @@ void HalfFloatRow_SSE2(const uint16* src, uint16* dst, float scale, int width) { - : "+r"(src), // %0 - "+r"(dst), // %1 - "+r"(width) // %2 -- : "x"(scale * kScaleBias) // %3 -+ : "mx"(scale * kScaleBias) // %3 - : "memory", "cc", - "xmm2", "xmm3", "xmm4", "xmm5" - ); -@@ -5515,7 +5515,7 @@ void HalfFloatRow_AVX2(const uint16* src, uint16* dst, float scale, int width) { - : "+r"(src), // %0 - "+r"(dst), // %1 - "+r"(width) // %2 -- : "x"(scale * kScaleBias) // %3 -+ : "mx"(scale * kScaleBias) // %3 - : "memory", "cc", - "xmm2", "xmm3", "xmm4", "xmm5" - ); -@@ -5548,7 +5548,7 @@ void HalfFloatRow_F16C(const uint16* src, uint16* dst, float scale, int width) { - : "+r"(src), // %0 - "+r"(dst), // %1 - "+r"(width) // %2 -- : "x"(scale) // %3 -+ : "mx"(scale) // %3 - : "memory", "cc", - "xmm2", "xmm3", "xmm4" - ); --- b/www/firefox/files/patch-bug826985 +++ b/www/firefox/files/patch-bug826985 @@ -13,32 +13,32 @@ Date: Fri Jan 4 13:49:22 2013 +0100 toolkit/library/Makefile.in | 1 + 6 files changed, 52 insertions(+), 1 deletion(-) -diff --git config/system-headers config/system-headers -index 55e4cd1..76567b3 100644 ---- config/system-headers -+++ config/system-headers -@@ -624,6 +624,7 @@ libgnome/libgnome.h - libgnomeui/gnome-icon-lookup.h - libgnomeui/gnome-icon-theme.h - libgnomeui/gnome-ui-init.h -+libv4l2.h - limits.h - link.h - #ifdef ANDROID +diff --git config/system-headers.mozbuild config/system-headers.mozbuild +index e02d381a12e9..7620b4d00623 100644 +--- config/system-headers.mozbuild ++++ config/system-headers.mozbuild +@@ -428,6 +428,7 @@ system_headers = [ + 'libgnomeui/gnome-icon-theme.h', + 'libgnomeui/gnome-ui-init.h', + 'libutil.h', ++ 'libv4l2.h', + 'limits.h', + 'link.h', + 'linux/ioprio.h', diff --git old-configure.in configure.in index 55e4cd1..76567b3 100644 --- old-configure.in +++ old-configure.in -@@ -5309,6 +5309,9 @@ if test -n "$MOZ_WEBRTC"; then - MOZ_VP8_ENCODER=1 - MOZ_VP8_ERROR_CONCEALMENT=1 - +@@ -2558,6 +2558,9 @@ if test -n "$MOZ_WEBRTC"; then + if test -n "$MOZ_X11"; then + MOZ_WEBRTC_X11_LIBS="-lXext -lXdamage -lXfixes -lXcomposite" + fi ++ + dnl with libv4l2 we can support more cameras + PKG_CHECK_MODULES(MOZ_LIBV4L2, libv4l2) -+ - dnl enable once Signaling lands - MOZ_WEBRTC_SIGNALING=1 - AC_DEFINE(MOZ_WEBRTC_SIGNALING) + else + MOZ_SYNTH_PICO= + fi diff --git build/gyp.mozbuild build/gyp.mozbuild index b483cd1..f1dd1f0 100644 --- build/gyp.mozbuild --- b/www/firefox/files/patch-bug847568 +++ b/www/firefox/files/patch-bug847568 @@ -1,43 +1,34 @@ # Allow building against system-wide graphite2/harfbuzz. -diff --git config/Makefile.in config/Makefile.in -index e2e11dc0e27e..a6206bb0ff30 100644 ---- config/Makefile.in -+++ config/Makefile.in -@@ -41,6 +41,8 @@ export:: $(export-preqs) - $(PYTHON) -m mozbuild.action.preprocessor $(DEFINES) $(ACDEFINES) \ - -DMOZ_TREE_CAIRO=$(MOZ_TREE_CAIRO) \ - -DMOZ_TREE_PIXMAN=$(MOZ_TREE_PIXMAN) \ -+ -DMOZ_SYSTEM_GRAPHITE2=$(MOZ_SYSTEM_GRAPHITE2) \ -+ -DMOZ_SYSTEM_HARFBUZZ=$(MOZ_SYSTEM_HARFBUZZ) \ - -DMOZ_SYSTEM_HUNSPELL=$(MOZ_SYSTEM_HUNSPELL) \ - -DMOZ_SYSTEM_BZ2=$(MOZ_SYSTEM_BZ2) \ - -DMOZ_SYSTEM_ZLIB=$(MOZ_SYSTEM_ZLIB) \ -diff --git config/system-headers config/system-headers -index a0c53c651a3e..5ee7f71f9634 100644 ---- config/system-headers -+++ config/system-headers -@@ -1269,6 +1269,15 @@ libsn/sn-launcher.h - libsn/sn-monitor.h - libsn/sn-util.h - #endif -+#if MOZ_SYSTEM_GRAPHITE2==1 -+graphite2/Font.h -+graphite2/Segment.h -+#endif -+#if MOZ_SYSTEM_HARFBUZZ==1 -+harfbuzz/hb-glib.h -+harfbuzz/hb-ot.h -+harfbuzz/hb.h -+#endif - #if MOZ_SYSTEM_HUNSPELL==1 - hunspell.hxx - #endif +diff --git config/system-headers.mozbuild config/system-headers.mozbuild +index 7620b4d00623..09d3db5ca8c0 100644 +--- config/system-headers.mozbuild ++++ config/system-headers.mozbuild +@@ -1312,6 +1312,19 @@ if not CONFIG['MOZ_TREE_PIXMAN']: + 'pixman.h', + ] + ++if CONFIG['MOZ_SYSTEM_GRAPHITE2']: ++ system_headers += [ ++ 'graphite2/Font.h', ++ 'graphite2/Segment.h', ++ ] ++ ++if CONFIG['MOZ_SYSTEM_HARFBUZZ']: ++ system_headers += [ ++ 'harfbuzz/hb-glib.h', ++ 'harfbuzz/hb-ot.h', ++ 'harfbuzz/hb.h', ++ ] ++ + if CONFIG['MOZ_SYSTEM_LIBVPX']: + system_headers += [ + 'vpx_mem/vpx_mem.h', diff --git dom/base/moz.build dom/base/moz.build index 8e19020315ae..2fcdbb6f7b42 100644 --- dom/base/moz.build +++ dom/base/moz.build -@@ -464,6 +464,9 @@ if CONFIG['MOZ_BUILD_APP'] in ['browser', 'mobile/android', 'xulrunner']: +@@ -470,6 +470,9 @@ if CONFIG['MOZ_BUILD_APP'] in ['browser', 'mobile/android', 'xulrunner']: if CONFIG['MOZ_X11']: CXXFLAGS += CONFIG['TK_CFLAGS'] @@ -120,7 +111,7 @@ diff --git gfx/skia/generate_mozbuild.py gfx/skia/generate_mozbuild.py index e06ae3457a47..93faa61594a3 100755 --- gfx/skia/generate_mozbuild.py +++ gfx/skia/generate_mozbuild.py -@@ -143,6 +143,9 @@ if CONFIG['CLANG_CXX'] or CONFIG['CLANG_CL']: +@@ -135,6 +135,9 @@ if CONFIG['CLANG_CXX'] or CONFIG['CLANG_CL']: '-Wno-unused-private-field', ] @@ -134,7 +125,7 @@ diff --git gfx/skia/moz.build gfx/skia/moz.build index 2118677ca3a8..e4978b413784 100644 --- gfx/skia/moz.build +++ gfx/skia/moz.build -@@ -753,6 +753,9 @@ if CONFIG['CLANG_CXX'] or CONFIG['CLANG_CL']: +@@ -780,6 +780,9 @@ if CONFIG['CLANG_CXX'] or CONFIG['CLANG_CL']: '-Wno-unused-private-field', ] @@ -148,7 +139,7 @@ diff --git gfx/thebes/moz.build gfx/thebes/moz.build index 56f1b9fe3f4b..0ac1100b0df3 100644 --- gfx/thebes/moz.build +++ gfx/thebes/moz.build -@@ -269,7 +269,13 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3'): +@@ -267,7 +267,13 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3'): LOCAL_INCLUDES += CONFIG['SKIA_INCLUDES'] @@ -167,9 +158,9 @@ diff --git intl/unicharutil/util/moz.build intl/unicharutil/util/moz.build index cb1233c56d7e..06fb1f9f174b 100644 --- intl/unicharutil/util/moz.build +++ intl/unicharutil/util/moz.build -@@ -29,4 +29,7 @@ if CONFIG['ENABLE_INTL_API']: - 'ICUUtils.cpp', - ] +@@ -25,4 +25,7 @@ UNIFIED_SOURCES += [ + 'nsUnicodeProperties.cpp', + ] +if CONFIG['MOZ_SYSTEM_HARFBUZZ']: + CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS'] @@ -179,24 +170,22 @@ diff --git netwerk/dns/moz.build netwerk/dns/moz.build index 79c26e3e7001..c4d93bc5f7dc 100644 --- netwerk/dns/moz.build +++ netwerk/dns/moz.build -@@ -69,6 +69,9 @@ LOCAL_INCLUDES += [ - '/netwerk/base', - ] +@@ -73,3 +73,6 @@ USE_LIBS += ['icu'] + if CONFIG['GNU_CXX']: + CXXFLAGS += ['-Wno-error=shadow'] ++ +if CONFIG['MOZ_SYSTEM_HARFBUZZ']: + CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS'] -+ - if CONFIG['ENABLE_INTL_API']: - DEFINES['IDNA2008'] = True - USE_LIBS += ['icu'] diff --git old-configure.in old-configure.in index 95a58b634593..b614eef85c89 100644 --- old-configure.in +++ old-configure.in -@@ -4888,6 +4888,27 @@ dnl ======================================================== +@@ -4333,6 +4333,27 @@ dnl ======================================================== + AC_SUBST(MOZ_LINUX_32_SSE2_STARTUP_ERROR) - dnl ======================================================== ++dnl ======================================================== +dnl Check for graphite2 +dnl ======================================================== +if test -n "$MOZ_SYSTEM_GRAPHITE2"; then @@ -217,15 +206,14 @@ index 95a58b634593..b614eef85c89 100644 + CFLAGS=$_SAVE_CFLAGS +fi + -+dnl ======================================================== + dnl ======================================================== dnl Check for pixman and cairo dnl ======================================================== - diff --git toolkit/library/moz.build toolkit/library/moz.build index 24f940e1ed7e..079a575adec3 100644 --- toolkit/library/moz.build +++ toolkit/library/moz.build -@@ -224,6 +224,12 @@ if CONFIG['MOZ_SYSTEM_JPEG']: +@@ -231,6 +231,12 @@ if CONFIG['MOZ_SYSTEM_JPEG']: if CONFIG['MOZ_SYSTEM_PNG']: OS_LIBS += CONFIG['MOZ_PNG_LIBS'] @@ -242,9 +230,9 @@ diff --git toolkit/moz.configure toolkit/moz.configure index 9297e4d6f501..d8e273887e4b 100644 --- toolkit/moz.configure +++ toolkit/moz.configure -@@ -356,6 +356,26 @@ add_old_configure_assignment('FT2_LIBS', +@@ -1065,6 +1065,26 @@ add_old_configure_assignment('FT2_LIBS', add_old_configure_assignment('FT2_CFLAGS', - delayed_getattr(ft2_info, 'cflags')) + ft2_info.cflags) +# Graphite2 +# ============================================================== @@ -266,6 +254,6 @@ index 9297e4d6f501..d8e273887e4b 100644 + +set_config('MOZ_SYSTEM_HARFBUZZ', depends_if(system_harfbuzz)(lambda _: True)) + - # Apple platform decoder support + # Mortar # ============================================================== - @depends(toolkit) + option('--enable-mortar', help='Enable mortar extension') --- /dev/null +++ b/www/firefox/files/patch-dom_media_flac_FlacDecoder.cpp @@ -0,0 +1,25 @@ +Enable FLAC on platforms without ffvpx like powerpc* + +diff --git dom/media/flac/FlacDecoder.cpp dom/media/flac/FlacDecoder.cpp +index 53fc3c9937f7..b23771ab80fa 100644 +--- dom/media/flac/FlacDecoder.cpp ++++ dom/media/flac/FlacDecoder.cpp +@@ -7,6 +7,7 @@ + #include "FlacDecoder.h" + #include "MediaContainerType.h" + #include "MediaPrefs.h" ++#include "PDMFactory.h" + + namespace mozilla { + +@@ -15,6 +16,10 @@ FlacDecoder::IsEnabled() + { + #ifdef MOZ_FFVPX + return MediaPrefs::FlacEnabled(); ++#elif defined(MOZ_FFMPEG) ++ RefPtr platform = new PDMFactory(); ++ return MediaPrefs::FlacEnabled() && platform->SupportsMimeType(NS_LITERAL_CSTRING("audio/flac"), ++ /* DecoderDoctorDiagnostics* */ nullptr); + #else + // Until bug 1295886 is fixed. + return false; --- /dev/null +++ b/www/firefox/files/patch-toolkit_moz.configure @@ -0,0 +1,15 @@ +diff --git toolkit/moz.configure toolkit/moz.configure +index 1befea00c485..7999b7acd5bd 100644 +--- toolkit/moz.configure ++++ toolkit/moz.configure +@@ -842,8 +842,8 @@ def webrender(value, milestone): + enable_webrender = None + + if value.origin == 'default': +- # if nothing is specified, default to just building on Nightly +- build_webrender = milestone.is_nightly ++ # build by default downstream ++ build_webrender = True + elif len(value) and value[0] == 'build': + # if explicitly set to 'build', then we build but don't enable + build_webrender = True --- b/www/firefox/files/patch-z-bug517422 +++ b/www/firefox/files/patch-z-bug517422 @@ -4,7 +4,7 @@ diff --git build/moz.configure/old.configure build/moz.configure/old.configure index d0fe7accffe6..c46bdd023225 100644 --- build/moz.configure/old.configure +++ build/moz.configure/old.configure -@@ -288,7 +288,12 @@ def old_configure_options(*options): +@@ -285,7 +285,12 @@ def old_configure_options(*options): '--with-system-libvpx', '--with-system-nspr', '--with-system-nss', @@ -17,29 +17,13 @@ index d0fe7accffe6..c46bdd023225 100644 '--with-system-zlib', '--with-thumb', '--with-thumb-interwork', -diff --git config/Makefile.in config/Makefile.in -index a6206bb0ff30..f20987c61754 100644 ---- config/Makefile.in -+++ config/Makefile.in -@@ -51,6 +51,11 @@ export:: $(export-preqs) - -DMOZ_SYSTEM_LIBEVENT=$(MOZ_SYSTEM_LIBEVENT) \ - -DMOZ_SYSTEM_LIBVPX=$(MOZ_SYSTEM_LIBVPX) \ - -DMOZ_SYSTEM_ICU=$(MOZ_SYSTEM_ICU) \ -+ -DMOZ_SYSTEM_OGG=$(MOZ_SYSTEM_OGG) \ -+ -DMOZ_SYSTEM_THEORA=$(MOZ_SYSTEM_THEORA) \ -+ -DMOZ_SYSTEM_VORBIS=$(MOZ_SYSTEM_VORBIS) \ -+ -DMOZ_SYSTEM_TREMOR=$(MOZ_SYSTEM_TREMOR) \ -+ -DMOZ_SYSTEM_SOUNDTOUCH=$(MOZ_SYSTEM_SOUNDTOUCH) \ - $(srcdir)/system-headers $(srcdir)/stl-headers | $(PERL) $(topsrcdir)/nsprpub/config/make-system-wrappers.pl system_wrappers - $(INSTALL) system_wrappers $(DIST) - diff --git config/external/moz.build config/external/moz.build index 029ff8504795..2c3a40caa1ba 100644 --- config/external/moz.build +++ config/external/moz.build -@@ -21,12 +21,21 @@ if CONFIG['MOZ_UPDATER']: - external_dirs += ['modules/brotli'] - external_dirs += ['modules/woff2'] +@@ -23,12 +23,21 @@ external_dirs += ['modules/woff2'] + + external_dirs += ['modules/xz-embedded'] -if CONFIG['MOZ_VORBIS']: +if not CONFIG['MOZ_SYSTEM_OGG']: @@ -61,7 +45,7 @@ index 029ff8504795..2c3a40caa1ba 100644 if CONFIG['MOZ_WEBM_ENCODER']: external_dirs += ['media/libmkv'] -@@ -52,12 +61,9 @@ external_dirs += [ +@@ -51,12 +60,9 @@ external_dirs += [ 'media/kiss_fft', 'media/libcubeb', 'media/libnestegg', @@ -74,33 +58,44 @@ index 029ff8504795..2c3a40caa1ba 100644 'media/psshparser' ] -diff --git config/system-headers config/system-headers -index 5ee7f71f9634..13178ac3b3ab 100644 ---- config/system-headers -+++ config/system-headers -@@ -1348,3 +1348,17 @@ unicode/utypes.h - libutil.h - unwind.h - fenv.h -+#if MOZ_SYSTEM_OGG==1 -+ogg/ogg.h -+ogg/os_types.h -+#endif -+#if MOZ_SYSTEM_THEORA==1 -+theora/theoradec.h -+#endif -+#if MOZ_SYSTEM_VORBIS==1 -+vorbis/codec.h -+vorbis/vorbisenc.h -+#endif -+#if MOZ_SYSTEM_TREMOR==1 -+tremor/ivorbiscodec.h -+#endif +diff --git config/system-headers.mozbuild config/system-headers.mozbuild +index 09d3db5ca8c0..c6533b84c470 100644 +--- config/system-headers.mozbuild ++++ config/system-headers.mozbuild +@@ -1325,6 +1325,28 @@ if CONFIG['MOZ_SYSTEM_HARFBUZZ']: + 'harfbuzz/hb.h', + ] + ++if CONFIG['MOZ_SYSTEM_OGG']: ++ system_headers += [ ++ 'ogg/ogg.h', ++ 'ogg/os_types.h', ++ ] ++ ++if CONFIG['MOZ_SYSTEM_THEORA']: ++ system_headers += [ ++ 'theora/theoradec.h', ++ ] ++ ++if CONFIG['MOZ_SYSTEM_VORBIS']: ++ system_headers += [ ++ 'vorbis/codec.h', ++ 'vorbis/vorbisenc.h', ++ ] ++ ++if CONFIG['MOZ_SYSTEM_TREMOR']: ++ system_headers += [ ++ 'tremor/ivorbiscodec.h', ++ ] ++ + if CONFIG['MOZ_SYSTEM_LIBVPX']: + system_headers += [ + 'vpx_mem/vpx_mem.h', diff --git dom/media/AudioStream.cpp dom/media/AudioStream.cpp index 93ecda4319af..ff674c64ea07 100644 --- dom/media/AudioStream.cpp +++ dom/media/AudioStream.cpp -@@ -115,7 +115,9 @@ AudioStream::AudioStream(DataSource& aSource) +@@ -121,7 +121,9 @@ AudioStream::AudioStream(DataSource& aSource) : mMonitor("AudioStream") , mChannels(0) , mOutChannels(0) @@ -110,7 +105,7 @@ index 93ecda4319af..ff674c64ea07 100644 , mDumpFile(nullptr) , mState(INITIALIZED) , mDataSource(aSource) -@@ -135,9 +137,11 @@ AudioStream::~AudioStream() +@@ -142,9 +144,11 @@ AudioStream::~AudioStream() if (mDumpFile) { fclose(mDumpFile); } @@ -122,7 +117,7 @@ index 93ecda4319af..ff674c64ea07 100644 #if defined(XP_WIN) if (XRE_IsContentProcess()) { audio::AudioNotificationReceiver::Unregister(this); -@@ -151,7 +155,11 @@ nsresult AudioStream::EnsureTimeStretcherInitializedUnlocked() +@@ -168,7 +172,11 @@ nsresult AudioStream::EnsureTimeStretcherInitializedUnlocked() { mMonitor.AssertCurrentThreadOwns(); if (!mTimeStretcher) { @@ -138,7 +133,7 @@ diff --git dom/media/AudioStream.h dom/media/AudioStream.h index 7dc1f60f95cc..67d402a4117f 100644 --- dom/media/AudioStream.h +++ dom/media/AudioStream.h -@@ -16,7 +16,11 @@ +@@ -15,7 +15,11 @@ #include "mozilla/TimeStamp.h" #include "mozilla/UniquePtr.h" #include "CubebUtils.h" @@ -148,9 +143,9 @@ index 7dc1f60f95cc..67d402a4117f 100644 #include "soundtouch/SoundTouchFactory.h" +#endif - namespace mozilla { - -@@ -287,7 +291,11 @@ private: + #if defined(XP_WIN) + #include "mozilla/audio/AudioNotificationReceiver.h" +@@ -297,7 +301,11 @@ private: uint32_t mChannels; uint32_t mOutChannels; AudioClock mAudioClock; @@ -166,7 +161,7 @@ diff --git dom/media/moz.build dom/media/moz.build index 86b051c58d33..fb6186dce78b 100644 --- dom/media/moz.build +++ dom/media/moz.build -@@ -308,6 +308,21 @@ if CONFIG['MOZ_WEBRTC']: +@@ -318,6 +318,21 @@ if CONFIG['MOZ_WEBRTC']: DEFINES['MOZILLA_INTERNAL_API'] = True @@ -185,9 +180,9 @@ index 86b051c58d33..fb6186dce78b 100644 +if CONFIG['MOZ_SYSTEM_SOUNDTOUCH']: + CXXFLAGS += CONFIG['MOZ_SOUNDTOUCH_CFLAGS'] + - if CONFIG['OS_TARGET'] == 'WINNT': - DEFINES['WEBRTC_WIN'] = True - else: + if CONFIG['MOZ_ANDROID_HLS_SUPPORT']: + DEFINES['MOZ_ANDROID_HLS_SUPPORT'] = True + diff --git dom/media/platforms/ffmpeg/ffvpx/FFVPXRuntimeLinker.cpp dom/media/platforms/ffmpeg/ffvpx/FFVPXRuntimeLinker.cpp index 078f6ea5ef60..c600db067539 100644 --- dom/media/platforms/ffmpeg/ffvpx/FFVPXRuntimeLinker.cpp @@ -206,7 +201,7 @@ index 078f6ea5ef60..c600db067539 100644 namespace mozilla { -@@ -50,6 +54,12 @@ FFVPXRuntimeLinker::Init() +@@ -54,6 +58,12 @@ FFVPXRuntimeLinker::Init() sLinkStatus = LinkStatus_FAILED; @@ -219,7 +214,7 @@ index 078f6ea5ef60..c600db067539 100644 // We retrieve the path of the lgpllibs library as this is where mozavcodec // and mozavutil libs are located. char* lgpllibsname = PR_GetLibraryName(nullptr, "lgpllibs"); -@@ -60,6 +70,7 @@ FFVPXRuntimeLinker::Init() +@@ -64,6 +74,7 @@ FFVPXRuntimeLinker::Init() PR_GetLibraryFilePathname(lgpllibsname, (PRFuncPtr)&soundtouch::SoundTouch::getVersionId); PR_FreeLibraryName(lgpllibsname); @@ -312,7 +307,7 @@ diff --git media/libvorbis/README_MOZILLA media/libvorbis/README_MOZILLA index 1211ac074b33..eb31084aed25 100644 --- media/libvorbis/README_MOZILLA +++ media/libvorbis/README_MOZILLA -@@ -8,3 +8,6 @@ https://svn.xiph.org/tags/vorbis/libvorbis-1.3.5@19464 +@@ -8,3 +8,6 @@ from https://git.xiph.org/vorbis.git Some files are renamed during the copy to prevent clashes with object file names with other Mozilla libraries. @@ -334,9 +329,9 @@ diff --git old-configure.in old-configure.in index b614eef85c89..85f9099dba4d 100644 --- old-configure.in +++ old-configure.in -@@ -2941,6 +2941,111 @@ if test -n "$MOZ_OMX_PLUGIN"; then - fi +@@ -2627,6 +2627,111 @@ if test -n "$MOZ_APPLEMEDIA"; then fi + fi # COMPILE_ENVIRONMENT +dnl ======================================================== +dnl Check for libogg @@ -450,7 +445,7 @@ diff --git toolkit/library/moz.build toolkit/library/moz.build index 079a575adec3..514d901195de 100644 --- toolkit/library/moz.build +++ toolkit/library/moz.build -@@ -237,6 +237,21 @@ if CONFIG['MOZ_SYSTEM_HARFBUZZ']: +@@ -240,6 +240,21 @@ if CONFIG['MOZ_SYSTEM_HARFBUZZ']: if CONFIG['MOZ_SYSTEM_HUNSPELL']: OS_LIBS += CONFIG['MOZ_HUNSPELL_LIBS'] @@ -476,7 +471,7 @@ diff --git xpcom/build/XPCOMInit.cpp xpcom/build/XPCOMInit.cpp index c083ab4bc4f3..62b917043a2c 100644 --- xpcom/build/XPCOMInit.cpp +++ xpcom/build/XPCOMInit.cpp -@@ -154,7 +154,9 @@ extern nsresult nsStringInputStreamConstructor(nsISupports*, REFNSIID, void**); +@@ -132,7 +132,9 @@ extern nsresult nsStringInputStreamConstructor(nsISupports*, REFNSIID, void**); #include "mozilla/ipc/GeckoChildProcessHost.h" @@ -486,7 +481,7 @@ index c083ab4bc4f3..62b917043a2c 100644 #if defined(MOZ_VPX) && !defined(MOZ_VPX_NO_MEM_REPORTING) #if defined(HAVE_STDINT_H) // mozilla-config.h defines HAVE_STDINT_H, and then it's defined *again* in -@@ -664,11 +666,13 @@ NS_InitXPCOM2(nsIServiceManager** aResult, +@@ -639,11 +641,13 @@ NS_InitXPCOM2(nsIServiceManager** aResult, // this oddness. mozilla::SetICUMemoryFunctions();