From b09e26dce98657502dcb4e648cde949f3ddb01a6 Mon Sep 17 00:00:00 2001 From: jbeich Date: Wed, 27 Sep 2017 04:12:34 +0000 Subject: [PATCH] www/firefox: update to 58.0 Changes: https://www.mozilla.org/firefox/58.0/releasenotes/ PR: 223425 Tested by: Greg V, tobik Security: a891c5b4-3d7a-4de9-9c71-eef3fd698c77 MFH: 2018Q1 --- 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 diff --git a/Mk/Uses/gecko.mk b/Mk/Uses/gecko.mk index 432c60edd28e..3afb4c50583b 100644 --- a/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 diff --git a/Mk/bsd.gecko.mk b/Mk/bsd.gecko.mk index bfafacd4399d..482f0032d4a4 100644 --- a/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} \ @@ -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 diff --git a/www/firefox-i18n/Makefile b/www/firefox-i18n/Makefile index 6067a493b059..40f5c2dc5584 100644 --- a/www/firefox-i18n/Makefile +++ b/www/firefox-i18n/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= firefox-i18n -PORTVERSION= 57.0.3 +PORTVERSION= 58.0b13 CATEGORIES= www MASTER_SITES= MOZILLA/${PORTNAME:S|-i18n||}/releases/${DISTVERSION}/linux-i686/xpi \ MOZILLA/${PORTNAME:S|-i18n||}/candidates/${DISTVERSION}-candidates/build1/linux-i686/xpi @@ -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 diff --git a/www/firefox-i18n/Makefile.lang b/www/firefox-i18n/Makefile.lang index 20d45f4ce03e..1a30788af35a 100644 --- a/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 diff --git a/www/firefox-i18n/Makefile.option b/www/firefox-i18n/Makefile.option index bc2035278e9d..6bb0f6a7dd3b 100644 --- a/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 diff --git a/www/firefox-i18n/distinfo b/www/firefox-i18n/distinfo index 6a66381d4d0e..b698a260f963 100644 --- a/www/firefox-i18n/distinfo +++ b/www/firefox-i18n/distinfo @@ -1,191 +1,193 @@ -TIMESTAMP = 1514290652 -SHA256 (xpi/firefox-i18n-57.0.3/ach.xpi) = 62be40961458640e830b414ba89609752d22d9e8ccfe37e18b4e7aa4e1d1026a -SIZE (xpi/firefox-i18n-57.0.3/ach.xpi) = 441113 -SHA256 (xpi/firefox-i18n-57.0.3/af.xpi) = 1f3cf13e09df706d1da62d21a2bf71da4bfa594d8cf5adf7c2b1c74a310efb26 -SIZE (xpi/firefox-i18n-57.0.3/af.xpi) = 442206 -SHA256 (xpi/firefox-i18n-57.0.3/an.xpi) = 5d97049fcb1a92c79392cc4d06f290491f0246b3ed47223774b8f30a1d15bb3c -SIZE (xpi/firefox-i18n-57.0.3/an.xpi) = 462778 -SHA256 (xpi/firefox-i18n-57.0.3/ar.xpi) = 27d3d480a132f9f913fde8af5b31d1667372cf03bdea9bfab4b1429b2d587b5e -SIZE (xpi/firefox-i18n-57.0.3/ar.xpi) = 488160 -SHA256 (xpi/firefox-i18n-57.0.3/as.xpi) = 70161799018f0e796019cf97cb9887b5092e07f12272eecce59cb58e53dbe2c6 -SIZE (xpi/firefox-i18n-57.0.3/as.xpi) = 491075 -SHA256 (xpi/firefox-i18n-57.0.3/ast.xpi) = a4c72512024038ed229dc64be40940d32e1cc702d68225de7b1eceb7153bf375 -SIZE (xpi/firefox-i18n-57.0.3/ast.xpi) = 455504 -SHA256 (xpi/firefox-i18n-57.0.3/az.xpi) = 935d49254107e268cd1f13f424924c688da15469a21a192e3ba18fc7e2571fa9 -SIZE (xpi/firefox-i18n-57.0.3/az.xpi) = 466043 -SHA256 (xpi/firefox-i18n-57.0.3/be.xpi) = 1415abc2256c600fe3417494c2b581253806a401260ac1cef1fb8ce25dc3d09c -SIZE (xpi/firefox-i18n-57.0.3/be.xpi) = 516092 -SHA256 (xpi/firefox-i18n-57.0.3/bg.xpi) = 9e40838731441cb06dec7a5cb01d844bac2da6b1e1700705ea62b21bda501573 -SIZE (xpi/firefox-i18n-57.0.3/bg.xpi) = 510351 -SHA256 (xpi/firefox-i18n-57.0.3/bn-BD.xpi) = 7e479b3280922cde5a75aeb0b2ca813890c07f488a54709de0b3627f0e27c76e -SIZE (xpi/firefox-i18n-57.0.3/bn-BD.xpi) = 527189 -SHA256 (xpi/firefox-i18n-57.0.3/bn-IN.xpi) = 9bbaecf628c0f665466548982a92760eb7df9a789ccbd92807188f12241a8b01 -SIZE (xpi/firefox-i18n-57.0.3/bn-IN.xpi) = 516180 -SHA256 (xpi/firefox-i18n-57.0.3/br.xpi) = 1e13602f2b42407aa56bf57bddcdc4b47691d454aa6e5a0ade52e68a0065355f -SIZE (xpi/firefox-i18n-57.0.3/br.xpi) = 451866 -SHA256 (xpi/firefox-i18n-57.0.3/bs.xpi) = f67eb104f8ecc0dbdf16f50dfa5b782d874032a2a8f659fd2c50d1f49fa4a211 -SIZE (xpi/firefox-i18n-57.0.3/bs.xpi) = 459650 -SHA256 (xpi/firefox-i18n-57.0.3/ca.xpi) = bcfefd6d9f81de2d4f546d1d968886dfd4115408df019df5fa2253152cd67def -SIZE (xpi/firefox-i18n-57.0.3/ca.xpi) = 466641 -SHA256 (xpi/firefox-i18n-57.0.3/cak.xpi) = e84a0c21faa2a669d7cf4fec96d9a3123249d2847e04814b0a39602bd70b08fe -SIZE (xpi/firefox-i18n-57.0.3/cak.xpi) = 475935 -SHA256 (xpi/firefox-i18n-57.0.3/cs.xpi) = eccebcc46805353b828fc98c98dabbff935c1c4fcda81428bbebd5636f456ba2 -SIZE (xpi/firefox-i18n-57.0.3/cs.xpi) = 469457 -SHA256 (xpi/firefox-i18n-57.0.3/cy.xpi) = 112f86eb14d496a7d55d0a3e30b300f68ccbef901eaf386911a46480ee8e1472 -SIZE (xpi/firefox-i18n-57.0.3/cy.xpi) = 455788 -SHA256 (xpi/firefox-i18n-57.0.3/da.xpi) = 3953d4ef06a88eaf0f64a888a6b6f3d90dc92d897987d180e4b1bce494754896 -SIZE (xpi/firefox-i18n-57.0.3/da.xpi) = 448415 -SHA256 (xpi/firefox-i18n-57.0.3/de.xpi) = cf3926ebb91fd0f810040478fc84926d58d05e80d8e3ad759cb5a9fac4572ccb -SIZE (xpi/firefox-i18n-57.0.3/de.xpi) = 460813 -SHA256 (xpi/firefox-i18n-57.0.3/dsb.xpi) = 8558c3e3016163be7f44d34965abea30a71c198bab72e43aa953a6af7f95358a -SIZE (xpi/firefox-i18n-57.0.3/dsb.xpi) = 479511 -SHA256 (xpi/firefox-i18n-57.0.3/el.xpi) = 252bfa2ae364b3ae17c4358f8d34773b1772438691540d026b121293f3b88bf4 -SIZE (xpi/firefox-i18n-57.0.3/el.xpi) = 534484 -SHA256 (xpi/firefox-i18n-57.0.3/en-GB.xpi) = 206660d54f5542536496be86ab466f0f340947f7e9ad472f77acfb1badd7b67f -SIZE (xpi/firefox-i18n-57.0.3/en-GB.xpi) = 435623 -SHA256 (xpi/firefox-i18n-57.0.3/en-US.xpi) = 79fec5b89df10b6c93b3fe297f8297b1c16848d2ba232e9c92a177ed6f1d2fa2 -SIZE (xpi/firefox-i18n-57.0.3/en-US.xpi) = 441880 -SHA256 (xpi/firefox-i18n-57.0.3/en-ZA.xpi) = b577884435dad00bda6f41f3fe739b800951eda7e22ccf6ff7b95b1b733d8bf8 -SIZE (xpi/firefox-i18n-57.0.3/en-ZA.xpi) = 432020 -SHA256 (xpi/firefox-i18n-57.0.3/eo.xpi) = d7f7cec0b89593a333e874925e8c84351b37b4370ac518208e7ddd851fba2345 -SIZE (xpi/firefox-i18n-57.0.3/eo.xpi) = 454910 -SHA256 (xpi/firefox-i18n-57.0.3/es-AR.xpi) = 90754b3c92d11247fae9a517a9e7b6b6160c95c7bfa45b380b27bcff4311069f -SIZE (xpi/firefox-i18n-57.0.3/es-AR.xpi) = 462980 -SHA256 (xpi/firefox-i18n-57.0.3/es-CL.xpi) = d3d50fa0d2bcde903e138d60ac8b701d64549b2f8a3a5f46a01776051218713d -SIZE (xpi/firefox-i18n-57.0.3/es-CL.xpi) = 465514 -SHA256 (xpi/firefox-i18n-57.0.3/es-ES.xpi) = af2e97319876c226a88fad82fafddfb9fb260d0831b9b7bdcab4c643e3304964 -SIZE (xpi/firefox-i18n-57.0.3/es-ES.xpi) = 353625 -SHA256 (xpi/firefox-i18n-57.0.3/es-MX.xpi) = 50ca53ce1f8923dec16a3522a81a70622262db3db143ae55b8c0bc12583d5d62 -SIZE (xpi/firefox-i18n-57.0.3/es-MX.xpi) = 468761 -SHA256 (xpi/firefox-i18n-57.0.3/et.xpi) = 83d548a444184b29e66a67659995b22fc9a6c88dd7ec6048d222cd25117fdf43 -SIZE (xpi/firefox-i18n-57.0.3/et.xpi) = 447279 -SHA256 (xpi/firefox-i18n-57.0.3/eu.xpi) = 2a57c7661d80338b7ea5750a87aa2f0a93cdd0a85df802cac253c71485151a2a -SIZE (xpi/firefox-i18n-57.0.3/eu.xpi) = 454673 -SHA256 (xpi/firefox-i18n-57.0.3/fa.xpi) = b4dfac6b02dd95e993748cc2983a26203d30ceb89ee4362d372a6592e73ae7a5 -SIZE (xpi/firefox-i18n-57.0.3/fa.xpi) = 510829 -SHA256 (xpi/firefox-i18n-57.0.3/ff.xpi) = f7ec164ed52f02c064860fc331d46a2d171c1d1013e4f9fb349758be0e049ca6 -SIZE (xpi/firefox-i18n-57.0.3/ff.xpi) = 454015 -SHA256 (xpi/firefox-i18n-57.0.3/fi.xpi) = 285e7c413785cd9804417935bf17d302dbf9adcf02416ee77bcc282adb7d0d70 -SIZE (xpi/firefox-i18n-57.0.3/fi.xpi) = 446244 -SHA256 (xpi/firefox-i18n-57.0.3/fr.xpi) = e32fecffc352af98572e210a71d18a569a791448ff1e9708c4fd4ee14406b974 -SIZE (xpi/firefox-i18n-57.0.3/fr.xpi) = 472721 -SHA256 (xpi/firefox-i18n-57.0.3/fy-NL.xpi) = f03ca7c9cb7734c8c1d4a98255d991b0b5d1fd3b6216cd2537725c7f3861a62f -SIZE (xpi/firefox-i18n-57.0.3/fy-NL.xpi) = 465911 -SHA256 (xpi/firefox-i18n-57.0.3/ga-IE.xpi) = e6fed91269a6844bd9b91d355d9ad4d3b1ab58fe68f067062d71ab2d5c971f0b -SIZE (xpi/firefox-i18n-57.0.3/ga-IE.xpi) = 475963 -SHA256 (xpi/firefox-i18n-57.0.3/gd.xpi) = ea971275e5269a7740bbb2fdd4e316562286c3df2b4c3b25b8a52560c5a6587b -SIZE (xpi/firefox-i18n-57.0.3/gd.xpi) = 465122 -SHA256 (xpi/firefox-i18n-57.0.3/gl.xpi) = 1c36b3713ac507c5fbfbda7d75de2b356a48e1291f236003cce921b9c796bbaa -SIZE (xpi/firefox-i18n-57.0.3/gl.xpi) = 452032 -SHA256 (xpi/firefox-i18n-57.0.3/gn.xpi) = 952f6e6fcbe4f1e5a840275827b48537c7ca4ed4224c50741bc73a92d0745005 -SIZE (xpi/firefox-i18n-57.0.3/gn.xpi) = 471956 -SHA256 (xpi/firefox-i18n-57.0.3/gu-IN.xpi) = 7fae567816165d6ab434eded6c6e79741a5608c719e3db38080dde3d4a73071b -SIZE (xpi/firefox-i18n-57.0.3/gu-IN.xpi) = 511990 -SHA256 (xpi/firefox-i18n-57.0.3/he.xpi) = 1a5cfae162733ccff47396c2c69546430f934f235b12e52137fe1488f1736a1a -SIZE (xpi/firefox-i18n-57.0.3/he.xpi) = 471921 -SHA256 (xpi/firefox-i18n-57.0.3/hi-IN.xpi) = e10d605fdc9338a92f57e90846c041d3d3016ff91b7e94fe5f57a7e1c5ead8e8 -SIZE (xpi/firefox-i18n-57.0.3/hi-IN.xpi) = 526110 -SHA256 (xpi/firefox-i18n-57.0.3/hr.xpi) = efc2141a79726f3d3e3beb505f046156c8e15fd75030b0f40e83257dc623f950 -SIZE (xpi/firefox-i18n-57.0.3/hr.xpi) = 460722 -SHA256 (xpi/firefox-i18n-57.0.3/hsb.xpi) = 639a8fd2be2845c372101ee292c1fe7e05161452cf0c8da9814b5527698fbbe1 -SIZE (xpi/firefox-i18n-57.0.3/hsb.xpi) = 476505 -SHA256 (xpi/firefox-i18n-57.0.3/hu.xpi) = 22afba00ee123a21d6d4491c232bc2c1f23a0e6f4dca8510d0926ec8f0a4e0a2 -SIZE (xpi/firefox-i18n-57.0.3/hu.xpi) = 476604 -SHA256 (xpi/firefox-i18n-57.0.3/hy-AM.xpi) = c5043c48e903931d9ee5a27d4dbb049bf2e26c82d9eada3c14a1a604d74b42de -SIZE (xpi/firefox-i18n-57.0.3/hy-AM.xpi) = 510825 -SHA256 (xpi/firefox-i18n-57.0.3/id.xpi) = 57159cf14d25c135cd13b3c1a55162fea5a9030f0f38bce296f17e17969714ef -SIZE (xpi/firefox-i18n-57.0.3/id.xpi) = 444041 -SHA256 (xpi/firefox-i18n-57.0.3/is.xpi) = 0f550971e68e635c7f8e22fa1891d054d29fd3b2b65e16943bf9caab13cc73be -SIZE (xpi/firefox-i18n-57.0.3/is.xpi) = 452660 -SHA256 (xpi/firefox-i18n-57.0.3/it.xpi) = bd58f2b805837c8172876310bc854eef7a43beaf7f8af90ce91b6e723864d259 -SIZE (xpi/firefox-i18n-57.0.3/it.xpi) = 347171 -SHA256 (xpi/firefox-i18n-57.0.3/ja.xpi) = 756442d8fa9093e8a2d57bbb4e8eda338ef4839349502dcbb2820458e782b534 -SIZE (xpi/firefox-i18n-57.0.3/ja.xpi) = 508553 -SHA256 (xpi/firefox-i18n-57.0.3/ka.xpi) = 70d4c33f043e67f765c9814a9b6b67b44b5604d0ed026ccf72adb427619405e7 -SIZE (xpi/firefox-i18n-57.0.3/ka.xpi) = 492355 -SHA256 (xpi/firefox-i18n-57.0.3/kab.xpi) = fa99ea1036929fa96479eca5551c8be2c86e7b6725e05b3c60076122344fa123 -SIZE (xpi/firefox-i18n-57.0.3/kab.xpi) = 462531 -SHA256 (xpi/firefox-i18n-57.0.3/kk.xpi) = 92147ec88764aa3e808ae59007fe27876111d47d9ab17138dd3b44317787b57a -SIZE (xpi/firefox-i18n-57.0.3/kk.xpi) = 519249 -SHA256 (xpi/firefox-i18n-57.0.3/km.xpi) = 0f1750a00b4cfc436e1233818b47b925c6ee88f5d9368cf8cc88e79de36416d8 -SIZE (xpi/firefox-i18n-57.0.3/km.xpi) = 530080 -SHA256 (xpi/firefox-i18n-57.0.3/kn.xpi) = a9ddb7f0a47cf7f31a25c0a03d784514136bfb3113a2807d99bfd96484cd0206 -SIZE (xpi/firefox-i18n-57.0.3/kn.xpi) = 531316 -SHA256 (xpi/firefox-i18n-57.0.3/ko.xpi) = d2da7ebea2bdaac1bd74459873b91d64fcb2b44c875ffbd7777e2eb1685b2886 -SIZE (xpi/firefox-i18n-57.0.3/ko.xpi) = 487306 -SHA256 (xpi/firefox-i18n-57.0.3/lij.xpi) = 66228918afef9bec106e58aeb8c5e698cb698dfe894caecb46c012a77f2b5022 -SIZE (xpi/firefox-i18n-57.0.3/lij.xpi) = 452343 -SHA256 (xpi/firefox-i18n-57.0.3/lt.xpi) = 1e49a47a5a76a9676f1624678f22f741cd45888aa908cde2c40fb26190c5755d -SIZE (xpi/firefox-i18n-57.0.3/lt.xpi) = 474957 -SHA256 (xpi/firefox-i18n-57.0.3/lv.xpi) = 87357299ac76e61c010bc47c35fc47d90028e5f73b5b3ece7f0ea59c142f39fb -SIZE (xpi/firefox-i18n-57.0.3/lv.xpi) = 465243 -SHA256 (xpi/firefox-i18n-57.0.3/mai.xpi) = 68760d77467e2d116582e85dce013dfd0c4de5fa53ec41cd5dc186228b0f94a3 -SIZE (xpi/firefox-i18n-57.0.3/mai.xpi) = 507396 -SHA256 (xpi/firefox-i18n-57.0.3/mk.xpi) = bf493652fe0705a2685a71a312aac94912246191cef1024af3347f84fcd44f43 -SIZE (xpi/firefox-i18n-57.0.3/mk.xpi) = 490853 -SHA256 (xpi/firefox-i18n-57.0.3/ml.xpi) = 80af6eb9bce4f180d087985405dd8a1c46c3ee0b692b5ea5d15847d88e40abc4 -SIZE (xpi/firefox-i18n-57.0.3/ml.xpi) = 528256 -SHA256 (xpi/firefox-i18n-57.0.3/mr.xpi) = d6d9a3afba41f55505d2c044b6d004c3e59a0e5eac784eb2ad7c098ffacf8a7b -SIZE (xpi/firefox-i18n-57.0.3/mr.xpi) = 521291 -SHA256 (xpi/firefox-i18n-57.0.3/ms.xpi) = b0f4dd4aad5a8f1010063fa55b0658ab6ee80f0d6407ef80383613c0e39c92dd -SIZE (xpi/firefox-i18n-57.0.3/ms.xpi) = 451255 -SHA256 (xpi/firefox-i18n-57.0.3/my.xpi) = de7eee491ff8a92c50c2d3a2b896fe31a3bb7f5541429361e702495e5dbe0536 -SIZE (xpi/firefox-i18n-57.0.3/my.xpi) = 517703 -SHA256 (xpi/firefox-i18n-57.0.3/nb-NO.xpi) = 5a678264b0bb13c00a79b3b11e35f9416a7a71983f95951bdae2825d4121c4c6 -SIZE (xpi/firefox-i18n-57.0.3/nb-NO.xpi) = 451557 -SHA256 (xpi/firefox-i18n-57.0.3/nl.xpi) = 4908cc50715d3ab8d0bc96bb263bd98494127c575e9806c4f78671d5ae000d9f -SIZE (xpi/firefox-i18n-57.0.3/nl.xpi) = 458318 -SHA256 (xpi/firefox-i18n-57.0.3/nn-NO.xpi) = ded6a88acbda4d3ff0a70e6bc61234ddf4e505e551cb5865da79658ad92a59b7 -SIZE (xpi/firefox-i18n-57.0.3/nn-NO.xpi) = 452004 -SHA256 (xpi/firefox-i18n-57.0.3/or.xpi) = b3804b75c2d1b45cd6add02ccfacfdb85b4db5985f5d8d95a7dde7cba043d481 -SIZE (xpi/firefox-i18n-57.0.3/or.xpi) = 500867 -SHA256 (xpi/firefox-i18n-57.0.3/pa-IN.xpi) = 4199a01892833b2fba10604a7e6696a6c1759da55af3814e8201310e9e62f70d -SIZE (xpi/firefox-i18n-57.0.3/pa-IN.xpi) = 495271 -SHA256 (xpi/firefox-i18n-57.0.3/pl.xpi) = 536791f830e614d683e41178d7b69780791053d89def1c96c8ce80609e649f2c -SIZE (xpi/firefox-i18n-57.0.3/pl.xpi) = 364230 -SHA256 (xpi/firefox-i18n-57.0.3/pt-BR.xpi) = 2e26a41affae96c731d4d68efcca39b939be308b1d50a12c6b578a30644afee1 -SIZE (xpi/firefox-i18n-57.0.3/pt-BR.xpi) = 457155 -SHA256 (xpi/firefox-i18n-57.0.3/pt-PT.xpi) = 9755d339d5edc0ea628e48ed6ace872e897a319da0124bb8a1752e3c57e560b3 -SIZE (xpi/firefox-i18n-57.0.3/pt-PT.xpi) = 460000 -SHA256 (xpi/firefox-i18n-57.0.3/rm.xpi) = a6a453153976cbb70b452e16e58c7b542f46454b03fe05dfcf71146a7eb71dcc -SIZE (xpi/firefox-i18n-57.0.3/rm.xpi) = 451059 -SHA256 (xpi/firefox-i18n-57.0.3/ro.xpi) = d0a82db76895fdb186a67a1b5d532c10677453623315f68a1a1ba1763cc62e50 -SIZE (xpi/firefox-i18n-57.0.3/ro.xpi) = 455511 -SHA256 (xpi/firefox-i18n-57.0.3/ru.xpi) = 1716b4375089d096c81001de3e9b8cdac6af1b9c38ec9d13a92dac8d2b4b5821 -SIZE (xpi/firefox-i18n-57.0.3/ru.xpi) = 526955 -SHA256 (xpi/firefox-i18n-57.0.3/si.xpi) = 92663d7e1755972f6edf4354dfdee86a67d89ce8a6b7e0e16b070f8592abc8b8 -SIZE (xpi/firefox-i18n-57.0.3/si.xpi) = 498324 -SHA256 (xpi/firefox-i18n-57.0.3/sk.xpi) = 75c4593005ac55a2c26cb4f24d16907ba84c6e80e49ba72423d66e8d90b4e566 -SIZE (xpi/firefox-i18n-57.0.3/sk.xpi) = 480397 -SHA256 (xpi/firefox-i18n-57.0.3/sl.xpi) = adfb1017301a6c856211c6b1cb7a4c7dbb6833e6c45e67a95fd2f844f3b76eef -SIZE (xpi/firefox-i18n-57.0.3/sl.xpi) = 459377 -SHA256 (xpi/firefox-i18n-57.0.3/son.xpi) = 815f462c6e5ccf1d054f6a6d344875fc8e366601d94d5a915721852eafb01a0d -SIZE (xpi/firefox-i18n-57.0.3/son.xpi) = 450931 -SHA256 (xpi/firefox-i18n-57.0.3/sq.xpi) = 395424d765780d463afe1e24581af224b5c0122c5e7e5604c11fb59dc061daa8 -SIZE (xpi/firefox-i18n-57.0.3/sq.xpi) = 465051 -SHA256 (xpi/firefox-i18n-57.0.3/sr.xpi) = d3b22ec3764eaf01056c60b42d5d0c75feae35c8b0cd8ddbb6b9d93ead8dad22 -SIZE (xpi/firefox-i18n-57.0.3/sr.xpi) = 487003 -SHA256 (xpi/firefox-i18n-57.0.3/sv-SE.xpi) = 8c7632d64883c7cfb208335d73017621b57ca209c0520ee1db22d81f86bb4882 -SIZE (xpi/firefox-i18n-57.0.3/sv-SE.xpi) = 459666 -SHA256 (xpi/firefox-i18n-57.0.3/ta.xpi) = aff265e81e980b44090526065746ccb2d2225e6e980aeadb38da9dd6386150e1 -SIZE (xpi/firefox-i18n-57.0.3/ta.xpi) = 513228 -SHA256 (xpi/firefox-i18n-57.0.3/te.xpi) = 96fa3fd8ddc4c14e540f2803cc57a6d46b99e35b3b07d41698e1c93558a2f997 -SIZE (xpi/firefox-i18n-57.0.3/te.xpi) = 530693 -SHA256 (xpi/firefox-i18n-57.0.3/th.xpi) = 30b069488a1e80a5f3cd6f4f708c0832e1e293c398bfbbe452cf2e3908f7299d -SIZE (xpi/firefox-i18n-57.0.3/th.xpi) = 502451 -SHA256 (xpi/firefox-i18n-57.0.3/tr.xpi) = 68cbb131782ddd410466b5419fc9ab01167237b64693ae9a549cdac0ef6ec022 -SIZE (xpi/firefox-i18n-57.0.3/tr.xpi) = 465580 -SHA256 (xpi/firefox-i18n-57.0.3/uk.xpi) = 0ac5c29e764001a3e439c6807c4456693c8f14faf22261ea814c538dc2bc0661 -SIZE (xpi/firefox-i18n-57.0.3/uk.xpi) = 518138 -SHA256 (xpi/firefox-i18n-57.0.3/ur.xpi) = 92152e17c2da4928e4be81985ce4b2b7cc9974a648e2a3498fe1714142301b28 -SIZE (xpi/firefox-i18n-57.0.3/ur.xpi) = 511138 -SHA256 (xpi/firefox-i18n-57.0.3/uz.xpi) = 360e066bd7ae1d31f2d6eff90be9f2a3ee877adfc203959354e6d7c6707ee840 -SIZE (xpi/firefox-i18n-57.0.3/uz.xpi) = 461694 -SHA256 (xpi/firefox-i18n-57.0.3/vi.xpi) = fe0ce0fab8506f8799d90bb9c9fbbdf76fcd84226393c8fa043ea8308424a2ba -SIZE (xpi/firefox-i18n-57.0.3/vi.xpi) = 471320 -SHA256 (xpi/firefox-i18n-57.0.3/xh.xpi) = aca1411b7316a648349d9dd124ab2fce475d103b7ab6582dc0d76b8bf4e8c1af -SIZE (xpi/firefox-i18n-57.0.3/xh.xpi) = 464461 -SHA256 (xpi/firefox-i18n-57.0.3/zh-CN.xpi) = 253f2a87e1a84e33c53b65031763e169cea7f615becfbe8779262fb37966c823 -SIZE (xpi/firefox-i18n-57.0.3/zh-CN.xpi) = 483625 -SHA256 (xpi/firefox-i18n-57.0.3/zh-TW.xpi) = cc0d6f01f6c23e60bcf5caef4fe3eec30863951c6912ee73235bc18a8547f90f -SIZE (xpi/firefox-i18n-57.0.3/zh-TW.xpi) = 482461 +TIMESTAMP = 1514295516 +SHA256 (xpi/firefox-i18n-58.0b13/ach.xpi) = 7c4e9a3d40bee39b8eda799cc4d517933549c80342a9a5fefe7b70aeffc89942 +SIZE (xpi/firefox-i18n-58.0b13/ach.xpi) = 444872 +SHA256 (xpi/firefox-i18n-58.0b13/af.xpi) = 86ae9d41737cbf687c01107fd4292f61704ce5427a18b60b5d2ca419fdd33075 +SIZE (xpi/firefox-i18n-58.0b13/af.xpi) = 444574 +SHA256 (xpi/firefox-i18n-58.0b13/an.xpi) = 2898aed292d63e62545c3a6f605133e150e3d571f4468f4b59010d489e03309c +SIZE (xpi/firefox-i18n-58.0b13/an.xpi) = 468931 +SHA256 (xpi/firefox-i18n-58.0b13/ar.xpi) = 74bc2712d853b286f8d1e853c489884f77d6ea0560acb03e0278721aeef3ac4d +SIZE (xpi/firefox-i18n-58.0b13/ar.xpi) = 493719 +SHA256 (xpi/firefox-i18n-58.0b13/as.xpi) = 1bef07d2815d4964016df69f78c6114ee5f62109cc11021147cb0161b06ca83b +SIZE (xpi/firefox-i18n-58.0b13/as.xpi) = 492795 +SHA256 (xpi/firefox-i18n-58.0b13/ast.xpi) = 0a063ab8289be7c884e0dd0b737b11feb47f530129f9f38833ac2e5b5ce3c33a +SIZE (xpi/firefox-i18n-58.0b13/ast.xpi) = 461572 +SHA256 (xpi/firefox-i18n-58.0b13/az.xpi) = 0bc61ede399303c28947ad21d41fe252450d23e7e3348608019b46d9b5bfd2c4 +SIZE (xpi/firefox-i18n-58.0b13/az.xpi) = 468525 +SHA256 (xpi/firefox-i18n-58.0b13/be.xpi) = c4d256984ef85b19a991ba78ba41fdba944e0f260194bfc892c4101aaf099577 +SIZE (xpi/firefox-i18n-58.0b13/be.xpi) = 521175 +SHA256 (xpi/firefox-i18n-58.0b13/bg.xpi) = eb97467b9b6097beafe6edd6ab2e0f86b7545ab623c149b489cd78b4a486638d +SIZE (xpi/firefox-i18n-58.0b13/bg.xpi) = 515702 +SHA256 (xpi/firefox-i18n-58.0b13/bn-BD.xpi) = aaa80b64c3d43899b94356d20978b904b22386b59cd66de9708087a9996a369c +SIZE (xpi/firefox-i18n-58.0b13/bn-BD.xpi) = 528704 +SHA256 (xpi/firefox-i18n-58.0b13/bn-IN.xpi) = 1b792d745b3b95fec955834cf70928f1386ccee515a231ddae2dc6aeeddd92bc +SIZE (xpi/firefox-i18n-58.0b13/bn-IN.xpi) = 518318 +SHA256 (xpi/firefox-i18n-58.0b13/br.xpi) = 0dad734591736df7031e0f593214a6672f7af545ae3b921660306b5074d554d5 +SIZE (xpi/firefox-i18n-58.0b13/br.xpi) = 457134 +SHA256 (xpi/firefox-i18n-58.0b13/bs.xpi) = 279d93c7b5235635a33136ad782966e15e3b1c406d56a66bb8924e95b064efe8 +SIZE (xpi/firefox-i18n-58.0b13/bs.xpi) = 461814 +SHA256 (xpi/firefox-i18n-58.0b13/ca.xpi) = 8ea023d710160fc69a9e5a17f1dfad7e24a9b4282a4d0dc29c860118cb32a015 +SIZE (xpi/firefox-i18n-58.0b13/ca.xpi) = 470157 +SHA256 (xpi/firefox-i18n-58.0b13/cak.xpi) = bc6c92bb04d8f71453d554eb1d951dc9fb4fe4ffa0a80d338878fabc492f1959 +SIZE (xpi/firefox-i18n-58.0b13/cak.xpi) = 481298 +SHA256 (xpi/firefox-i18n-58.0b13/cs.xpi) = 91f04e97066e74b7366617f63ca701eb88fb0924f6921034c660761d54aeea20 +SIZE (xpi/firefox-i18n-58.0b13/cs.xpi) = 478410 +SHA256 (xpi/firefox-i18n-58.0b13/cy.xpi) = 25d446670c629bfa8616fb807cedad6aae9e7469b9b1b50e98e440af41788191 +SIZE (xpi/firefox-i18n-58.0b13/cy.xpi) = 460986 +SHA256 (xpi/firefox-i18n-58.0b13/da.xpi) = f6f5c69b689eb31b3daad2819ef15c4f2fbcd535833c24dccdd7c0a735385f86 +SIZE (xpi/firefox-i18n-58.0b13/da.xpi) = 450529 +SHA256 (xpi/firefox-i18n-58.0b13/de.xpi) = 171211e4597b72b98c1aea340f325343238f8d62b4ad1c8106032263b3040496 +SIZE (xpi/firefox-i18n-58.0b13/de.xpi) = 464694 +SHA256 (xpi/firefox-i18n-58.0b13/dsb.xpi) = 4a1462ac6012065f8f3c3c9afed0347260cd10153f2b5d6213a21dab26115293 +SIZE (xpi/firefox-i18n-58.0b13/dsb.xpi) = 485516 +SHA256 (xpi/firefox-i18n-58.0b13/el.xpi) = 0d9f19a18803ca98dc7830a1bebcbef2f5cc3ae5e3c8bcf151860aae65e26c6f +SIZE (xpi/firefox-i18n-58.0b13/el.xpi) = 538370 +SHA256 (xpi/firefox-i18n-58.0b13/en-GB.xpi) = f2150a70b821542759993b04a50299a0665d6a85dc33074d2e4d4ccc0c2d846e +SIZE (xpi/firefox-i18n-58.0b13/en-GB.xpi) = 439092 +SHA256 (xpi/firefox-i18n-58.0b13/en-US.xpi) = 6744a00143f93992fd9ddbbcaed7e58bc2bab3f42709ba61480fd1f1cd98f9b1 +SIZE (xpi/firefox-i18n-58.0b13/en-US.xpi) = 440002 +SHA256 (xpi/firefox-i18n-58.0b13/en-ZA.xpi) = 21ff6c58a514b0b05b137196096f2711105f4b15c27a9dbadeff6ad111e14747 +SIZE (xpi/firefox-i18n-58.0b13/en-ZA.xpi) = 434818 +SHA256 (xpi/firefox-i18n-58.0b13/eo.xpi) = 6cdfa7224b1afc9bef0d2d53defe0ef36d420d5af62a406e1402076063f5b507 +SIZE (xpi/firefox-i18n-58.0b13/eo.xpi) = 457975 +SHA256 (xpi/firefox-i18n-58.0b13/es-AR.xpi) = 8b9085ed8faa5a2372ff62c9e603ac5ccea8402a0b7e7446eb848c6ad30c562a +SIZE (xpi/firefox-i18n-58.0b13/es-AR.xpi) = 467897 +SHA256 (xpi/firefox-i18n-58.0b13/es-CL.xpi) = d93e4de1557e6bb4ddf7cbf8c9ad5c2903765b685b9557c1a8014d8f09392dd9 +SIZE (xpi/firefox-i18n-58.0b13/es-CL.xpi) = 472661 +SHA256 (xpi/firefox-i18n-58.0b13/es-ES.xpi) = b8e0618b9a254cffe60286f1e8356c9fd6a870f4b2674adc07745b7f21ef0a25 +SIZE (xpi/firefox-i18n-58.0b13/es-ES.xpi) = 356827 +SHA256 (xpi/firefox-i18n-58.0b13/es-MX.xpi) = 2f1f789d271d9ed30b4b3ab3dbeebd36fb44fd32187a83502fa7f6a1405a1bf8 +SIZE (xpi/firefox-i18n-58.0b13/es-MX.xpi) = 472343 +SHA256 (xpi/firefox-i18n-58.0b13/et.xpi) = 2421e32ae104cac3ed233664aa23faa5ba9fd5233bd2d92af2fbffe1ddf2d453 +SIZE (xpi/firefox-i18n-58.0b13/et.xpi) = 450450 +SHA256 (xpi/firefox-i18n-58.0b13/eu.xpi) = 57ce2af5d8579ce2d634e2ed9da6613f1c3838ac9f2ea25c8368a23fa22891ec +SIZE (xpi/firefox-i18n-58.0b13/eu.xpi) = 459750 +SHA256 (xpi/firefox-i18n-58.0b13/fa.xpi) = d4d40d6aef3d887d910a00a7d28cb0272f525f64e7b5948ba07f24c4adda8139 +SIZE (xpi/firefox-i18n-58.0b13/fa.xpi) = 516038 +SHA256 (xpi/firefox-i18n-58.0b13/ff.xpi) = a29b465b7c16677465e0e65ceee94de250da5b65c69e859e1ac52e2fb59cb7b0 +SIZE (xpi/firefox-i18n-58.0b13/ff.xpi) = 461467 +SHA256 (xpi/firefox-i18n-58.0b13/fi.xpi) = f2be988378d19ebafe9b85299b65108c39071e01c783e289404de6619c05edaa +SIZE (xpi/firefox-i18n-58.0b13/fi.xpi) = 451161 +SHA256 (xpi/firefox-i18n-58.0b13/fr.xpi) = 60aba5e10d02a1cb422f99cdcf83330badded0e9ca6bf24bb865dbbda590c854 +SIZE (xpi/firefox-i18n-58.0b13/fr.xpi) = 477980 +SHA256 (xpi/firefox-i18n-58.0b13/fy-NL.xpi) = b6744ac3792b7b8ac58f1da3d2a4ce3cd41822ab64d8ab77033dd5a6a40c5c76 +SIZE (xpi/firefox-i18n-58.0b13/fy-NL.xpi) = 469750 +SHA256 (xpi/firefox-i18n-58.0b13/ga-IE.xpi) = b51fe762d88c14a7f43a5604e38be6ebba948bf8a16abda66c81b3742d6a844a +SIZE (xpi/firefox-i18n-58.0b13/ga-IE.xpi) = 479265 +SHA256 (xpi/firefox-i18n-58.0b13/gd.xpi) = f01213cff3a196272976ba25c55c5d3b90223d48112879f46318c277d58e27a4 +SIZE (xpi/firefox-i18n-58.0b13/gd.xpi) = 466996 +SHA256 (xpi/firefox-i18n-58.0b13/gl.xpi) = 96792d343d328d2586b9ba02362ee7c72b4b7683b7396915e38973b1f73a9a79 +SIZE (xpi/firefox-i18n-58.0b13/gl.xpi) = 454324 +SHA256 (xpi/firefox-i18n-58.0b13/gn.xpi) = 56bb603067c7bd1ffc53682c64bcd1c0337b6318e7b912357d9f8b792ff9a4bf +SIZE (xpi/firefox-i18n-58.0b13/gn.xpi) = 475399 +SHA256 (xpi/firefox-i18n-58.0b13/gu-IN.xpi) = 19341da7dc0dca198c490a05b6c1f6d98f056edcbb44514158a6ef00044c307b +SIZE (xpi/firefox-i18n-58.0b13/gu-IN.xpi) = 520668 +SHA256 (xpi/firefox-i18n-58.0b13/he.xpi) = 0b9840f4942adaa0bf1810d0b9dd7aae58a4156ab212a02bd4edacbd872861bf +SIZE (xpi/firefox-i18n-58.0b13/he.xpi) = 478364 +SHA256 (xpi/firefox-i18n-58.0b13/hi-IN.xpi) = 64677c3006ebca31ff5e0bd49b5238845328cd15b910831d4fe9e02695311036 +SIZE (xpi/firefox-i18n-58.0b13/hi-IN.xpi) = 528342 +SHA256 (xpi/firefox-i18n-58.0b13/hr.xpi) = 09d74738a2155f8de2005755a19cf46813ba2d911742a62436721ea05c09cd3b +SIZE (xpi/firefox-i18n-58.0b13/hr.xpi) = 466023 +SHA256 (xpi/firefox-i18n-58.0b13/hsb.xpi) = 39a8020737bdc8494dfdf072bd2399b66d741d67bbb084e817c4aa11b994d441 +SIZE (xpi/firefox-i18n-58.0b13/hsb.xpi) = 482468 +SHA256 (xpi/firefox-i18n-58.0b13/hu.xpi) = 7bca44e0df6a3d0dd547f66f106473b4a9cc2139ccee5556272daae8feff0e51 +SIZE (xpi/firefox-i18n-58.0b13/hu.xpi) = 481473 +SHA256 (xpi/firefox-i18n-58.0b13/hy-AM.xpi) = 9aae408ac8e0eb101e8a1186837a4bd41c3821834bb2f0ac4bc00f6a39a0dfbf +SIZE (xpi/firefox-i18n-58.0b13/hy-AM.xpi) = 515028 +SHA256 (xpi/firefox-i18n-58.0b13/id.xpi) = cdcc74b70e358db9a1e0bd09798aa1ecfef0bb1820cd939a856bebe9f3e50afc +SIZE (xpi/firefox-i18n-58.0b13/id.xpi) = 447287 +SHA256 (xpi/firefox-i18n-58.0b13/is.xpi) = 6f84b805852b8d5f1cae3e9861ae91ae3a93656a1e48e03f0b5db3ad7c00fccd +SIZE (xpi/firefox-i18n-58.0b13/is.xpi) = 458899 +SHA256 (xpi/firefox-i18n-58.0b13/it.xpi) = ea625ef8773b24fea2e14c817e205e745e5ecbedffcf491e1a3b7136a1ecc1ae +SIZE (xpi/firefox-i18n-58.0b13/it.xpi) = 349758 +SHA256 (xpi/firefox-i18n-58.0b13/ja.xpi) = 976fdefc7012feddee7a936f251a5be8989edd1666df37ee9686d0bc96c6a195 +SIZE (xpi/firefox-i18n-58.0b13/ja.xpi) = 512766 +SHA256 (xpi/firefox-i18n-58.0b13/ka.xpi) = 6a9a17b081735ab036e6e00834c3a406a49ac72e000e491f2deec00195b805b7 +SIZE (xpi/firefox-i18n-58.0b13/ka.xpi) = 499586 +SHA256 (xpi/firefox-i18n-58.0b13/kab.xpi) = b402369ff353faba1a848efaf5f162fab7825753717ba7549d888d2e9ee5fada +SIZE (xpi/firefox-i18n-58.0b13/kab.xpi) = 468028 +SHA256 (xpi/firefox-i18n-58.0b13/kk.xpi) = 13372992ea9fa201de1df2cd8bb72c79dbcaa5f7a7d79d43417a7804aa66ba95 +SIZE (xpi/firefox-i18n-58.0b13/kk.xpi) = 523596 +SHA256 (xpi/firefox-i18n-58.0b13/km.xpi) = 9686b573aff4df80cb630d80112f2e478a569d9a9e873f97a79c5287ddfb8228 +SIZE (xpi/firefox-i18n-58.0b13/km.xpi) = 532324 +SHA256 (xpi/firefox-i18n-58.0b13/kn.xpi) = 1047b89ee28e2cc60a3b62686e745d9235efb1b77d0815f65ce9a0b40f9f06d2 +SIZE (xpi/firefox-i18n-58.0b13/kn.xpi) = 535940 +SHA256 (xpi/firefox-i18n-58.0b13/ko.xpi) = 98ff8d7e454cca00c35ee33864803f9e6788ef24207b23743ab3c89179583f14 +SIZE (xpi/firefox-i18n-58.0b13/ko.xpi) = 492312 +SHA256 (xpi/firefox-i18n-58.0b13/lij.xpi) = 4d35c9c5eed73a23a21b0acc3fc9d56cb438d86eb1f611ca145aca0904a5171f +SIZE (xpi/firefox-i18n-58.0b13/lij.xpi) = 455541 +SHA256 (xpi/firefox-i18n-58.0b13/lt.xpi) = 228f05ff56651f5467b35f4a2f1afb3a4a51ec8b7d1eac0a7fef4b68ffc22112 +SIZE (xpi/firefox-i18n-58.0b13/lt.xpi) = 477092 +SHA256 (xpi/firefox-i18n-58.0b13/lv.xpi) = c7fa9ef97d49b0ddbb61cf3786135cdfdababca9dad68eab4e71fa61801a7294 +SIZE (xpi/firefox-i18n-58.0b13/lv.xpi) = 468514 +SHA256 (xpi/firefox-i18n-58.0b13/mai.xpi) = ae9f9390adb8ea8e9df3a9e805ba5149e65db7ac44ea3a955dde3a2fbab341ec +SIZE (xpi/firefox-i18n-58.0b13/mai.xpi) = 509069 +SHA256 (xpi/firefox-i18n-58.0b13/mk.xpi) = b10ae273eea89b520a1f96b60279707bf5ca41f1607a8dd0bf23f76db50a8067 +SIZE (xpi/firefox-i18n-58.0b13/mk.xpi) = 492513 +SHA256 (xpi/firefox-i18n-58.0b13/ml.xpi) = c40dcbb10a4a118d4fd2c67032fd5cb178e14e6cae3ed40e24c6b022bb6a71e0 +SIZE (xpi/firefox-i18n-58.0b13/ml.xpi) = 546665 +SHA256 (xpi/firefox-i18n-58.0b13/mr.xpi) = 8848fa0390743021a7373e1ff9b82d687b78e0ae6c65d6737f2e38c5a2923dfd +SIZE (xpi/firefox-i18n-58.0b13/mr.xpi) = 523118 +SHA256 (xpi/firefox-i18n-58.0b13/ms.xpi) = a4936b6c21f1c61aa2ccfdc6e791cc642e9a271af14207a83beb8cf473639b5c +SIZE (xpi/firefox-i18n-58.0b13/ms.xpi) = 457059 +SHA256 (xpi/firefox-i18n-58.0b13/my.xpi) = d8a309b641915532ce098cee4181d893c747ea58b73171a1967bf77cb3d6add7 +SIZE (xpi/firefox-i18n-58.0b13/my.xpi) = 520422 +SHA256 (xpi/firefox-i18n-58.0b13/nb-NO.xpi) = f513a8df5805b1e1aa53c401253a61ecb183163e19b4cd88559c37505fcf5894 +SIZE (xpi/firefox-i18n-58.0b13/nb-NO.xpi) = 456804 +SHA256 (xpi/firefox-i18n-58.0b13/ne-NP.xpi) = eaebd2f5e64d5db13000889b84bda88a55b1f9ceee401245281c5db0f95c1366 +SIZE (xpi/firefox-i18n-58.0b13/ne-NP.xpi) = 517046 +SHA256 (xpi/firefox-i18n-58.0b13/nl.xpi) = dde64ca31ac34885f1d6b3d69395c58e09ff2112cb8b095a64f0ec3b163420f3 +SIZE (xpi/firefox-i18n-58.0b13/nl.xpi) = 464338 +SHA256 (xpi/firefox-i18n-58.0b13/nn-NO.xpi) = c2230bfe5a237f4af252aacb8b20cdf9db9edb15d814c7ea2f8d59091daf6035 +SIZE (xpi/firefox-i18n-58.0b13/nn-NO.xpi) = 456705 +SHA256 (xpi/firefox-i18n-58.0b13/or.xpi) = 286fec32531641fa74d46c2760366c4e304414504c9c910ae283afb46b8d7534 +SIZE (xpi/firefox-i18n-58.0b13/or.xpi) = 502587 +SHA256 (xpi/firefox-i18n-58.0b13/pa-IN.xpi) = 5d65b650780b06c0e8664352553238302f9fe9b06665f1187a6c2471f758fc03 +SIZE (xpi/firefox-i18n-58.0b13/pa-IN.xpi) = 497515 +SHA256 (xpi/firefox-i18n-58.0b13/pl.xpi) = e7a3635174f883d06b2f190b79e7b193129644074a7a680d6a3a56a4550981d2 +SIZE (xpi/firefox-i18n-58.0b13/pl.xpi) = 365324 +SHA256 (xpi/firefox-i18n-58.0b13/pt-BR.xpi) = dab2334b3f6575c0b37f06516e6db66f1c2aa465cfd7ecbfb0da9b396c816839 +SIZE (xpi/firefox-i18n-58.0b13/pt-BR.xpi) = 462440 +SHA256 (xpi/firefox-i18n-58.0b13/pt-PT.xpi) = ab3467b22a49514e842a490d34c025c027c11172b9237c2317719a21e357dfbf +SIZE (xpi/firefox-i18n-58.0b13/pt-PT.xpi) = 465749 +SHA256 (xpi/firefox-i18n-58.0b13/rm.xpi) = 3a8103585e0bd761c38bd2b43bd502adaa6b19d7572d174082f837e953662971 +SIZE (xpi/firefox-i18n-58.0b13/rm.xpi) = 458240 +SHA256 (xpi/firefox-i18n-58.0b13/ro.xpi) = 22cd64cf9c60852e0cee86d21f66fb822802f708ebc1f3b4fe9335d2ad5c5984 +SIZE (xpi/firefox-i18n-58.0b13/ro.xpi) = 458746 +SHA256 (xpi/firefox-i18n-58.0b13/ru.xpi) = c5a5441236e75ec309f194dc6b7f7040c169a4b3734d74031bbee946a374b290 +SIZE (xpi/firefox-i18n-58.0b13/ru.xpi) = 531422 +SHA256 (xpi/firefox-i18n-58.0b13/si.xpi) = 309466ca6bd299bbbeab6dfcde85d25e5144566f88c170b286cc4735848ccbc6 +SIZE (xpi/firefox-i18n-58.0b13/si.xpi) = 500389 +SHA256 (xpi/firefox-i18n-58.0b13/sk.xpi) = eb7e0c9b45ae881622a98e3f274539d81cb54c4b30a099fa9d9b3ad1bc268b05 +SIZE (xpi/firefox-i18n-58.0b13/sk.xpi) = 484544 +SHA256 (xpi/firefox-i18n-58.0b13/sl.xpi) = fa1d496847410a8ea46135de624607e54c87c4ba9fe3c2cdc90bf0da9ecc5664 +SIZE (xpi/firefox-i18n-58.0b13/sl.xpi) = 461910 +SHA256 (xpi/firefox-i18n-58.0b13/son.xpi) = 0b6275f2fca13c105f7857c74a1b67745a4ce0eba648ce30b4aaf86a4b2183da +SIZE (xpi/firefox-i18n-58.0b13/son.xpi) = 453958 +SHA256 (xpi/firefox-i18n-58.0b13/sq.xpi) = 2ee16e07de9525dc40581773a53bb7f5cf1fa22daebac9ba1c023a3f5f2bf2ae +SIZE (xpi/firefox-i18n-58.0b13/sq.xpi) = 471954 +SHA256 (xpi/firefox-i18n-58.0b13/sr.xpi) = 868f17bf905ffc172bd141f0103c1830be667cf2e08a7e9d66c74965481ff2f1 +SIZE (xpi/firefox-i18n-58.0b13/sr.xpi) = 492195 +SHA256 (xpi/firefox-i18n-58.0b13/sv-SE.xpi) = 0064764f26ea544f929effeb0d2dbad75f2b6f3bd01f54d669fc6a07fa85e066 +SIZE (xpi/firefox-i18n-58.0b13/sv-SE.xpi) = 465202 +SHA256 (xpi/firefox-i18n-58.0b13/ta.xpi) = f808615955af018e0bf823b6711e24c9ee5de2620438cb547cdb07b4ebb81004 +SIZE (xpi/firefox-i18n-58.0b13/ta.xpi) = 518560 +SHA256 (xpi/firefox-i18n-58.0b13/te.xpi) = 47310b16e3b82e9d2c11a922b54c16cfe27c6973bdfcefb4854156bc57fb87f4 +SIZE (xpi/firefox-i18n-58.0b13/te.xpi) = 535197 +SHA256 (xpi/firefox-i18n-58.0b13/th.xpi) = fe9238eba87ac1afae437f4768aa2b477b5e55bee19a96ea6b214b40cc801288 +SIZE (xpi/firefox-i18n-58.0b13/th.xpi) = 505465 +SHA256 (xpi/firefox-i18n-58.0b13/tr.xpi) = a1bc981e5ccf0b340994e40716c5587852946c3ad73608fd9bfbbd2c8162b960 +SIZE (xpi/firefox-i18n-58.0b13/tr.xpi) = 470489 +SHA256 (xpi/firefox-i18n-58.0b13/uk.xpi) = 146dc401a55e88dbce63eb43e2107921c915af53b7882e27f6f31a430dc14cf0 +SIZE (xpi/firefox-i18n-58.0b13/uk.xpi) = 522142 +SHA256 (xpi/firefox-i18n-58.0b13/ur.xpi) = 57078f2f19193a74231175b4c215cc9b046be783317eee858c58ccba468e4fb1 +SIZE (xpi/firefox-i18n-58.0b13/ur.xpi) = 514449 +SHA256 (xpi/firefox-i18n-58.0b13/uz.xpi) = 2b6cf0ae2087227427bb0b2c7a2a0d736d6b64f236e88dc08c94185a1ba015c9 +SIZE (xpi/firefox-i18n-58.0b13/uz.xpi) = 464526 +SHA256 (xpi/firefox-i18n-58.0b13/vi.xpi) = 3902ebd3b9ed3eb735328e022969bc78cb4e113dd1bfe85509a696f2d59c6589 +SIZE (xpi/firefox-i18n-58.0b13/vi.xpi) = 475105 +SHA256 (xpi/firefox-i18n-58.0b13/xh.xpi) = b8efa4b6bf7f603878a0333178a02f0d105a45104d3ca0246f931c8f8fa5f538 +SIZE (xpi/firefox-i18n-58.0b13/xh.xpi) = 467386 +SHA256 (xpi/firefox-i18n-58.0b13/zh-CN.xpi) = 0edc0f71bd033047c74ddb705bbd5e9baf5923e85dcc95d56cbad2d3f3586d54 +SIZE (xpi/firefox-i18n-58.0b13/zh-CN.xpi) = 489516 +SHA256 (xpi/firefox-i18n-58.0b13/zh-TW.xpi) = 7b5474ad82a5b9e3c7b1c8986f55cf17bc59a5ff4e0c587dbf74bcf8131e985a +SIZE (xpi/firefox-i18n-58.0b13/zh-TW.xpi) = 487147 diff --git a/www/firefox/Makefile b/www/firefox/Makefile index 8a6b46c69a34..e9a24b0672db 100644 --- a/www/firefox/Makefile +++ b/www/firefox/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= firefox -DISTVERSION= 57.0.3 +DISTVERSION= 58.0b13 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 \ diff --git a/www/firefox/distinfo b/www/firefox/distinfo index e174a1c78bf9..ee9c5163e6c6 100644 --- a/www/firefox/distinfo +++ b/www/firefox/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1514290652 -SHA256 (firefox-57.0.3.source.tar.xz) = c5d4a32bfb099f0b31941b59f78d2dc2f42ed272117512fa39de92688d48f424 -SIZE (firefox-57.0.3.source.tar.xz) = 250607452 +TIMESTAMP = 1514295516 +SHA256 (firefox-58.0b13.source.tar.xz) = 4e91c0f574d7b205f5e7c09f069a7c57384e7a7d92428217fb9b1c6cc56e42aa +SIZE (firefox-58.0b13.source.tar.xz) = 249197352 diff --git a/www/firefox/files/patch-bug1186967 b/www/firefox/files/patch-bug1186967 deleted file mode 100644 index 26d304fbd3e9..000000000000 --- 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 diff --git a/www/firefox/files/patch-bug1366201 b/www/firefox/files/patch-bug1366201 deleted file mode 100644 index 0ee5140e1b9a..000000000000 --- 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; diff --git a/www/firefox/files/patch-bug1412558 b/www/firefox/files/patch-bug1412558 deleted file mode 100644 index b6d3b045eae5..000000000000 --- 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 diff --git a/www/firefox/files/patch-bug1414440 b/www/firefox/files/patch-bug1414440 deleted file mode 100644 index 1b82917bebb5..000000000000 --- 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" - ); diff --git a/www/firefox/files/patch-bug826985 b/www/firefox/files/patch-bug826985 index 8e9e7d24a024..69a51707c051 100644 --- a/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 diff --git a/www/firefox/files/patch-bug847568 b/www/firefox/files/patch-bug847568 index ed16b8d7caac..b9752599971c 100644 --- a/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') diff --git a/www/firefox/files/patch-dom_media_flac_FlacDecoder.cpp b/www/firefox/files/patch-dom_media_flac_FlacDecoder.cpp new file mode 100644 index 000000000000..1df3736c2211 --- /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; diff --git a/www/firefox/files/patch-toolkit_moz.configure b/www/firefox/files/patch-toolkit_moz.configure new file mode 100644 index 000000000000..6927df0b3ce5 --- /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 diff --git a/www/firefox/files/patch-z-bug517422 b/www/firefox/files/patch-z-bug517422 index debf8d5a7afd..3e37f43324e7 100644 --- a/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();