@@ -, +, @@ --- Mk/Uses/gecko.mk | 4 +- Mk/bsd.gecko.mk | 6 +- www/firefox-i18n/Makefile | 4 +- 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 | 102 +++--- .../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?= 50 BUILD_DEPENDS+= llvm${MESA_LLVM_VER}>0:devel/llvm${MESA_LLVM_VER} MOZ_EXPORT+= LLVM_CONFIG=llvm-config${MESA_LLVM_VER} +.if ${MOZILLA_VER:R:R} < 58 MOZ_EXPORT+= BINDGEN_CFLAGS="${BINDGEN_CFLAGS}" -# XXX bug 1341234 . if ! ${USE_MOZILLA:M-nspr} BINDGEN_CFLAGS+=-isystem${LOCALBASE}/include/nspr . endif . if ! ${USE_MOZILLA:M-pixman} BINDGEN_CFLAGS+=-isystem${LOCALBASE}/include/pixman-1 . endif +.endif # MOZILLA_VER < 58 .endif .if ${OPSYS} == FreeBSD && ${OSREL} == 11.1 @@ -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} \ @@ -395,7 +397,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,7 +2,7 @@ # $FreeBSD$ PORTNAME= firefox-i18n -PORTVERSION= 57.0.4 +PORTVERSION= 58.0b14 CATEGORIES= www MASTER_SITES= MOZILLA/${PORTNAME:S|-i18n||}/releases/${DISTVERSION}/linux-i686/xpi \ MOZILLA/${PORTNAME:S|-i18n||}/candidates/${DISTVERSION}-candidates/build1/linux-i686/xpi @@ -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 = 1515099818 -SHA256 (xpi/firefox-i18n-57.0.4/ach.xpi) = 0db61e82a56775653e8863cf46e92d7791ad855b789c326ad58dfbbf996a3880 -SIZE (xpi/firefox-i18n-57.0.4/ach.xpi) = 441113 -SHA256 (xpi/firefox-i18n-57.0.4/af.xpi) = 018e8ca7b2ac1ca55f53bded94cb979d0872986ee494864330b97457d9efd7e0 -SIZE (xpi/firefox-i18n-57.0.4/af.xpi) = 442206 -SHA256 (xpi/firefox-i18n-57.0.4/an.xpi) = 2a536acaa8efa972b4a74bd8a786607eee939f97ea6c5aa5773f7132f42638fa -SIZE (xpi/firefox-i18n-57.0.4/an.xpi) = 462778 -SHA256 (xpi/firefox-i18n-57.0.4/ar.xpi) = cba589fa5e88446edf0d051e80c02f1a06224ad0b8d66a2de81cde615b78f01d -SIZE (xpi/firefox-i18n-57.0.4/ar.xpi) = 488160 -SHA256 (xpi/firefox-i18n-57.0.4/as.xpi) = 758d4830417c3fff4cef797c12afac34d915e8940061e907ac68083f1c46c592 -SIZE (xpi/firefox-i18n-57.0.4/as.xpi) = 491075 -SHA256 (xpi/firefox-i18n-57.0.4/ast.xpi) = fb8b1c0c67bacf1cadafb43ffc639038a32fc5318be0dd691f8929ee2bd2b01e -SIZE (xpi/firefox-i18n-57.0.4/ast.xpi) = 455504 -SHA256 (xpi/firefox-i18n-57.0.4/az.xpi) = 17f7ac16870d6ce48ca02d45ba9a35bc42b58e85f2e86767f211fb956d2a83c6 -SIZE (xpi/firefox-i18n-57.0.4/az.xpi) = 466045 -SHA256 (xpi/firefox-i18n-57.0.4/be.xpi) = b55f05cbb024c897a1f648cbc111a1802ad60b83531ebe3f9f5453606bed471c -SIZE (xpi/firefox-i18n-57.0.4/be.xpi) = 516092 -SHA256 (xpi/firefox-i18n-57.0.4/bg.xpi) = b715180f7c48239b8d3404f1cfc102c0142e22f2aa7ac19877177e7a7f08d46a -SIZE (xpi/firefox-i18n-57.0.4/bg.xpi) = 510351 -SHA256 (xpi/firefox-i18n-57.0.4/bn-BD.xpi) = da35dcf4bad2ec7484a4c9f0ddcb1424190e564e69801fbf2bbd94ee1d0c2a56 -SIZE (xpi/firefox-i18n-57.0.4/bn-BD.xpi) = 527189 -SHA256 (xpi/firefox-i18n-57.0.4/bn-IN.xpi) = 9093099dbb01f46e6b1aac94f401d1417985233dba072cfdbefecf7031756e81 -SIZE (xpi/firefox-i18n-57.0.4/bn-IN.xpi) = 516180 -SHA256 (xpi/firefox-i18n-57.0.4/br.xpi) = 198aead2f677fe5185edfc2abf3c83735e5b7f1cd19a2aaf7362b57003974eb4 -SIZE (xpi/firefox-i18n-57.0.4/br.xpi) = 451866 -SHA256 (xpi/firefox-i18n-57.0.4/bs.xpi) = 6ba5d0950dc28aa070f32b2d613ce0913420ce2022004b1c189f253b2b17847a -SIZE (xpi/firefox-i18n-57.0.4/bs.xpi) = 459650 -SHA256 (xpi/firefox-i18n-57.0.4/ca.xpi) = 6ef787d51d1bcd2426d3426ea57d0cdab244fc49b93f19226291cb6b7c06b30e -SIZE (xpi/firefox-i18n-57.0.4/ca.xpi) = 466641 -SHA256 (xpi/firefox-i18n-57.0.4/cak.xpi) = 099d5847c14fdf22dc81c1bb581d136d292b01714d99de2cdadeac3c2988e561 -SIZE (xpi/firefox-i18n-57.0.4/cak.xpi) = 475935 -SHA256 (xpi/firefox-i18n-57.0.4/cs.xpi) = ec2f172874be86e1c3950998e26cc77535ca8121db63c96d34068c58c3179d99 -SIZE (xpi/firefox-i18n-57.0.4/cs.xpi) = 469457 -SHA256 (xpi/firefox-i18n-57.0.4/cy.xpi) = 71f431a351e93c74c10f569601bb32ec990ea2a16b6bfb5f724966d0d7520bc6 -SIZE (xpi/firefox-i18n-57.0.4/cy.xpi) = 455788 -SHA256 (xpi/firefox-i18n-57.0.4/da.xpi) = 5a4a0a5aa93c19c4f5fb5aab3f83765ddfd2f993d1cb8278de1366f5626fc925 -SIZE (xpi/firefox-i18n-57.0.4/da.xpi) = 448416 -SHA256 (xpi/firefox-i18n-57.0.4/de.xpi) = 4370210b943ebbf8b814a6e04be9c7e99416c2ff4c54c31748f781f44309e36c -SIZE (xpi/firefox-i18n-57.0.4/de.xpi) = 460813 -SHA256 (xpi/firefox-i18n-57.0.4/dsb.xpi) = 5170e4e0e160405dd3ed5515e35fe36dae70aec8f48102345619e5c75bd1488a -SIZE (xpi/firefox-i18n-57.0.4/dsb.xpi) = 479509 -SHA256 (xpi/firefox-i18n-57.0.4/el.xpi) = 9d2e01e55e1fd7d39b8a0a923088334dc00dca0547fd5985aaeed6319cce5095 -SIZE (xpi/firefox-i18n-57.0.4/el.xpi) = 534484 -SHA256 (xpi/firefox-i18n-57.0.4/en-GB.xpi) = ae4e8350e6a36cdeb8bfb31341bef5bba1eb48b6915b99a34a6cde2fd838651e -SIZE (xpi/firefox-i18n-57.0.4/en-GB.xpi) = 435623 -SHA256 (xpi/firefox-i18n-57.0.4/en-US.xpi) = 3afb8de6b06406aa92c2b7c353286823c06cdb45218af798278c04ab67d85032 -SIZE (xpi/firefox-i18n-57.0.4/en-US.xpi) = 441879 -SHA256 (xpi/firefox-i18n-57.0.4/en-ZA.xpi) = 92c5c01f2b5513d49aca2c453721026ac006cda7b1ed260083b8f101197dd9ea -SIZE (xpi/firefox-i18n-57.0.4/en-ZA.xpi) = 432020 -SHA256 (xpi/firefox-i18n-57.0.4/eo.xpi) = b71b76d3a61b243bcdb71e02ed3e1752adf35301d45a441c21faa770799ce196 -SIZE (xpi/firefox-i18n-57.0.4/eo.xpi) = 454910 -SHA256 (xpi/firefox-i18n-57.0.4/es-AR.xpi) = 0c9ffc8db2fba0359bf69b6bf82b3be15b939dc834bb021cfaef88646abc9e3e -SIZE (xpi/firefox-i18n-57.0.4/es-AR.xpi) = 462980 -SHA256 (xpi/firefox-i18n-57.0.4/es-CL.xpi) = 3f3af7c94265797b7947a6ca5b3868eab036dc2562777ff9a9c65cfcda9a5648 -SIZE (xpi/firefox-i18n-57.0.4/es-CL.xpi) = 465514 -SHA256 (xpi/firefox-i18n-57.0.4/es-ES.xpi) = 04edd799bfeb4a7433a80320abafc7d0c1c7c24982e1d53976638e5f2ac243f9 -SIZE (xpi/firefox-i18n-57.0.4/es-ES.xpi) = 353625 -SHA256 (xpi/firefox-i18n-57.0.4/es-MX.xpi) = 7bfee1ac67c2a50fca910ecd21aa54592774aa49ce11f58ddc64de1ccbdcc5c6 -SIZE (xpi/firefox-i18n-57.0.4/es-MX.xpi) = 468761 -SHA256 (xpi/firefox-i18n-57.0.4/et.xpi) = 37ac8824f08bfd6d931bb6d325226a970adcf4a8b3fb9ad651ef6d965f8784bd -SIZE (xpi/firefox-i18n-57.0.4/et.xpi) = 447279 -SHA256 (xpi/firefox-i18n-57.0.4/eu.xpi) = 7b6df791d0390b4cdbe92811c5bd5e374958ad242a3bbc7a49f1cbf963aa5b36 -SIZE (xpi/firefox-i18n-57.0.4/eu.xpi) = 454673 -SHA256 (xpi/firefox-i18n-57.0.4/fa.xpi) = 7be55f40579f970e2682472fbb66e8f182c14491f67127991684e45968fbf3ed -SIZE (xpi/firefox-i18n-57.0.4/fa.xpi) = 510829 -SHA256 (xpi/firefox-i18n-57.0.4/ff.xpi) = f3321f6ecaad8d0171741fe91420492d09515b25cc9f7be764dc258b06dc7db7 -SIZE (xpi/firefox-i18n-57.0.4/ff.xpi) = 454015 -SHA256 (xpi/firefox-i18n-57.0.4/fi.xpi) = 71f29805ebe1f46242d4e01846880f42f310a42fbba22872014d8d45ceee29ea -SIZE (xpi/firefox-i18n-57.0.4/fi.xpi) = 446244 -SHA256 (xpi/firefox-i18n-57.0.4/fr.xpi) = a959c6f196e6a26d0941a336cb6b1183a8e5af789380f249f7a2e75510bc2610 -SIZE (xpi/firefox-i18n-57.0.4/fr.xpi) = 472722 -SHA256 (xpi/firefox-i18n-57.0.4/fy-NL.xpi) = f4e9632af6d1850a8079b12e2652de3af69fdcc2c9db06f79c94b3ef5d1de0c2 -SIZE (xpi/firefox-i18n-57.0.4/fy-NL.xpi) = 465911 -SHA256 (xpi/firefox-i18n-57.0.4/ga-IE.xpi) = 665ce3c813e280e821a1311c8ad3a7744583fbed821bb23240354163bed13ff1 -SIZE (xpi/firefox-i18n-57.0.4/ga-IE.xpi) = 475963 -SHA256 (xpi/firefox-i18n-57.0.4/gd.xpi) = 20388643eececf3e1687b7deec855ff5ae094bf852c0d22c9bb805f344a7404b -SIZE (xpi/firefox-i18n-57.0.4/gd.xpi) = 465122 -SHA256 (xpi/firefox-i18n-57.0.4/gl.xpi) = dc3bba2acaa91c3cbb9a137d4ba76ea321447f1a935de45c81e9a7ac9310e2c6 -SIZE (xpi/firefox-i18n-57.0.4/gl.xpi) = 452032 -SHA256 (xpi/firefox-i18n-57.0.4/gn.xpi) = 6138f2080bab839e83a709307f443b765daa8654a2bd40a8b93c1db9e94793bf -SIZE (xpi/firefox-i18n-57.0.4/gn.xpi) = 471956 -SHA256 (xpi/firefox-i18n-57.0.4/gu-IN.xpi) = 651fbcff0b9b94071695bcfc2517ef2a151235ebd609fe55cf7433771103e6de -SIZE (xpi/firefox-i18n-57.0.4/gu-IN.xpi) = 511990 -SHA256 (xpi/firefox-i18n-57.0.4/he.xpi) = 004f5c836c007157851e70e27b9afe690b83ab6cc3358d5a406961fc504b62e7 -SIZE (xpi/firefox-i18n-57.0.4/he.xpi) = 471921 -SHA256 (xpi/firefox-i18n-57.0.4/hi-IN.xpi) = 2355ad6a0d3ed332068e619d2f159111b80327989c6a4ca7cb4eff87ff77f753 -SIZE (xpi/firefox-i18n-57.0.4/hi-IN.xpi) = 526111 -SHA256 (xpi/firefox-i18n-57.0.4/hr.xpi) = aa836c086e743f90807db62eb66c911a8ed2d48e52b99b649c446832d399cd96 -SIZE (xpi/firefox-i18n-57.0.4/hr.xpi) = 460722 -SHA256 (xpi/firefox-i18n-57.0.4/hsb.xpi) = 49ec24fff47910b9249037f72e14252284c51cd0e171259128ea7365bbe68844 -SIZE (xpi/firefox-i18n-57.0.4/hsb.xpi) = 476505 -SHA256 (xpi/firefox-i18n-57.0.4/hu.xpi) = 606bfacd3bc3ffceb3b431378f66c49db6b6a37c5eedc84128dd00b15a8fb3d2 -SIZE (xpi/firefox-i18n-57.0.4/hu.xpi) = 476607 -SHA256 (xpi/firefox-i18n-57.0.4/hy-AM.xpi) = de5d81269f2293eedb3146150e49a2b48a5729d1a09f092be4c66bf4712fe267 -SIZE (xpi/firefox-i18n-57.0.4/hy-AM.xpi) = 510825 -SHA256 (xpi/firefox-i18n-57.0.4/id.xpi) = 5c3af12deb175399c67878856850eb7a1794bb6836dd1f3b072489dd8b3a6e1d -SIZE (xpi/firefox-i18n-57.0.4/id.xpi) = 444041 -SHA256 (xpi/firefox-i18n-57.0.4/is.xpi) = 7fcbefb0ef86f4416097042a20a9ff5ebb08cab09e8efeea1d446fc436bbeee8 -SIZE (xpi/firefox-i18n-57.0.4/is.xpi) = 452660 -SHA256 (xpi/firefox-i18n-57.0.4/it.xpi) = 6dae24cb5e0d562f6521d5ceea3f79beca5ad4f7800a6883cb32429ee02e4bec -SIZE (xpi/firefox-i18n-57.0.4/it.xpi) = 347172 -SHA256 (xpi/firefox-i18n-57.0.4/ja.xpi) = 8e861ab62866d82798722c433accbd94a7a20ca7701fa05ccc2458c7d2026f8e -SIZE (xpi/firefox-i18n-57.0.4/ja.xpi) = 508553 -SHA256 (xpi/firefox-i18n-57.0.4/ka.xpi) = 162acea7cd9df51ff0481d90dc239682f8cf834ec37f51a714b9e38d4ffa338e -SIZE (xpi/firefox-i18n-57.0.4/ka.xpi) = 492356 -SHA256 (xpi/firefox-i18n-57.0.4/kab.xpi) = 8c7f6ece7b746c37a407bbbb22c79961a9e0762e7aabc8f945390e1bec515ebc -SIZE (xpi/firefox-i18n-57.0.4/kab.xpi) = 462530 -SHA256 (xpi/firefox-i18n-57.0.4/kk.xpi) = f003d5f0db4c94c793b0327f3ca5040d9a420cbcd03d6c717558c936c6aaa4a3 -SIZE (xpi/firefox-i18n-57.0.4/kk.xpi) = 519249 -SHA256 (xpi/firefox-i18n-57.0.4/km.xpi) = 438f20f6ff1f24066c91679dcbb570ed814ddd3090cbba06e1d975d542916931 -SIZE (xpi/firefox-i18n-57.0.4/km.xpi) = 530080 -SHA256 (xpi/firefox-i18n-57.0.4/kn.xpi) = 21e92623823811b62852a14a61985151d2a4dfa1c2d97592b63338eb63b354c2 -SIZE (xpi/firefox-i18n-57.0.4/kn.xpi) = 531316 -SHA256 (xpi/firefox-i18n-57.0.4/ko.xpi) = 9e26a3960988d1c79a60dfe1cbd9221f754f3e9cc54984f28660ea729012cc4b -SIZE (xpi/firefox-i18n-57.0.4/ko.xpi) = 487305 -SHA256 (xpi/firefox-i18n-57.0.4/lij.xpi) = 6bb35ffb667d942c548086c82717eb29b6a9c18933346d0f47278e44fe68ef76 -SIZE (xpi/firefox-i18n-57.0.4/lij.xpi) = 452343 -SHA256 (xpi/firefox-i18n-57.0.4/lt.xpi) = 63b12574a6bbb97619f1aa0e0d585dbd57df3a2582989eaacd7520c1cbd13adc -SIZE (xpi/firefox-i18n-57.0.4/lt.xpi) = 474957 -SHA256 (xpi/firefox-i18n-57.0.4/lv.xpi) = a15d7e0641a84b914257545ae422b24476bcc536378fe15626e750ebdbddfa95 -SIZE (xpi/firefox-i18n-57.0.4/lv.xpi) = 465243 -SHA256 (xpi/firefox-i18n-57.0.4/mai.xpi) = e990c82a2b92081fc064813db8d73da71ed0f9bc611a79e767a0d3a88928e9c0 -SIZE (xpi/firefox-i18n-57.0.4/mai.xpi) = 507396 -SHA256 (xpi/firefox-i18n-57.0.4/mk.xpi) = 8f15d51c621e877314c68e4f11559b57556a22ea74e18b40bdbad2c906b2d110 -SIZE (xpi/firefox-i18n-57.0.4/mk.xpi) = 490853 -SHA256 (xpi/firefox-i18n-57.0.4/ml.xpi) = ac1b73452a2818a80958de7122e9f653bc62de3408ac3207f60cf1ad6f033063 -SIZE (xpi/firefox-i18n-57.0.4/ml.xpi) = 528255 -SHA256 (xpi/firefox-i18n-57.0.4/mr.xpi) = fdc5bbf4e8b4ce6bb2039c57bd28a2737765a97995794a338e123e31e64d763d -SIZE (xpi/firefox-i18n-57.0.4/mr.xpi) = 521290 -SHA256 (xpi/firefox-i18n-57.0.4/ms.xpi) = 64dbc7ccca7adaceb6b960ddad0d03b3b5cd220c691c79dceef5f89c0f3e6ba4 -SIZE (xpi/firefox-i18n-57.0.4/ms.xpi) = 451255 -SHA256 (xpi/firefox-i18n-57.0.4/my.xpi) = 9dc539ef7641fb881f66d7b98b6bc0a76972d8e8734499ba6309d904436dc684 -SIZE (xpi/firefox-i18n-57.0.4/my.xpi) = 517703 -SHA256 (xpi/firefox-i18n-57.0.4/nb-NO.xpi) = efe347ea92a21c9e1f9acd34eb0e05f19ccafd62b10a21ffa09febcc7584e8ef -SIZE (xpi/firefox-i18n-57.0.4/nb-NO.xpi) = 451557 -SHA256 (xpi/firefox-i18n-57.0.4/nl.xpi) = 0d8ab0fdda99f63ab21b482b7351409715a2cd2f41cddf6bbe5b1b272da74bcd -SIZE (xpi/firefox-i18n-57.0.4/nl.xpi) = 458319 -SHA256 (xpi/firefox-i18n-57.0.4/nn-NO.xpi) = 223d3ef52c3820258b49df7f42d9d861ad56f756860778b0ffd01cb13c453f1b -SIZE (xpi/firefox-i18n-57.0.4/nn-NO.xpi) = 452004 -SHA256 (xpi/firefox-i18n-57.0.4/or.xpi) = 0e72f2fcaacc58de0031c4f4410e5b5f2cc0eabe931a26f23e74407b63b27aaa -SIZE (xpi/firefox-i18n-57.0.4/or.xpi) = 500867 -SHA256 (xpi/firefox-i18n-57.0.4/pa-IN.xpi) = 870ee04109bceda64f6097eb64d57dae741cae1b3f327515a6ecac6c87253974 -SIZE (xpi/firefox-i18n-57.0.4/pa-IN.xpi) = 495272 -SHA256 (xpi/firefox-i18n-57.0.4/pl.xpi) = 0d91f5bdc4dfaa9fb6daa20f771148e38f2d9e4399bf30fe244030e276c9ac89 -SIZE (xpi/firefox-i18n-57.0.4/pl.xpi) = 364230 -SHA256 (xpi/firefox-i18n-57.0.4/pt-BR.xpi) = 4b2d43c3b949a37cccf71b71b45080792e2885d834a4e276fa7df5cf6a74dcc6 -SIZE (xpi/firefox-i18n-57.0.4/pt-BR.xpi) = 457154 -SHA256 (xpi/firefox-i18n-57.0.4/pt-PT.xpi) = 2ef8b8664011c26508cb09b136c45d9c9a1900a2300e097a5f230ca814a79780 -SIZE (xpi/firefox-i18n-57.0.4/pt-PT.xpi) = 460000 -SHA256 (xpi/firefox-i18n-57.0.4/rm.xpi) = 37e0a1fff509be32a6cc359eed53f56e06f207c8c2e85d4e1e6faede3bb3b4ac -SIZE (xpi/firefox-i18n-57.0.4/rm.xpi) = 451059 -SHA256 (xpi/firefox-i18n-57.0.4/ro.xpi) = 9c5669d219007a5a09fc0b9f813edb63f152a85329698e534a18799dbc8e9b68 -SIZE (xpi/firefox-i18n-57.0.4/ro.xpi) = 455510 -SHA256 (xpi/firefox-i18n-57.0.4/ru.xpi) = 4a392e7dfa9cc7e28f3e9a0d4ce5de24f6531d12bca17254d86043c8172acc1a -SIZE (xpi/firefox-i18n-57.0.4/ru.xpi) = 527005 -SHA256 (xpi/firefox-i18n-57.0.4/si.xpi) = d124a90746df53a94b6dfd0f74b7a0e365ce8a36d8b5ff6b5022d557be801651 -SIZE (xpi/firefox-i18n-57.0.4/si.xpi) = 498324 -SHA256 (xpi/firefox-i18n-57.0.4/sk.xpi) = beabdded23f975d25273b4179933d8bfe618cc49de46a356bbd8a8d8a0b632dc -SIZE (xpi/firefox-i18n-57.0.4/sk.xpi) = 480397 -SHA256 (xpi/firefox-i18n-57.0.4/sl.xpi) = d0c419d071c43f139c0467f643a7619a333bfc28733b2c5c4df3bba1e1aa94bc -SIZE (xpi/firefox-i18n-57.0.4/sl.xpi) = 459377 -SHA256 (xpi/firefox-i18n-57.0.4/son.xpi) = f0b8b5450dcd145148ae5fa4f4c446a623014ddc0f8c8a69b7990db667d5c32d -SIZE (xpi/firefox-i18n-57.0.4/son.xpi) = 450930 -SHA256 (xpi/firefox-i18n-57.0.4/sq.xpi) = 2f08696a618b027f3b5b866abe42bba53c1f37d89b0b2948aa4c3f893795f537 -SIZE (xpi/firefox-i18n-57.0.4/sq.xpi) = 465051 -SHA256 (xpi/firefox-i18n-57.0.4/sr.xpi) = d1418c1a1de6b9958917d3ae288eb794a463139c947d2af7d8f758f37b8865ff -SIZE (xpi/firefox-i18n-57.0.4/sr.xpi) = 487004 -SHA256 (xpi/firefox-i18n-57.0.4/sv-SE.xpi) = 452278c7f1e5ee9f23d126de8f3659750ad5a8f5c87235fc089ffacf19348e53 -SIZE (xpi/firefox-i18n-57.0.4/sv-SE.xpi) = 459665 -SHA256 (xpi/firefox-i18n-57.0.4/ta.xpi) = 642a0c33076fa02ddb624c5aaaa7f4892151e902585d6b6f72460db5923f1548 -SIZE (xpi/firefox-i18n-57.0.4/ta.xpi) = 513228 -SHA256 (xpi/firefox-i18n-57.0.4/te.xpi) = 8e2fd00f5eb274f8dd8fb51101ddeccce2c755d85cb4054d682ae2c5981a48c9 -SIZE (xpi/firefox-i18n-57.0.4/te.xpi) = 530693 -SHA256 (xpi/firefox-i18n-57.0.4/th.xpi) = f50f501e4eecd612b4946d9db620009012b3ccef5bc7ba87b3bf47c92204068b -SIZE (xpi/firefox-i18n-57.0.4/th.xpi) = 502452 -SHA256 (xpi/firefox-i18n-57.0.4/tr.xpi) = 5706cc11ad164057b7122829d15d3fbed85a76fab1f6ac398191711084663e95 -SIZE (xpi/firefox-i18n-57.0.4/tr.xpi) = 465581 -SHA256 (xpi/firefox-i18n-57.0.4/uk.xpi) = 163417dd79a964730dfd1e5e673679d70d0537089934a8ef4c72ef305becb830 -SIZE (xpi/firefox-i18n-57.0.4/uk.xpi) = 518138 -SHA256 (xpi/firefox-i18n-57.0.4/ur.xpi) = 4782235ccb58b4910eb41d9e40e09e596cda1028cf250006d6baca96abc2231e -SIZE (xpi/firefox-i18n-57.0.4/ur.xpi) = 511138 -SHA256 (xpi/firefox-i18n-57.0.4/uz.xpi) = a07005793b45fa437374f28007d2e2cd38a87c3c143932f33c9e015450fa7b2d -SIZE (xpi/firefox-i18n-57.0.4/uz.xpi) = 461694 -SHA256 (xpi/firefox-i18n-57.0.4/vi.xpi) = 5579932fc28c8032a48a5a0bf79dc0c53e73455037e8e1263f7bb0601522b18a -SIZE (xpi/firefox-i18n-57.0.4/vi.xpi) = 471320 -SHA256 (xpi/firefox-i18n-57.0.4/xh.xpi) = b311b001e941a9e4065037b77b846132482ad711de4f214a4bfe8e8619a77d49 -SIZE (xpi/firefox-i18n-57.0.4/xh.xpi) = 464461 -SHA256 (xpi/firefox-i18n-57.0.4/zh-CN.xpi) = eb826002503363424f93a516623382b887b1a5fcee96ef0e610d9aed53c744cf -SIZE (xpi/firefox-i18n-57.0.4/zh-CN.xpi) = 483625 -SHA256 (xpi/firefox-i18n-57.0.4/zh-TW.xpi) = e24b8dd7a5953bbbf0dcbadbd370d2153fb9050da02acd0709a6ea7b629dbd87 -SIZE (xpi/firefox-i18n-57.0.4/zh-TW.xpi) = 482348 +TIMESTAMP = 1514989403 +SHA256 (xpi/firefox-i18n-58.0b14/ach.xpi) = 7c4e9a3d40bee39b8eda799cc4d517933549c80342a9a5fefe7b70aeffc89942 +SIZE (xpi/firefox-i18n-58.0b14/ach.xpi) = 444872 +SHA256 (xpi/firefox-i18n-58.0b14/af.xpi) = 86ae9d41737cbf687c01107fd4292f61704ce5427a18b60b5d2ca419fdd33075 +SIZE (xpi/firefox-i18n-58.0b14/af.xpi) = 444574 +SHA256 (xpi/firefox-i18n-58.0b14/an.xpi) = 2898aed292d63e62545c3a6f605133e150e3d571f4468f4b59010d489e03309c +SIZE (xpi/firefox-i18n-58.0b14/an.xpi) = 468931 +SHA256 (xpi/firefox-i18n-58.0b14/ar.xpi) = 74bc2712d853b286f8d1e853c489884f77d6ea0560acb03e0278721aeef3ac4d +SIZE (xpi/firefox-i18n-58.0b14/ar.xpi) = 493719 +SHA256 (xpi/firefox-i18n-58.0b14/as.xpi) = 1bef07d2815d4964016df69f78c6114ee5f62109cc11021147cb0161b06ca83b +SIZE (xpi/firefox-i18n-58.0b14/as.xpi) = 492795 +SHA256 (xpi/firefox-i18n-58.0b14/ast.xpi) = 0a063ab8289be7c884e0dd0b737b11feb47f530129f9f38833ac2e5b5ce3c33a +SIZE (xpi/firefox-i18n-58.0b14/ast.xpi) = 461572 +SHA256 (xpi/firefox-i18n-58.0b14/az.xpi) = f2cd0fd627c894e57c5105f62c219bdafe591465d70e1437c9774a5099b81486 +SIZE (xpi/firefox-i18n-58.0b14/az.xpi) = 470383 +SHA256 (xpi/firefox-i18n-58.0b14/be.xpi) = f9ed7f83912919dce385975f26ef23af750e73c7a1d48549bda414acecc75cf8 +SIZE (xpi/firefox-i18n-58.0b14/be.xpi) = 522349 +SHA256 (xpi/firefox-i18n-58.0b14/bg.xpi) = eb97467b9b6097beafe6edd6ab2e0f86b7545ab623c149b489cd78b4a486638d +SIZE (xpi/firefox-i18n-58.0b14/bg.xpi) = 515702 +SHA256 (xpi/firefox-i18n-58.0b14/bn-BD.xpi) = aaa80b64c3d43899b94356d20978b904b22386b59cd66de9708087a9996a369c +SIZE (xpi/firefox-i18n-58.0b14/bn-BD.xpi) = 528704 +SHA256 (xpi/firefox-i18n-58.0b14/bn-IN.xpi) = 1b792d745b3b95fec955834cf70928f1386ccee515a231ddae2dc6aeeddd92bc +SIZE (xpi/firefox-i18n-58.0b14/bn-IN.xpi) = 518318 +SHA256 (xpi/firefox-i18n-58.0b14/br.xpi) = c8c65407f07c7b55f24cd17ca4f68a94b71c605664f5171c6f200c04382288a3 +SIZE (xpi/firefox-i18n-58.0b14/br.xpi) = 457130 +SHA256 (xpi/firefox-i18n-58.0b14/bs.xpi) = 279d93c7b5235635a33136ad782966e15e3b1c406d56a66bb8924e95b064efe8 +SIZE (xpi/firefox-i18n-58.0b14/bs.xpi) = 461814 +SHA256 (xpi/firefox-i18n-58.0b14/ca.xpi) = 4d05d9c3e662f05d29407db92dd986fd31d10516cd2a5f403e20f06f7aab14ec +SIZE (xpi/firefox-i18n-58.0b14/ca.xpi) = 470562 +SHA256 (xpi/firefox-i18n-58.0b14/cak.xpi) = ab9a92527db26720fb60d6a38a78ebc54b69fd8b6ce1fb846a4db426d2d1217b +SIZE (xpi/firefox-i18n-58.0b14/cak.xpi) = 482204 +SHA256 (xpi/firefox-i18n-58.0b14/cs.xpi) = 0a5f9ea0cd4ea96363d3d87c070ef2c239f4f02eadc713bf2d81a96d28a1c8ce +SIZE (xpi/firefox-i18n-58.0b14/cs.xpi) = 478419 +SHA256 (xpi/firefox-i18n-58.0b14/cy.xpi) = 4de34b29f0212313e76bf5ff8168616819e46149978ef4708dea9ba2ca1b8d8e +SIZE (xpi/firefox-i18n-58.0b14/cy.xpi) = 461526 +SHA256 (xpi/firefox-i18n-58.0b14/da.xpi) = f6f5c69b689eb31b3daad2819ef15c4f2fbcd535833c24dccdd7c0a735385f86 +SIZE (xpi/firefox-i18n-58.0b14/da.xpi) = 450529 +SHA256 (xpi/firefox-i18n-58.0b14/de.xpi) = 433fd23b72fa43f56a6ba398593bfe84784623aad6e8f9bb41a7d9a78518e2cb +SIZE (xpi/firefox-i18n-58.0b14/de.xpi) = 466710 +SHA256 (xpi/firefox-i18n-58.0b14/dsb.xpi) = 4a1462ac6012065f8f3c3c9afed0347260cd10153f2b5d6213a21dab26115293 +SIZE (xpi/firefox-i18n-58.0b14/dsb.xpi) = 485516 +SHA256 (xpi/firefox-i18n-58.0b14/el.xpi) = e2c94192a48dcc469ead6032476ace5484140b797c8e555b2dfa77b71994a211 +SIZE (xpi/firefox-i18n-58.0b14/el.xpi) = 539900 +SHA256 (xpi/firefox-i18n-58.0b14/en-GB.xpi) = e01a3057cf26a129b19e27b58731a38513e6ac1b8d32c80343c22b12eeddb2e4 +SIZE (xpi/firefox-i18n-58.0b14/en-GB.xpi) = 442926 +SHA256 (xpi/firefox-i18n-58.0b14/en-US.xpi) = 28738c1e35947f66e2c5e6ba997a467240d07a9f0301c48930242e0014c2e238 +SIZE (xpi/firefox-i18n-58.0b14/en-US.xpi) = 440002 +SHA256 (xpi/firefox-i18n-58.0b14/en-ZA.xpi) = 21ff6c58a514b0b05b137196096f2711105f4b15c27a9dbadeff6ad111e14747 +SIZE (xpi/firefox-i18n-58.0b14/en-ZA.xpi) = 434818 +SHA256 (xpi/firefox-i18n-58.0b14/eo.xpi) = 3dc4791324745c9ff2284ef4bedf685dd6071b10b018859f24922848e7102053 +SIZE (xpi/firefox-i18n-58.0b14/eo.xpi) = 457972 +SHA256 (xpi/firefox-i18n-58.0b14/es-AR.xpi) = d836c99bec631d604822fe2d12d61d8c41d942c6065b7761f96468b02a81404a +SIZE (xpi/firefox-i18n-58.0b14/es-AR.xpi) = 468455 +SHA256 (xpi/firefox-i18n-58.0b14/es-CL.xpi) = d93e4de1557e6bb4ddf7cbf8c9ad5c2903765b685b9557c1a8014d8f09392dd9 +SIZE (xpi/firefox-i18n-58.0b14/es-CL.xpi) = 472661 +SHA256 (xpi/firefox-i18n-58.0b14/es-ES.xpi) = b8e0618b9a254cffe60286f1e8356c9fd6a870f4b2674adc07745b7f21ef0a25 +SIZE (xpi/firefox-i18n-58.0b14/es-ES.xpi) = 356827 +SHA256 (xpi/firefox-i18n-58.0b14/es-MX.xpi) = f9b0b18546469f9f720583efa05c4707eccb608cabe09d9960104f0bf9e9692b +SIZE (xpi/firefox-i18n-58.0b14/es-MX.xpi) = 472550 +SHA256 (xpi/firefox-i18n-58.0b14/et.xpi) = 2421e32ae104cac3ed233664aa23faa5ba9fd5233bd2d92af2fbffe1ddf2d453 +SIZE (xpi/firefox-i18n-58.0b14/et.xpi) = 450450 +SHA256 (xpi/firefox-i18n-58.0b14/eu.xpi) = 3fce64d58bc368ce0f74d664592bf9109b3df3847e09d52cc956de201ac855a5 +SIZE (xpi/firefox-i18n-58.0b14/eu.xpi) = 461724 +SHA256 (xpi/firefox-i18n-58.0b14/fa.xpi) = 235ed05b6c6a44482f8605613ee86dda8cd4d7f43fc92c784ae7d12a344a0ab0 +SIZE (xpi/firefox-i18n-58.0b14/fa.xpi) = 516461 +SHA256 (xpi/firefox-i18n-58.0b14/ff.xpi) = 265d37a8829c8d9a1fcd11278e483fc5d8e47259d1a2fafff6900a340385a311 +SIZE (xpi/firefox-i18n-58.0b14/ff.xpi) = 461950 +SHA256 (xpi/firefox-i18n-58.0b14/fi.xpi) = f2be988378d19ebafe9b85299b65108c39071e01c783e289404de6619c05edaa +SIZE (xpi/firefox-i18n-58.0b14/fi.xpi) = 451161 +SHA256 (xpi/firefox-i18n-58.0b14/fr.xpi) = cc5c1bc6afd7058d4e4f817450ba6014fd2225f80f95c0dab28f010034e3720c +SIZE (xpi/firefox-i18n-58.0b14/fr.xpi) = 478565 +SHA256 (xpi/firefox-i18n-58.0b14/fy-NL.xpi) = dc630b5e1b72c4a80077bb88a760f9c988e294773e1aa0d6df6792b940540e5b +SIZE (xpi/firefox-i18n-58.0b14/fy-NL.xpi) = 471490 +SHA256 (xpi/firefox-i18n-58.0b14/ga-IE.xpi) = b51fe762d88c14a7f43a5604e38be6ebba948bf8a16abda66c81b3742d6a844a +SIZE (xpi/firefox-i18n-58.0b14/ga-IE.xpi) = 479265 +SHA256 (xpi/firefox-i18n-58.0b14/gd.xpi) = f01213cff3a196272976ba25c55c5d3b90223d48112879f46318c277d58e27a4 +SIZE (xpi/firefox-i18n-58.0b14/gd.xpi) = 466996 +SHA256 (xpi/firefox-i18n-58.0b14/gl.xpi) = 96792d343d328d2586b9ba02362ee7c72b4b7683b7396915e38973b1f73a9a79 +SIZE (xpi/firefox-i18n-58.0b14/gl.xpi) = 454324 +SHA256 (xpi/firefox-i18n-58.0b14/gn.xpi) = 8064930cb0ba656e30cc4bb993a7e245df5cf5d639477e3f704f1eae113777de +SIZE (xpi/firefox-i18n-58.0b14/gn.xpi) = 476657 +SHA256 (xpi/firefox-i18n-58.0b14/gu-IN.xpi) = 4b71262bfd2f09c881a4c673f94524ac96d4bf6c20a28151fed0136e7b55d9b8 +SIZE (xpi/firefox-i18n-58.0b14/gu-IN.xpi) = 521268 +SHA256 (xpi/firefox-i18n-58.0b14/he.xpi) = 843e74e9618e27f0185753dde34c0d2b09aacfdf0906d3ef45a2cdc9f01eebdf +SIZE (xpi/firefox-i18n-58.0b14/he.xpi) = 479852 +SHA256 (xpi/firefox-i18n-58.0b14/hi-IN.xpi) = ca30f76321346ab2a862fba8db3876f77cad08d8c4e2413e84d5925a25fde6d4 +SIZE (xpi/firefox-i18n-58.0b14/hi-IN.xpi) = 531161 +SHA256 (xpi/firefox-i18n-58.0b14/hr.xpi) = 09d74738a2155f8de2005755a19cf46813ba2d911742a62436721ea05c09cd3b +SIZE (xpi/firefox-i18n-58.0b14/hr.xpi) = 466023 +SHA256 (xpi/firefox-i18n-58.0b14/hsb.xpi) = 39a8020737bdc8494dfdf072bd2399b66d741d67bbb084e817c4aa11b994d441 +SIZE (xpi/firefox-i18n-58.0b14/hsb.xpi) = 482468 +SHA256 (xpi/firefox-i18n-58.0b14/hu.xpi) = 853276677e86eca159261780be8dd73e08f4bdfe1dff27839fcb4f0286b96bcc +SIZE (xpi/firefox-i18n-58.0b14/hu.xpi) = 481619 +SHA256 (xpi/firefox-i18n-58.0b14/hy-AM.xpi) = 9aae408ac8e0eb101e8a1186837a4bd41c3821834bb2f0ac4bc00f6a39a0dfbf +SIZE (xpi/firefox-i18n-58.0b14/hy-AM.xpi) = 515028 +SHA256 (xpi/firefox-i18n-58.0b14/id.xpi) = 1efe5ff67586770d8b94d52221c00ccd629ee7b8974632091a11242845fca43e +SIZE (xpi/firefox-i18n-58.0b14/id.xpi) = 447579 +SHA256 (xpi/firefox-i18n-58.0b14/is.xpi) = 776f404af76ffaddb4afcfe14aa80404ab6566ed39038dcbe7335336ff5da52c +SIZE (xpi/firefox-i18n-58.0b14/is.xpi) = 459177 +SHA256 (xpi/firefox-i18n-58.0b14/it.xpi) = ea625ef8773b24fea2e14c817e205e745e5ecbedffcf491e1a3b7136a1ecc1ae +SIZE (xpi/firefox-i18n-58.0b14/it.xpi) = 349758 +SHA256 (xpi/firefox-i18n-58.0b14/ja.xpi) = 674f5d894d95be3f9898e9398f72740b31b6cc7122a03278aa554301bf1b4926 +SIZE (xpi/firefox-i18n-58.0b14/ja.xpi) = 513082 +SHA256 (xpi/firefox-i18n-58.0b14/ka.xpi) = ab68a869f941c08b5c3daa4911983c4dfcff0cf2fd1cd9ba4158c62f420dcd33 +SIZE (xpi/firefox-i18n-58.0b14/ka.xpi) = 499585 +SHA256 (xpi/firefox-i18n-58.0b14/kab.xpi) = 5eed99c3c5f5ab9a80270b26a09da3a527c085b48c3006a5e4e63cf24f0cf80a +SIZE (xpi/firefox-i18n-58.0b14/kab.xpi) = 468215 +SHA256 (xpi/firefox-i18n-58.0b14/kk.xpi) = 261f150e89cc01cdcdcc9cf6e48c62bfa95e9d2ac84c35bbb16785b8a98fa395 +SIZE (xpi/firefox-i18n-58.0b14/kk.xpi) = 523676 +SHA256 (xpi/firefox-i18n-58.0b14/km.xpi) = 6987490e88af5664c3b11031f329368f7aff1f5f23573a2c77b18b4479b4ceb8 +SIZE (xpi/firefox-i18n-58.0b14/km.xpi) = 532249 +SHA256 (xpi/firefox-i18n-58.0b14/kn.xpi) = 1047b89ee28e2cc60a3b62686e745d9235efb1b77d0815f65ce9a0b40f9f06d2 +SIZE (xpi/firefox-i18n-58.0b14/kn.xpi) = 535940 +SHA256 (xpi/firefox-i18n-58.0b14/ko.xpi) = 20eb79141ae0ef356ad147da22fc57fecd8fa4775f85c942b624d3e4cfb9254a +SIZE (xpi/firefox-i18n-58.0b14/ko.xpi) = 493652 +SHA256 (xpi/firefox-i18n-58.0b14/lij.xpi) = 4d35c9c5eed73a23a21b0acc3fc9d56cb438d86eb1f611ca145aca0904a5171f +SIZE (xpi/firefox-i18n-58.0b14/lij.xpi) = 455541 +SHA256 (xpi/firefox-i18n-58.0b14/lt.xpi) = fc8b132c043d24b99cbcc710da7104c22b0e3024461bbd033a8be7b619299026 +SIZE (xpi/firefox-i18n-58.0b14/lt.xpi) = 480979 +SHA256 (xpi/firefox-i18n-58.0b14/lv.xpi) = 0255dc631efc4308bc5c1bf0a5902705a35ef311a3cf2f727f41088843b37a05 +SIZE (xpi/firefox-i18n-58.0b14/lv.xpi) = 468521 +SHA256 (xpi/firefox-i18n-58.0b14/mai.xpi) = ae9f9390adb8ea8e9df3a9e805ba5149e65db7ac44ea3a955dde3a2fbab341ec +SIZE (xpi/firefox-i18n-58.0b14/mai.xpi) = 509069 +SHA256 (xpi/firefox-i18n-58.0b14/mk.xpi) = b10ae273eea89b520a1f96b60279707bf5ca41f1607a8dd0bf23f76db50a8067 +SIZE (xpi/firefox-i18n-58.0b14/mk.xpi) = 492513 +SHA256 (xpi/firefox-i18n-58.0b14/ml.xpi) = c40dcbb10a4a118d4fd2c67032fd5cb178e14e6cae3ed40e24c6b022bb6a71e0 +SIZE (xpi/firefox-i18n-58.0b14/ml.xpi) = 546665 +SHA256 (xpi/firefox-i18n-58.0b14/mr.xpi) = 3340ed427a7b39d324a46f6c8f7eb74d3fbe7864383434374a18a450a8acd69c +SIZE (xpi/firefox-i18n-58.0b14/mr.xpi) = 524252 +SHA256 (xpi/firefox-i18n-58.0b14/ms.xpi) = a4936b6c21f1c61aa2ccfdc6e791cc642e9a271af14207a83beb8cf473639b5c +SIZE (xpi/firefox-i18n-58.0b14/ms.xpi) = 457059 +SHA256 (xpi/firefox-i18n-58.0b14/my.xpi) = d8a309b641915532ce098cee4181d893c747ea58b73171a1967bf77cb3d6add7 +SIZE (xpi/firefox-i18n-58.0b14/my.xpi) = 520422 +SHA256 (xpi/firefox-i18n-58.0b14/nb-NO.xpi) = f513a8df5805b1e1aa53c401253a61ecb183163e19b4cd88559c37505fcf5894 +SIZE (xpi/firefox-i18n-58.0b14/nb-NO.xpi) = 456804 +SHA256 (xpi/firefox-i18n-58.0b14/ne-NP.xpi) = eaebd2f5e64d5db13000889b84bda88a55b1f9ceee401245281c5db0f95c1366 +SIZE (xpi/firefox-i18n-58.0b14/ne-NP.xpi) = 517046 +SHA256 (xpi/firefox-i18n-58.0b14/nl.xpi) = dde64ca31ac34885f1d6b3d69395c58e09ff2112cb8b095a64f0ec3b163420f3 +SIZE (xpi/firefox-i18n-58.0b14/nl.xpi) = 464338 +SHA256 (xpi/firefox-i18n-58.0b14/nn-NO.xpi) = 99bffa69d61653dcffa783b0282e7a42a159b2bcb3bc52efc5e040a1b7c68884 +SIZE (xpi/firefox-i18n-58.0b14/nn-NO.xpi) = 457261 +SHA256 (xpi/firefox-i18n-58.0b14/or.xpi) = 286fec32531641fa74d46c2760366c4e304414504c9c910ae283afb46b8d7534 +SIZE (xpi/firefox-i18n-58.0b14/or.xpi) = 502587 +SHA256 (xpi/firefox-i18n-58.0b14/pa-IN.xpi) = 5d65b650780b06c0e8664352553238302f9fe9b06665f1187a6c2471f758fc03 +SIZE (xpi/firefox-i18n-58.0b14/pa-IN.xpi) = 497515 +SHA256 (xpi/firefox-i18n-58.0b14/pl.xpi) = e7a3635174f883d06b2f190b79e7b193129644074a7a680d6a3a56a4550981d2 +SIZE (xpi/firefox-i18n-58.0b14/pl.xpi) = 365324 +SHA256 (xpi/firefox-i18n-58.0b14/pt-BR.xpi) = 9b44c58c2f274b399378b72f401e98c9c362c77f36713a9222401d13b2749d24 +SIZE (xpi/firefox-i18n-58.0b14/pt-BR.xpi) = 462461 +SHA256 (xpi/firefox-i18n-58.0b14/pt-PT.xpi) = ab3467b22a49514e842a490d34c025c027c11172b9237c2317719a21e357dfbf +SIZE (xpi/firefox-i18n-58.0b14/pt-PT.xpi) = 465749 +SHA256 (xpi/firefox-i18n-58.0b14/rm.xpi) = 033fa15e13bcf18e2cc4d5cb569d84616abf66c58df9f74984120d61591157a1 +SIZE (xpi/firefox-i18n-58.0b14/rm.xpi) = 458253 +SHA256 (xpi/firefox-i18n-58.0b14/ro.xpi) = e682340dfe34f1c367008543daa5c665172bff63c4c5d30958178a3963608efe +SIZE (xpi/firefox-i18n-58.0b14/ro.xpi) = 458753 +SHA256 (xpi/firefox-i18n-58.0b14/ru.xpi) = 69ab7cd2f5aa820ea5c5483679b59cb4810ecaa97ccc20ac107a0814566e18b4 +SIZE (xpi/firefox-i18n-58.0b14/ru.xpi) = 533756 +SHA256 (xpi/firefox-i18n-58.0b14/si.xpi) = 45b396e8bda57553545a87e6cf947cd9ca7376f41fec14b40e4aafa655ec8af7 +SIZE (xpi/firefox-i18n-58.0b14/si.xpi) = 500706 +SHA256 (xpi/firefox-i18n-58.0b14/sk.xpi) = 2391e37f7c138e318fb2255b5574c4d52261da71ab5be44d5527b8518ab6ccd8 +SIZE (xpi/firefox-i18n-58.0b14/sk.xpi) = 485432 +SHA256 (xpi/firefox-i18n-58.0b14/sl.xpi) = fa1d496847410a8ea46135de624607e54c87c4ba9fe3c2cdc90bf0da9ecc5664 +SIZE (xpi/firefox-i18n-58.0b14/sl.xpi) = 461910 +SHA256 (xpi/firefox-i18n-58.0b14/son.xpi) = 0b6275f2fca13c105f7857c74a1b67745a4ce0eba648ce30b4aaf86a4b2183da +SIZE (xpi/firefox-i18n-58.0b14/son.xpi) = 453958 +SHA256 (xpi/firefox-i18n-58.0b14/sq.xpi) = 2ee16e07de9525dc40581773a53bb7f5cf1fa22daebac9ba1c023a3f5f2bf2ae +SIZE (xpi/firefox-i18n-58.0b14/sq.xpi) = 471954 +SHA256 (xpi/firefox-i18n-58.0b14/sr.xpi) = 868f17bf905ffc172bd141f0103c1830be667cf2e08a7e9d66c74965481ff2f1 +SIZE (xpi/firefox-i18n-58.0b14/sr.xpi) = 492195 +SHA256 (xpi/firefox-i18n-58.0b14/sv-SE.xpi) = 0064764f26ea544f929effeb0d2dbad75f2b6f3bd01f54d669fc6a07fa85e066 +SIZE (xpi/firefox-i18n-58.0b14/sv-SE.xpi) = 465202 +SHA256 (xpi/firefox-i18n-58.0b14/ta.xpi) = f808615955af018e0bf823b6711e24c9ee5de2620438cb547cdb07b4ebb81004 +SIZE (xpi/firefox-i18n-58.0b14/ta.xpi) = 518560 +SHA256 (xpi/firefox-i18n-58.0b14/te.xpi) = 7f0195e92ea677b9714782b845452e9b95d53bafdb055375ac11f596c32f5644 +SIZE (xpi/firefox-i18n-58.0b14/te.xpi) = 534178 +SHA256 (xpi/firefox-i18n-58.0b14/th.xpi) = fdaa202119588b24ffd3d04a0a8c146700cb242bf33fc600bc13b4bbcb2ba241 +SIZE (xpi/firefox-i18n-58.0b14/th.xpi) = 505476 +SHA256 (xpi/firefox-i18n-58.0b14/tr.xpi) = ae54349f219c615b893922ca389b9ae53193ecd87371b1b16c94c12b5b583dd6 +SIZE (xpi/firefox-i18n-58.0b14/tr.xpi) = 470965 +SHA256 (xpi/firefox-i18n-58.0b14/uk.xpi) = 70a7e90991ea34d3a51a978d257a8330caaf669bd46666a665ceced7eece2959 +SIZE (xpi/firefox-i18n-58.0b14/uk.xpi) = 524680 +SHA256 (xpi/firefox-i18n-58.0b14/ur.xpi) = 57078f2f19193a74231175b4c215cc9b046be783317eee858c58ccba468e4fb1 +SIZE (xpi/firefox-i18n-58.0b14/ur.xpi) = 514449 +SHA256 (xpi/firefox-i18n-58.0b14/uz.xpi) = 2b6cf0ae2087227427bb0b2c7a2a0d736d6b64f236e88dc08c94185a1ba015c9 +SIZE (xpi/firefox-i18n-58.0b14/uz.xpi) = 464526 +SHA256 (xpi/firefox-i18n-58.0b14/vi.xpi) = 473ad061d9cb1701d02d8b6166ae4e8061ec5b9a556a32be5ea23793209d6578 +SIZE (xpi/firefox-i18n-58.0b14/vi.xpi) = 475801 +SHA256 (xpi/firefox-i18n-58.0b14/xh.xpi) = b8efa4b6bf7f603878a0333178a02f0d105a45104d3ca0246f931c8f8fa5f538 +SIZE (xpi/firefox-i18n-58.0b14/xh.xpi) = 467386 +SHA256 (xpi/firefox-i18n-58.0b14/zh-CN.xpi) = 66256b2264c98ae99f2e6212303f65dd6e0d5eaeade7e065aead22d4be8cd977 +SIZE (xpi/firefox-i18n-58.0b14/zh-CN.xpi) = 489542 +SHA256 (xpi/firefox-i18n-58.0b14/zh-TW.xpi) = 7b5474ad82a5b9e3c7b1c8986f55cf17bc59a5ff4e0c587dbf74bcf8131e985a +SIZE (xpi/firefox-i18n-58.0b14/zh-TW.xpi) = 487147 --- b/www/firefox/Makefile +++ b/www/firefox/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= firefox -DISTVERSION= 57.0.4 +DISTVERSION= 58.0b14 PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ @@ -13,12 +13,12 @@ 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.1:security/nss \ icu>=59.1,1:devel/icu \ libevent>=2.1.8:devel/libevent \ - harfbuzz>=1.5.1:print/harfbuzz \ + harfbuzz>=1.7.2: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 = 1515099518 -SHA256 (firefox-57.0.4.source.tar.xz) = 97cced69abfd5c57d968f0095631f86beff4f7b61883edd5a4f207e7f9c43b33 -SIZE (firefox-57.0.4.source.tar.xz) = 250217612 +TIMESTAMP = 1515051785 +SHA256 (firefox-58.0b14.source.tar.xz) = e8dd37215fec709cccc743a313f96d24c0a650dd061f36a7c90633a6c6ce0665 +SIZE (firefox-58.0b14.source.tar.xz) = 249096056 --- 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 +# ============================================================== @@ -261,11 +249,11 @@ index 9297e4d6f501..d8e273887e4b 100644 +option('--with-system-harfbuzz', + help="Use system harfbuzz (located with pkgconfig)") + -+system_harfbuzz = pkg_check_modules('MOZ_HARFBUZZ', 'harfbuzz >= 1.5.1', ++system_harfbuzz = pkg_check_modules('MOZ_HARFBUZZ', 'harfbuzz >= 1.7.2', + when='--with-system-harfbuzz') + +set_config('MOZ_SYSTEM_HARFBUZZ', depends_if(system_harfbuzz)(lambda _: True)) + - # 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();