From 6f15e1de8aefd57d6108d4a0d883bf63d275b149 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 | 6 +- www/firefox-i18n/Makefile.lang | 5 +- www/firefox-i18n/Makefile.option | 2 + www/firefox-i18n/distinfo | 384 +++++++++++---------- www/firefox/Makefile | 8 +- www/firefox/distinfo | 6 +- www/firefox/files/patch-bug1186967 | 41 --- www/firefox/files/patch-bug1366201 | 40 --- www/firefox/files/patch-bug1412558 | 83 ----- www/firefox/files/patch-bug1414440 | 108 ------ www/firefox/files/patch-bug826985 | 40 +-- www/firefox/files/patch-bug847568 | 100 +++--- .../files/patch-dom_media_flac_FlacDecoder.cpp | 25 ++ www/firefox/files/patch-toolkit_moz.configure | 15 + www/firefox/files/patch-z-bug517422 | 119 +++---- 17 files changed, 376 insertions(+), 616 deletions(-) delete mode 100644 www/firefox/files/patch-bug1186967 delete mode 100644 www/firefox/files/patch-bug1366201 delete mode 100644 www/firefox/files/patch-bug1412558 delete mode 100644 www/firefox/files/patch-bug1414440 create mode 100644 www/firefox/files/patch-dom_media_flac_FlacDecoder.cpp create mode 100644 www/firefox/files/patch-toolkit_moz.configure 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 af4f25d4ebde..1a390886bb6d 100644 --- a/Mk/bsd.gecko.mk +++ b/Mk/bsd.gecko.mk @@ -109,14 +109,15 @@ USE_XORG+= xcb MESA_LLVM_VER?= 40 BUILD_DEPENDS+= llvm${MESA_LLVM_VER}>0:devel/llvm${MESA_LLVM_VER} MOZ_EXPORT+= LLVM_CONFIG=llvm-config${MESA_LLVM_VER} +.if ${MOZILLA_VER:R:R} < 58 MOZ_EXPORT+= BINDGEN_CFLAGS="${BINDGEN_CFLAGS}" -# XXX bug 1341234 . if ! ${USE_MOZILLA:M-nspr} BINDGEN_CFLAGS+=-isystem${LOCALBASE}/include/nspr . endif . if ! ${USE_MOZILLA:M-pixman} BINDGEN_CFLAGS+=-isystem${LOCALBASE}/include/pixman-1 . endif +.endif # MOZILLA_VER < 58 .endif .if ${OPSYS} == FreeBSD && ${OSREL} == 11.1 @@ -144,6 +145,7 @@ PKGDEINSTALL_INC?= ${.CURDIR}/../../www/firefox/files/pkg-deinstall.in MOZ_PKGCONFIG_FILES?= ${MOZILLA}-gtkmozembed ${MOZILLA}-js \ ${MOZILLA}-xpcom ${MOZILLA}-plugin +MAKE_ENV+= MACH=1 # XXX bug 1412398 ALL_TARGET?= build MOZ_EXPORT+= ${CONFIGURE_ENV} \ @@ -389,7 +391,7 @@ post-patch-SNDIO-on: .endif .if ${PORT_OPTIONS:MRUST} || ${MOZILLA_VER:R:R} >= 54 -BUILD_DEPENDS+= ${RUST_PORT:T}>=1.19.0_2:${RUST_PORT} +BUILD_DEPENDS+= ${RUST_PORT:T}>=1.21.0:${RUST_PORT} RUST_PORT?= lang/rust . if ${MOZILLA_VER:R:R} < 54 MOZ_OPTIONS+= --enable-rust diff --git a/www/firefox-i18n/Makefile b/www/firefox-i18n/Makefile index 8ed8186d1e17..888c361ebd25 100644 --- a/www/firefox-i18n/Makefile +++ b/www/firefox-i18n/Makefile @@ -2,10 +2,10 @@ # $FreeBSD$ PORTNAME= firefox-i18n -PORTVERSION= 57.0.1 +PORTVERSION= 58.0b9 CATEGORIES= www MASTER_SITES= MOZILLA/${PORTNAME:S|-i18n||}/releases/${DISTVERSION}/linux-i686/xpi \ - MOZILLA/${PORTNAME:S|-i18n||}/candidates/${DISTVERSION}-candidates/build2/linux-i686/xpi + MOZILLA/${PORTNAME:S|-i18n||}/candidates/${DISTVERSION}-candidates/build1/linux-i686/xpi PKGNAMEPREFIX= DISTFILES= ${FIREFOX_I18N_:S/$/.xpi/} DIST_SUBDIR= xpi/${DISTNAME} @@ -15,7 +15,7 @@ COMMENT= Localized interface for Firefox EXTRACT_DEPENDS= zip:archivers/zip -USES= zip:infozip gecko:firefox,57,build +USES= zip:infozip gecko:firefox,58,build USE_XPI= firefox NO_ARCH= yes 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 05064f8c509f..b00d10b1e4ac 100644 --- a/www/firefox-i18n/distinfo +++ b/www/firefox-i18n/distinfo @@ -1,191 +1,193 @@ -TIMESTAMP = 1511948395 -SHA256 (xpi/firefox-i18n-57.0.1/ach.xpi) = 78948c27947fe93cb48eb94d1b30f427d627fc3d13d7a91f86996621a4a7d1fe -SIZE (xpi/firefox-i18n-57.0.1/ach.xpi) = 441113 -SHA256 (xpi/firefox-i18n-57.0.1/af.xpi) = e48e07a9b33684043f483d6f51bfb76b11b2e79630ffb67f1617bdee1a434ef8 -SIZE (xpi/firefox-i18n-57.0.1/af.xpi) = 442206 -SHA256 (xpi/firefox-i18n-57.0.1/an.xpi) = 01271207570e5c51dfe1b50832b1e7ff9f684bb2fdb4fc570152d76402ce1c3f -SIZE (xpi/firefox-i18n-57.0.1/an.xpi) = 462778 -SHA256 (xpi/firefox-i18n-57.0.1/ar.xpi) = a4123925944a55eddcc3774fd7e7660d21a81f794843b68e7ffc1232715f2b4c -SIZE (xpi/firefox-i18n-57.0.1/ar.xpi) = 488160 -SHA256 (xpi/firefox-i18n-57.0.1/as.xpi) = 4b97e7adb1a41d28992d6e621017a5154140af29309b6ef62488b438fd5a77dc -SIZE (xpi/firefox-i18n-57.0.1/as.xpi) = 491075 -SHA256 (xpi/firefox-i18n-57.0.1/ast.xpi) = 45eaa202ef79acdb0a919acce2fa86fbfa6690b28e2737179a07758ce217809c -SIZE (xpi/firefox-i18n-57.0.1/ast.xpi) = 455504 -SHA256 (xpi/firefox-i18n-57.0.1/az.xpi) = 898bc4db62d73f4cb5c5b00a4c1847910a1d1571a21b00602246f9318b05d40e -SIZE (xpi/firefox-i18n-57.0.1/az.xpi) = 466044 -SHA256 (xpi/firefox-i18n-57.0.1/be.xpi) = 46d4c88838aba5f0897d10a3ab43816e10df0b9cce2a0bf4783fd2b1272f1713 -SIZE (xpi/firefox-i18n-57.0.1/be.xpi) = 516093 -SHA256 (xpi/firefox-i18n-57.0.1/bg.xpi) = ffff697356b4a05fe3a82c548ebdc6b998dfd043554ba8e6c45c38a06cf73b36 -SIZE (xpi/firefox-i18n-57.0.1/bg.xpi) = 510352 -SHA256 (xpi/firefox-i18n-57.0.1/bn-BD.xpi) = 33e6b892df9e951500d5865d566038c9ec9d5e799dd09e6fc630f984d76c95d4 -SIZE (xpi/firefox-i18n-57.0.1/bn-BD.xpi) = 527190 -SHA256 (xpi/firefox-i18n-57.0.1/bn-IN.xpi) = bcda16f9a83d0aa649c004dabfe7124b6de9bd207c335ddf27acc0dd7ec51a53 -SIZE (xpi/firefox-i18n-57.0.1/bn-IN.xpi) = 516180 -SHA256 (xpi/firefox-i18n-57.0.1/br.xpi) = c3f12b861cd89944b8aa2c6ad3eeab72a83f47a6c4cb92aed827894de1389d0d -SIZE (xpi/firefox-i18n-57.0.1/br.xpi) = 451867 -SHA256 (xpi/firefox-i18n-57.0.1/bs.xpi) = 1cc3a5a2b6255a760ccb6e2cbc7aa9f2ba8bcdd4796cfa359e4b01b207acb5da -SIZE (xpi/firefox-i18n-57.0.1/bs.xpi) = 459650 -SHA256 (xpi/firefox-i18n-57.0.1/ca.xpi) = bb9c97f6b9e78bb7e6a4b4073e2587a01406ec1fadc25d2d6e91d180b2ba8948 -SIZE (xpi/firefox-i18n-57.0.1/ca.xpi) = 466641 -SHA256 (xpi/firefox-i18n-57.0.1/cak.xpi) = ddcecb4c1cab3ee5e66bcfa1e45719aa4cd313c1fa4d66ead5f58a655e80a585 -SIZE (xpi/firefox-i18n-57.0.1/cak.xpi) = 475935 -SHA256 (xpi/firefox-i18n-57.0.1/cs.xpi) = d0540e96f4951287fca978f74de2469cd0ecc96616f06c61da954f2b6fda16f8 -SIZE (xpi/firefox-i18n-57.0.1/cs.xpi) = 469457 -SHA256 (xpi/firefox-i18n-57.0.1/cy.xpi) = 838718435a744d91c46b8d2f4dd9cf1426283f3d863d7693c5a172558a04ec58 -SIZE (xpi/firefox-i18n-57.0.1/cy.xpi) = 455788 -SHA256 (xpi/firefox-i18n-57.0.1/da.xpi) = 8911ed6c822982b25e76c0dd3bc841c968ed8468317744286820f48400bfe9f4 -SIZE (xpi/firefox-i18n-57.0.1/da.xpi) = 448416 -SHA256 (xpi/firefox-i18n-57.0.1/de.xpi) = bfc7ec5c7e3c079f9493051159e9cf534e2955e34158dfc9d53a8487af87814e -SIZE (xpi/firefox-i18n-57.0.1/de.xpi) = 460814 -SHA256 (xpi/firefox-i18n-57.0.1/dsb.xpi) = ec90815ff190293aa2ccb0046d340f4ef809d395d0c0b8d308dc5ee192b768cf -SIZE (xpi/firefox-i18n-57.0.1/dsb.xpi) = 479511 -SHA256 (xpi/firefox-i18n-57.0.1/el.xpi) = 160bbeb91a4957c3dc4fbffeb3a7088869cc57c6d0054b1d6d92dedba2a0c26d -SIZE (xpi/firefox-i18n-57.0.1/el.xpi) = 534484 -SHA256 (xpi/firefox-i18n-57.0.1/en-GB.xpi) = d08475dbdc518c8c51b2ec813cc30b55c34ae2e87e7c6b8544cc50f1cfbcc89f -SIZE (xpi/firefox-i18n-57.0.1/en-GB.xpi) = 435623 -SHA256 (xpi/firefox-i18n-57.0.1/en-US.xpi) = ee2b92634aa6fb274c2c958d3d032bdf4ca9a7cece9737cf891c6642feb46c61 -SIZE (xpi/firefox-i18n-57.0.1/en-US.xpi) = 441880 -SHA256 (xpi/firefox-i18n-57.0.1/en-ZA.xpi) = c0053e9db22d38f884a6516b318f21f94faba16ce0934496172deb96c1880df3 -SIZE (xpi/firefox-i18n-57.0.1/en-ZA.xpi) = 432020 -SHA256 (xpi/firefox-i18n-57.0.1/eo.xpi) = 1f4745a901b60558cf8725de83b1c097cf7126dc9e47f5eeee8909b851d21e09 -SIZE (xpi/firefox-i18n-57.0.1/eo.xpi) = 454910 -SHA256 (xpi/firefox-i18n-57.0.1/es-AR.xpi) = 9c94b972ab897e717ed8407b8cd6b909bc53e6b268feac22198eabea4652507e -SIZE (xpi/firefox-i18n-57.0.1/es-AR.xpi) = 462980 -SHA256 (xpi/firefox-i18n-57.0.1/es-CL.xpi) = 14b4fe918ced20b50069caf36594d299fa5eca18984fa0c1ba99b37e765298e6 -SIZE (xpi/firefox-i18n-57.0.1/es-CL.xpi) = 465514 -SHA256 (xpi/firefox-i18n-57.0.1/es-ES.xpi) = 1216014c2cf5b73a8c154dedf2a73de06a11daf3605b5a0c03908c38a2db2bce -SIZE (xpi/firefox-i18n-57.0.1/es-ES.xpi) = 353625 -SHA256 (xpi/firefox-i18n-57.0.1/es-MX.xpi) = 99ce79e3c173047f6b812eaa48258429755d73f7757d7fe305500bfdcc0f06ca -SIZE (xpi/firefox-i18n-57.0.1/es-MX.xpi) = 468761 -SHA256 (xpi/firefox-i18n-57.0.1/et.xpi) = 1d386407df72b49dec683b49b8ce977ea17c42786d743466b7ca94964f0aa639 -SIZE (xpi/firefox-i18n-57.0.1/et.xpi) = 447279 -SHA256 (xpi/firefox-i18n-57.0.1/eu.xpi) = 1226577d230883af6df44c105b4e42dc3083383dfc73e2218737d0d824510e3b -SIZE (xpi/firefox-i18n-57.0.1/eu.xpi) = 454673 -SHA256 (xpi/firefox-i18n-57.0.1/fa.xpi) = d67f6af4fd67c2d88d0cf653240914cf27499b82e65323912ecf8ac96ec87cb2 -SIZE (xpi/firefox-i18n-57.0.1/fa.xpi) = 510829 -SHA256 (xpi/firefox-i18n-57.0.1/ff.xpi) = 0ef139ade510b2c91bedf6a995dc082e7897cc159dfcd2bb314bf7fff47870f4 -SIZE (xpi/firefox-i18n-57.0.1/ff.xpi) = 454015 -SHA256 (xpi/firefox-i18n-57.0.1/fi.xpi) = 796a8c6738cf645ee29a352b7e4ce4f533a4cf0c1a1a1737223af034a3ecbbd5 -SIZE (xpi/firefox-i18n-57.0.1/fi.xpi) = 446244 -SHA256 (xpi/firefox-i18n-57.0.1/fr.xpi) = b260bd8f9b5bc6b649ed864692ae20f45f67eafad39bb6cf7aa67d705525d8c3 -SIZE (xpi/firefox-i18n-57.0.1/fr.xpi) = 472722 -SHA256 (xpi/firefox-i18n-57.0.1/fy-NL.xpi) = 6b0ec71758076feb912db02ed4f92822dc75a9d842b6875cf83a96f9ae4bd400 -SIZE (xpi/firefox-i18n-57.0.1/fy-NL.xpi) = 465912 -SHA256 (xpi/firefox-i18n-57.0.1/ga-IE.xpi) = 1b5b214424603970e85d23f0981b4bba9e57f1ad2280afb2f69102dea55c7f3d -SIZE (xpi/firefox-i18n-57.0.1/ga-IE.xpi) = 475963 -SHA256 (xpi/firefox-i18n-57.0.1/gd.xpi) = 1bac7834c608ef0c73fc45aa19f4ef3f1aacd8b7a5ec25e1921ea1ff4769ef2f -SIZE (xpi/firefox-i18n-57.0.1/gd.xpi) = 465123 -SHA256 (xpi/firefox-i18n-57.0.1/gl.xpi) = bcb5857682b6f9b3d17bc3a5ed465baad92aeb0b9be8d4675ac45562296deacb -SIZE (xpi/firefox-i18n-57.0.1/gl.xpi) = 452032 -SHA256 (xpi/firefox-i18n-57.0.1/gn.xpi) = 081d249389c0b10b3969512d5252b59f4e31f8fdfbc37f8241e54a8896980d65 -SIZE (xpi/firefox-i18n-57.0.1/gn.xpi) = 471956 -SHA256 (xpi/firefox-i18n-57.0.1/gu-IN.xpi) = a9561995f3720916410345b6f93f785ac7eb615342f8116e871ffb36efd8cb15 -SIZE (xpi/firefox-i18n-57.0.1/gu-IN.xpi) = 511990 -SHA256 (xpi/firefox-i18n-57.0.1/he.xpi) = 4764c9cfa321a0caa588a1f10df9b8f03077434406bacd9848ded1009934b67d -SIZE (xpi/firefox-i18n-57.0.1/he.xpi) = 471921 -SHA256 (xpi/firefox-i18n-57.0.1/hi-IN.xpi) = 14802fa37108f5078942a27a62ccc23d5e095d32a621a8417be7f42d23e05c0c -SIZE (xpi/firefox-i18n-57.0.1/hi-IN.xpi) = 526111 -SHA256 (xpi/firefox-i18n-57.0.1/hr.xpi) = cf951f2b52de8d6d7b4adaeafc12cb059aafea495d5fdfa9277394a5feb7b4c2 -SIZE (xpi/firefox-i18n-57.0.1/hr.xpi) = 460722 -SHA256 (xpi/firefox-i18n-57.0.1/hsb.xpi) = 4121ceca446b25a8aa6623f5cfbd48d153ce718da964a3a21c14398ad2ce2a34 -SIZE (xpi/firefox-i18n-57.0.1/hsb.xpi) = 476505 -SHA256 (xpi/firefox-i18n-57.0.1/hu.xpi) = 012e4942f9b5741bf3d535351aaadff759312287f8533c81cc6af2f708f79fb2 -SIZE (xpi/firefox-i18n-57.0.1/hu.xpi) = 476604 -SHA256 (xpi/firefox-i18n-57.0.1/hy-AM.xpi) = 963a7a2d3dda438cb71a5f827472087e23721acc71e2f8e95f36bd202d583db8 -SIZE (xpi/firefox-i18n-57.0.1/hy-AM.xpi) = 510825 -SHA256 (xpi/firefox-i18n-57.0.1/id.xpi) = 3fa6ccd516bbca34cab9de86fcc3ce1192af4f15e7be64067f42863ac90907bb -SIZE (xpi/firefox-i18n-57.0.1/id.xpi) = 444041 -SHA256 (xpi/firefox-i18n-57.0.1/is.xpi) = 0d991283d0ca9bab528bd2bc7fc29553337694f7a7b061ce2e2abf0e1dc70472 -SIZE (xpi/firefox-i18n-57.0.1/is.xpi) = 452660 -SHA256 (xpi/firefox-i18n-57.0.1/it.xpi) = eb40fdda2b666738c0cdb88d68394eb78057ca4ec8a753f4645f063ec170b49f -SIZE (xpi/firefox-i18n-57.0.1/it.xpi) = 347172 -SHA256 (xpi/firefox-i18n-57.0.1/ja.xpi) = 6c309f44f5a59dc7f4c5d6b66cd6ced359df259d62b9b7c9eb496d7320efbeaf -SIZE (xpi/firefox-i18n-57.0.1/ja.xpi) = 508553 -SHA256 (xpi/firefox-i18n-57.0.1/ka.xpi) = 5a6bb9d274c1703351e78d638bba1e688945955ee912ca445fcfa1142bda8225 -SIZE (xpi/firefox-i18n-57.0.1/ka.xpi) = 492355 -SHA256 (xpi/firefox-i18n-57.0.1/kab.xpi) = 21b15b90b9160bb074466506fa58eefe9d79543257ee07b0f61c1655a08aae51 -SIZE (xpi/firefox-i18n-57.0.1/kab.xpi) = 462531 -SHA256 (xpi/firefox-i18n-57.0.1/kk.xpi) = 2e020046a88bbf021e32b4bba832a01981355289243c67dd29a86f71d0f9cfa4 -SIZE (xpi/firefox-i18n-57.0.1/kk.xpi) = 519249 -SHA256 (xpi/firefox-i18n-57.0.1/km.xpi) = 58a7a70f074eb0bdb44ca2b0620a3b04c2d175fae739faf4c6499138bb3c0bc3 -SIZE (xpi/firefox-i18n-57.0.1/km.xpi) = 530080 -SHA256 (xpi/firefox-i18n-57.0.1/kn.xpi) = ef2ab74389af1c7b44a89c5b8a279c4adc1b87cc8e38b75a14fc521fab6e355d -SIZE (xpi/firefox-i18n-57.0.1/kn.xpi) = 531316 -SHA256 (xpi/firefox-i18n-57.0.1/ko.xpi) = f45a76a0a63c4de6e1296c224fed08265260cc463789f018214d30ffcf75e421 -SIZE (xpi/firefox-i18n-57.0.1/ko.xpi) = 487306 -SHA256 (xpi/firefox-i18n-57.0.1/lij.xpi) = ee1690dd270c2262774be3c1d61b862023be31d7a49656453daf8d263ac04a04 -SIZE (xpi/firefox-i18n-57.0.1/lij.xpi) = 452343 -SHA256 (xpi/firefox-i18n-57.0.1/lt.xpi) = d106d9f3846231047a9cd7bb98ea625fa972ae16cff3ed3d500e43269f9eb997 -SIZE (xpi/firefox-i18n-57.0.1/lt.xpi) = 474957 -SHA256 (xpi/firefox-i18n-57.0.1/lv.xpi) = e306194a9a06d4349c4b1cd867f67084dd539836bf09192452fdfba0b321f13f -SIZE (xpi/firefox-i18n-57.0.1/lv.xpi) = 465243 -SHA256 (xpi/firefox-i18n-57.0.1/mai.xpi) = 62fb02ef125f6650e4e7ffe9530fd2b371c64a7481a16d814a93fe9e8d237f5a -SIZE (xpi/firefox-i18n-57.0.1/mai.xpi) = 507396 -SHA256 (xpi/firefox-i18n-57.0.1/mk.xpi) = bab7870de288f9f9a707bd847b9b079aaf009583255de88b499c01fd80432346 -SIZE (xpi/firefox-i18n-57.0.1/mk.xpi) = 490853 -SHA256 (xpi/firefox-i18n-57.0.1/ml.xpi) = 190e083f6820d51afde3a2bd884459df979aad50fe6baf8c1032f8dbf6d94fe6 -SIZE (xpi/firefox-i18n-57.0.1/ml.xpi) = 528256 -SHA256 (xpi/firefox-i18n-57.0.1/mr.xpi) = 22e3b282ab257d5bf0eac1c3bd818d321edb3c305019edfbfbc6563b675d8f57 -SIZE (xpi/firefox-i18n-57.0.1/mr.xpi) = 521291 -SHA256 (xpi/firefox-i18n-57.0.1/ms.xpi) = acd54c4d3e77edb7adb99096e69d856035b71b917dec8fe7ca6e65d501c8c037 -SIZE (xpi/firefox-i18n-57.0.1/ms.xpi) = 451255 -SHA256 (xpi/firefox-i18n-57.0.1/my.xpi) = 82c843f79f3548c5094d2b752d55820c1c136349b0351218a02634a7052bcfd7 -SIZE (xpi/firefox-i18n-57.0.1/my.xpi) = 517703 -SHA256 (xpi/firefox-i18n-57.0.1/nb-NO.xpi) = c6344efc8244b49475cc33d4a77e2445814b9a7a1fcc9e8c2ca174e04842bc5b -SIZE (xpi/firefox-i18n-57.0.1/nb-NO.xpi) = 451557 -SHA256 (xpi/firefox-i18n-57.0.1/nl.xpi) = eb3c7a2fa9ea95efc40edfab621d94a3391821858fa748ac00ef4fcfba4d5551 -SIZE (xpi/firefox-i18n-57.0.1/nl.xpi) = 458319 -SHA256 (xpi/firefox-i18n-57.0.1/nn-NO.xpi) = 1d0814d33a3c02e00567a23a01940374b70b015c79a9c262de253eea1615be64 -SIZE (xpi/firefox-i18n-57.0.1/nn-NO.xpi) = 452005 -SHA256 (xpi/firefox-i18n-57.0.1/or.xpi) = e2374aec77b345a451dd33e1af2642c6b674fb9bdef098433065239f76916a2e -SIZE (xpi/firefox-i18n-57.0.1/or.xpi) = 500868 -SHA256 (xpi/firefox-i18n-57.0.1/pa-IN.xpi) = 0fbab13f10fb4350b54380d85816a272f39e9f9b9f56a73ec7edbaaca3df856b -SIZE (xpi/firefox-i18n-57.0.1/pa-IN.xpi) = 495271 -SHA256 (xpi/firefox-i18n-57.0.1/pl.xpi) = 4fcfcff4076c16d50abe309c3e20e0abc9f62d72c73144924a02ff3f02683529 -SIZE (xpi/firefox-i18n-57.0.1/pl.xpi) = 364230 -SHA256 (xpi/firefox-i18n-57.0.1/pt-BR.xpi) = 14f645a3a03885e198eb11b8d83a6c380c0caf52df53ca35cc41d21335199527 -SIZE (xpi/firefox-i18n-57.0.1/pt-BR.xpi) = 457155 -SHA256 (xpi/firefox-i18n-57.0.1/pt-PT.xpi) = 6ac79a01e8e28f1ea6187fbfc6c9225028367f925c59ab10fbf12a3e1c6891ff -SIZE (xpi/firefox-i18n-57.0.1/pt-PT.xpi) = 460000 -SHA256 (xpi/firefox-i18n-57.0.1/rm.xpi) = 9d9cc06811588959924aec20037e2c1a6709151bf58b9834d2fab99d419967f3 -SIZE (xpi/firefox-i18n-57.0.1/rm.xpi) = 451059 -SHA256 (xpi/firefox-i18n-57.0.1/ro.xpi) = 7625b3ed56235f8c03a60ce035eb6f4f914cdc3df327acbcc6002ccd6a00f35a -SIZE (xpi/firefox-i18n-57.0.1/ro.xpi) = 455511 -SHA256 (xpi/firefox-i18n-57.0.1/ru.xpi) = b65cb56cba23a17edaedd6b25346db7386190876d63696d4b1c8a65267b89a90 -SIZE (xpi/firefox-i18n-57.0.1/ru.xpi) = 526955 -SHA256 (xpi/firefox-i18n-57.0.1/si.xpi) = 9e83e15aae7415b0cfc43cd6293c55cd50bfc59060c741185e0f3cc49dde8780 -SIZE (xpi/firefox-i18n-57.0.1/si.xpi) = 498324 -SHA256 (xpi/firefox-i18n-57.0.1/sk.xpi) = 3d2242e6b9aca0e99f200ba191bc22d69cf8e626a509d387af8be91cca4ecaf3 -SIZE (xpi/firefox-i18n-57.0.1/sk.xpi) = 480397 -SHA256 (xpi/firefox-i18n-57.0.1/sl.xpi) = 579fad6e5eaca771764aaef06ae64f1030b2860aed66b585daa1b277bd9c141f -SIZE (xpi/firefox-i18n-57.0.1/sl.xpi) = 459377 -SHA256 (xpi/firefox-i18n-57.0.1/son.xpi) = ea16790b01a62dce2f0a895d691355b12710f542bf418d427f1c7fe6edbe94ed -SIZE (xpi/firefox-i18n-57.0.1/son.xpi) = 450931 -SHA256 (xpi/firefox-i18n-57.0.1/sq.xpi) = 683b101385ced4fdfe379595e1d1ed643100e55345b752c47e4eb3cc06411de2 -SIZE (xpi/firefox-i18n-57.0.1/sq.xpi) = 465051 -SHA256 (xpi/firefox-i18n-57.0.1/sr.xpi) = 4b1ca481b31c0ee257565591319a54291819e3ccddea44dfb6ae9808ed124cab -SIZE (xpi/firefox-i18n-57.0.1/sr.xpi) = 487003 -SHA256 (xpi/firefox-i18n-57.0.1/sv-SE.xpi) = 28d0effa9b32bc88668817be487ca2db19a7da08c9b51c3f16de5453303556c3 -SIZE (xpi/firefox-i18n-57.0.1/sv-SE.xpi) = 459666 -SHA256 (xpi/firefox-i18n-57.0.1/ta.xpi) = d5ca9a8998f2f6d0391fbda15400c00344afb85bfe1c51b50d094459930f12c4 -SIZE (xpi/firefox-i18n-57.0.1/ta.xpi) = 513228 -SHA256 (xpi/firefox-i18n-57.0.1/te.xpi) = 9095933c162ce67fa0d673f4134a7c7d1e392dd13ad7981d500f132e393422de -SIZE (xpi/firefox-i18n-57.0.1/te.xpi) = 530693 -SHA256 (xpi/firefox-i18n-57.0.1/th.xpi) = 4dc9a16c2578169b04024a5a1d0b95af4e1bf1003a1db4f7aec43f98a9acc505 -SIZE (xpi/firefox-i18n-57.0.1/th.xpi) = 502451 -SHA256 (xpi/firefox-i18n-57.0.1/tr.xpi) = 776f86327bd53e17a53195555a12955e084bede4e9ee789d620f8aa6825a8949 -SIZE (xpi/firefox-i18n-57.0.1/tr.xpi) = 465580 -SHA256 (xpi/firefox-i18n-57.0.1/uk.xpi) = 3695a4d0adbb99a72d79a022694114bcad4dc3ce93197c444eb5a74228bb4c09 -SIZE (xpi/firefox-i18n-57.0.1/uk.xpi) = 518138 -SHA256 (xpi/firefox-i18n-57.0.1/ur.xpi) = 464b97bcd7ba219996889a19e06335e415c044c1c980f9b21331d1ec7237704d -SIZE (xpi/firefox-i18n-57.0.1/ur.xpi) = 511138 -SHA256 (xpi/firefox-i18n-57.0.1/uz.xpi) = 3b2ac889436d3f35a391f7c23520d229e075c28c7565609ba7d73b2cb561be66 -SIZE (xpi/firefox-i18n-57.0.1/uz.xpi) = 461694 -SHA256 (xpi/firefox-i18n-57.0.1/vi.xpi) = 34585abc0127def468a8f5764a0d70cd3754a04da2a831c4b9f64a21741ba91e -SIZE (xpi/firefox-i18n-57.0.1/vi.xpi) = 471320 -SHA256 (xpi/firefox-i18n-57.0.1/xh.xpi) = dacd8fbc3f1b64ef580228bce63db3d91c3bbdea36a3280c11f6807d52cb7c71 -SIZE (xpi/firefox-i18n-57.0.1/xh.xpi) = 464461 -SHA256 (xpi/firefox-i18n-57.0.1/zh-CN.xpi) = 3523d4d0811dd1f38f59510329f821465fa333d8f57ea8df7b52c684d151005b -SIZE (xpi/firefox-i18n-57.0.1/zh-CN.xpi) = 483625 -SHA256 (xpi/firefox-i18n-57.0.1/zh-TW.xpi) = a7aadef5da007de343187dbba4ca8cd047b7c2b4f532849d13280eb34c83854e -SIZE (xpi/firefox-i18n-57.0.1/zh-TW.xpi) = 482462 +TIMESTAMP = 1512408140 +SHA256 (xpi/firefox-i18n-58.0b9/ach.xpi) = 604e9995c607dd75b8545cc39b673cfd5c3cb19b534f7169149e621c2a2fe59c +SIZE (xpi/firefox-i18n-58.0b9/ach.xpi) = 441429 +SHA256 (xpi/firefox-i18n-58.0b9/af.xpi) = 208ba0d2424d8632f545b3cbcb90267d1534bf236322d4885927c35b5a2dbf24 +SIZE (xpi/firefox-i18n-58.0b9/af.xpi) = 442098 +SHA256 (xpi/firefox-i18n-58.0b9/an.xpi) = 3b8418728d70e2d3682d49b464ff19e4304c57f67e471189e2f79dee84c655f7 +SIZE (xpi/firefox-i18n-58.0b9/an.xpi) = 463227 +SHA256 (xpi/firefox-i18n-58.0b9/ar.xpi) = 23e8511c8437f469e867473a4a198cfa32862df114885abc3acce068746cea96 +SIZE (xpi/firefox-i18n-58.0b9/ar.xpi) = 488254 +SHA256 (xpi/firefox-i18n-58.0b9/as.xpi) = 5f9b32371d30861a6f2c306114dc95bb3106ab15ac77a6c437ec57e7b738de72 +SIZE (xpi/firefox-i18n-58.0b9/as.xpi) = 490348 +SHA256 (xpi/firefox-i18n-58.0b9/ast.xpi) = 54beb2880ffe74e8b93955aa7a0c35dfa23957645544b58c052fbb1ca49f676c +SIZE (xpi/firefox-i18n-58.0b9/ast.xpi) = 458447 +SHA256 (xpi/firefox-i18n-58.0b9/az.xpi) = 6f3dcb7d7271c16fd5e7795c0a6cc7690b911b0d74f03b43fe10aa3d6f965cc7 +SIZE (xpi/firefox-i18n-58.0b9/az.xpi) = 466130 +SHA256 (xpi/firefox-i18n-58.0b9/be.xpi) = ef4d921fa5e941add4c8dc43e9044b1531bd9de2533df36cfe932f8b4ec0b1ed +SIZE (xpi/firefox-i18n-58.0b9/be.xpi) = 515402 +SHA256 (xpi/firefox-i18n-58.0b9/bg.xpi) = 2de2c1b6d988264294e3078d3ddb5f49f05b69c794d19723b77a8e13fdcb620a +SIZE (xpi/firefox-i18n-58.0b9/bg.xpi) = 509520 +SHA256 (xpi/firefox-i18n-58.0b9/bn-BD.xpi) = 26bbef6a3e054af98ff38d0126bd5143bb67b139af9f89513ba919b2012bf1c3 +SIZE (xpi/firefox-i18n-58.0b9/bn-BD.xpi) = 525626 +SHA256 (xpi/firefox-i18n-58.0b9/bn-IN.xpi) = cc8a16d06b0790e23f3227f06630747e7a3b31a34cc67f87168668701cecf00c +SIZE (xpi/firefox-i18n-58.0b9/bn-IN.xpi) = 516033 +SHA256 (xpi/firefox-i18n-58.0b9/br.xpi) = abe948966978c76af8a9d12b0f3484de686fa412ab085a90fbf8e19ea40cbdad +SIZE (xpi/firefox-i18n-58.0b9/br.xpi) = 452232 +SHA256 (xpi/firefox-i18n-58.0b9/bs.xpi) = 95c83368e94a6378c085437678b83fff60faa8951a9cb09492b32957eb763a56 +SIZE (xpi/firefox-i18n-58.0b9/bs.xpi) = 459205 +SHA256 (xpi/firefox-i18n-58.0b9/ca.xpi) = ed63fcb7bc8ffae1003a423071bc48908103037b02627dadb5a223f035558897 +SIZE (xpi/firefox-i18n-58.0b9/ca.xpi) = 467338 +SHA256 (xpi/firefox-i18n-58.0b9/cak.xpi) = 94b23c8491e497daa01d05eac35136a7034e10d69f863a10c659cf5d088a2f15 +SIZE (xpi/firefox-i18n-58.0b9/cak.xpi) = 475410 +SHA256 (xpi/firefox-i18n-58.0b9/cs.xpi) = 41d8e1923fdc5086ce04f6f7c0ab7d47abddee5e295c047e47301a4bb4635e04 +SIZE (xpi/firefox-i18n-58.0b9/cs.xpi) = 471794 +SHA256 (xpi/firefox-i18n-58.0b9/cy.xpi) = 7019caaaf956011699eb590d350080f105671a6c1c85859189c417e0308f2dab +SIZE (xpi/firefox-i18n-58.0b9/cy.xpi) = 455284 +SHA256 (xpi/firefox-i18n-58.0b9/da.xpi) = c7d466dd7f1dabc5aa1fc469e29d590b954cf5562692359b9c1c35557834369d +SIZE (xpi/firefox-i18n-58.0b9/da.xpi) = 448053 +SHA256 (xpi/firefox-i18n-58.0b9/de.xpi) = fc72b3cc6d07df4956e7eb241e59ec990135c40fcd784bf5c720d229f44b2e53 +SIZE (xpi/firefox-i18n-58.0b9/de.xpi) = 462216 +SHA256 (xpi/firefox-i18n-58.0b9/dsb.xpi) = d9fa5360cf7da534efa682c6feaccc9929ba3a38668587c67cd7ccb1fc22bee9 +SIZE (xpi/firefox-i18n-58.0b9/dsb.xpi) = 478923 +SHA256 (xpi/firefox-i18n-58.0b9/el.xpi) = 6cf583ba018519bda946eadedf10f1ffcab95479f0e75cdccb008af42a7b4443 +SIZE (xpi/firefox-i18n-58.0b9/el.xpi) = 534671 +SHA256 (xpi/firefox-i18n-58.0b9/en-GB.xpi) = bc395f6d258b83253d26f4603381cd2927998d3e66d1eabc90d42959469cb843 +SIZE (xpi/firefox-i18n-58.0b9/en-GB.xpi) = 436607 +SHA256 (xpi/firefox-i18n-58.0b9/en-US.xpi) = 2378523b61745473091c3430b379e2fad7ba4e65d15696ef173bb1a1aa2ecdf5 +SIZE (xpi/firefox-i18n-58.0b9/en-US.xpi) = 440011 +SHA256 (xpi/firefox-i18n-58.0b9/en-ZA.xpi) = 461a9d8e1718af8a0f3cc8692cd109859c338a4bf22fbacb639cc474365ebc68 +SIZE (xpi/firefox-i18n-58.0b9/en-ZA.xpi) = 432336 +SHA256 (xpi/firefox-i18n-58.0b9/eo.xpi) = e44767071f7a1203b4709b4fc708f7a5da44e6aa646541b1fa8ec5f333914803 +SIZE (xpi/firefox-i18n-58.0b9/eo.xpi) = 453844 +SHA256 (xpi/firefox-i18n-58.0b9/es-AR.xpi) = eafadd19c3d6e976ae2640d8d085ba5d871ec09007cd1c4615284c1260ebe357 +SIZE (xpi/firefox-i18n-58.0b9/es-AR.xpi) = 462868 +SHA256 (xpi/firefox-i18n-58.0b9/es-CL.xpi) = d193b7e071ede3db4139679e5e2c4c6b58ef780a7e67466108d783ba8e14500b +SIZE (xpi/firefox-i18n-58.0b9/es-CL.xpi) = 466381 +SHA256 (xpi/firefox-i18n-58.0b9/es-ES.xpi) = 7539c54749bc04fcf82e49d6e51acebb1bd0c48d77a2f0bc3ff61ca51f0ebab9 +SIZE (xpi/firefox-i18n-58.0b9/es-ES.xpi) = 353186 +SHA256 (xpi/firefox-i18n-58.0b9/es-MX.xpi) = 8dffb2445deb4b3dec1382eb33eda8854e07a9997d912afb1b3dacd7d670d09b +SIZE (xpi/firefox-i18n-58.0b9/es-MX.xpi) = 468189 +SHA256 (xpi/firefox-i18n-58.0b9/et.xpi) = 4b0f8905768f901d5aa9a7f96a36f607b4118b3554794f0c7b197b6c14fd162e +SIZE (xpi/firefox-i18n-58.0b9/et.xpi) = 447973 +SHA256 (xpi/firefox-i18n-58.0b9/eu.xpi) = fd7d67687aad4dbfb538466485e65977c412f38671285d7b215e8539671315e1 +SIZE (xpi/firefox-i18n-58.0b9/eu.xpi) = 455299 +SHA256 (xpi/firefox-i18n-58.0b9/fa.xpi) = a3e600aa42c091fc788b520629c0c676645a0913d358a62ad34c6c1bd9e60a1e +SIZE (xpi/firefox-i18n-58.0b9/fa.xpi) = 510290 +SHA256 (xpi/firefox-i18n-58.0b9/ff.xpi) = 0315c5cdbd03c8007d95d5c7e5e166e8adc69be8515b0e6ce4b98aa97de78e33 +SIZE (xpi/firefox-i18n-58.0b9/ff.xpi) = 455987 +SHA256 (xpi/firefox-i18n-58.0b9/fi.xpi) = b6e046470a86b36100de71773358ae021fdf35d84f21a664d462d428fe9fe619 +SIZE (xpi/firefox-i18n-58.0b9/fi.xpi) = 447018 +SHA256 (xpi/firefox-i18n-58.0b9/fr.xpi) = 5db5c05aeefc32b25369cfd9f57b78c3cf4ba947ea091bb2dae7236b6489b3d4 +SIZE (xpi/firefox-i18n-58.0b9/fr.xpi) = 472309 +SHA256 (xpi/firefox-i18n-58.0b9/fy-NL.xpi) = 4351a6794aac7eb83e1c73b1964030635bef9ff13fcbec4e6b7d0cd15b6d31bc +SIZE (xpi/firefox-i18n-58.0b9/fy-NL.xpi) = 465325 +SHA256 (xpi/firefox-i18n-58.0b9/ga-IE.xpi) = 7e9b076340e8f7f44b7fb5dfaa5804c25b18576b7f3560554f14921f0ac4a281 +SIZE (xpi/firefox-i18n-58.0b9/ga-IE.xpi) = 476788 +SHA256 (xpi/firefox-i18n-58.0b9/gd.xpi) = a36c73d5b97d5ec6ddf4a2e120408903139a1e92be462cee36886f587c88efae +SIZE (xpi/firefox-i18n-58.0b9/gd.xpi) = 464504 +SHA256 (xpi/firefox-i18n-58.0b9/gl.xpi) = b942d4c767f47feee14f266674c3119b1f25aff4478903ddde16c30b2cb207a3 +SIZE (xpi/firefox-i18n-58.0b9/gl.xpi) = 451732 +SHA256 (xpi/firefox-i18n-58.0b9/gn.xpi) = 8442f3781003a8e2ca27b056d386d0ee5e1f49124fece5cbdd84937352bdcabf +SIZE (xpi/firefox-i18n-58.0b9/gn.xpi) = 472922 +SHA256 (xpi/firefox-i18n-58.0b9/gu-IN.xpi) = 9c12a44771643b6497f22aafd8c4fb18904478c75f3430a7a568b80d1c73cefb +SIZE (xpi/firefox-i18n-58.0b9/gu-IN.xpi) = 513224 +SHA256 (xpi/firefox-i18n-58.0b9/he.xpi) = 7a854fe96cc504e2027a27fdf9a17621895024ceb1a3410dea3dd694a1ff6cf4 +SIZE (xpi/firefox-i18n-58.0b9/he.xpi) = 473118 +SHA256 (xpi/firefox-i18n-58.0b9/hi-IN.xpi) = f75ac9d40c5d72689467ece8889740dd8037cc9ed7b022ac45708c20ad17c652 +SIZE (xpi/firefox-i18n-58.0b9/hi-IN.xpi) = 525402 +SHA256 (xpi/firefox-i18n-58.0b9/hr.xpi) = 44e0f3a3573d54cb895982ad62b5f3c7971979942998dce3c87d59e318837f61 +SIZE (xpi/firefox-i18n-58.0b9/hr.xpi) = 462702 +SHA256 (xpi/firefox-i18n-58.0b9/hsb.xpi) = 568c4a71e34a7b88b1229c05fe63550d0a4f96debd1351368ab12584c2e1e5fd +SIZE (xpi/firefox-i18n-58.0b9/hsb.xpi) = 475942 +SHA256 (xpi/firefox-i18n-58.0b9/hu.xpi) = 8388133a943dbe650137f47f25631c348184aedff25d28b02870306f06320fa3 +SIZE (xpi/firefox-i18n-58.0b9/hu.xpi) = 476128 +SHA256 (xpi/firefox-i18n-58.0b9/hy-AM.xpi) = 947853183c856365c2cca2fcde56482cd87cd17b3b1c4d2d88c4879e63564326 +SIZE (xpi/firefox-i18n-58.0b9/hy-AM.xpi) = 511284 +SHA256 (xpi/firefox-i18n-58.0b9/id.xpi) = 98cb48523e45e1fb5e8e79dc2f5f12a2443451e8309c698c6706989b6518aba8 +SIZE (xpi/firefox-i18n-58.0b9/id.xpi) = 443532 +SHA256 (xpi/firefox-i18n-58.0b9/is.xpi) = 01c13af148bc641b27b8555dc0e19a134cfce22928e98470921fd67056506809 +SIZE (xpi/firefox-i18n-58.0b9/is.xpi) = 453642 +SHA256 (xpi/firefox-i18n-58.0b9/it.xpi) = fc439313ad506237e4a14ca968f2b00a93c178e3bc42dbea6a30f3e783344ec3 +SIZE (xpi/firefox-i18n-58.0b9/it.xpi) = 346346 +SHA256 (xpi/firefox-i18n-58.0b9/ja.xpi) = a17aeb195c4af4fe54c54c58de60e413d933d1a5583f71556e1511f52a4735f6 +SIZE (xpi/firefox-i18n-58.0b9/ja.xpi) = 510301 +SHA256 (xpi/firefox-i18n-58.0b9/ka.xpi) = 5afee5b9a91b98ce50937c34edd2accf26c83cb21938b750cbb497b78f87c3cf +SIZE (xpi/firefox-i18n-58.0b9/ka.xpi) = 491668 +SHA256 (xpi/firefox-i18n-58.0b9/kab.xpi) = c732759b278d99541e92d06846771f105b678957a29a96745d1b43af4c556c00 +SIZE (xpi/firefox-i18n-58.0b9/kab.xpi) = 461928 +SHA256 (xpi/firefox-i18n-58.0b9/kk.xpi) = a03c9b118b1f96705bec67b793539d3c8795d1e8880973c2a48ac61964140af1 +SIZE (xpi/firefox-i18n-58.0b9/kk.xpi) = 518501 +SHA256 (xpi/firefox-i18n-58.0b9/km.xpi) = 78616f28523c53e500e2bbff3d15bc1d811a154b7e36f7d4ddf90d2c52486944 +SIZE (xpi/firefox-i18n-58.0b9/km.xpi) = 529829 +SHA256 (xpi/firefox-i18n-58.0b9/kn.xpi) = 8c1c8b9278f14b6589720b2ddc471bf983bbcd5728029746d3bc87139168b4f4 +SIZE (xpi/firefox-i18n-58.0b9/kn.xpi) = 531528 +SHA256 (xpi/firefox-i18n-58.0b9/ko.xpi) = bd6a6b5b85ceda83aa5dd985378302b4a128fd512e3733904742f58953805f0a +SIZE (xpi/firefox-i18n-58.0b9/ko.xpi) = 486933 +SHA256 (xpi/firefox-i18n-58.0b9/lij.xpi) = bd6fc0af9832c1ed3b76790525c0b5704e0f525cf2470f844bccfda9a124b354 +SIZE (xpi/firefox-i18n-58.0b9/lij.xpi) = 453062 +SHA256 (xpi/firefox-i18n-58.0b9/lt.xpi) = 8cc25004c248f2948e614fc25a5b3a0f606f0d6a83313921f04c6e9ab6ad98af +SIZE (xpi/firefox-i18n-58.0b9/lt.xpi) = 474321 +SHA256 (xpi/firefox-i18n-58.0b9/lv.xpi) = b6e37ce1f97f533c24ec1aa10f402e1e867b7d56cd0d38ae0dff4f4345332169 +SIZE (xpi/firefox-i18n-58.0b9/lv.xpi) = 466057 +SHA256 (xpi/firefox-i18n-58.0b9/mai.xpi) = a15ec95331d0de1f1504b52099c926242b06ba72acc6797aec311c1abfd0f02d +SIZE (xpi/firefox-i18n-58.0b9/mai.xpi) = 507029 +SHA256 (xpi/firefox-i18n-58.0b9/mk.xpi) = 3f9f002793a23691265583d7f02ddfed04882316ccc881518aaccd2ecc66a214 +SIZE (xpi/firefox-i18n-58.0b9/mk.xpi) = 489714 +SHA256 (xpi/firefox-i18n-58.0b9/ml.xpi) = 7923705679eb24098db0bb21bdaf13aaf663f73b348ba01636ab3e982c133be9 +SIZE (xpi/firefox-i18n-58.0b9/ml.xpi) = 536067 +SHA256 (xpi/firefox-i18n-58.0b9/mr.xpi) = a0013db4b525f3517f536beadf63b31f14cbf3c9ed47ecbda30b75fabbebaa92 +SIZE (xpi/firefox-i18n-58.0b9/mr.xpi) = 520641 +SHA256 (xpi/firefox-i18n-58.0b9/ms.xpi) = 947fa03cb0b204ef375701aad9e02a69da81634e972e3a1ce61fdba82752c768 +SIZE (xpi/firefox-i18n-58.0b9/ms.xpi) = 450753 +SHA256 (xpi/firefox-i18n-58.0b9/my.xpi) = 34a5f1f31fa4423bc6b44610fcd1f8c1b780b2fe5674a2032dfcd2f0b6cc9d7f +SIZE (xpi/firefox-i18n-58.0b9/my.xpi) = 516242 +SHA256 (xpi/firefox-i18n-58.0b9/nb-NO.xpi) = 33baf33f0c04079b39854ed2b63b29ad4c35683d1b55e1cf4159ae48d53d34e0 +SIZE (xpi/firefox-i18n-58.0b9/nb-NO.xpi) = 450949 +SHA256 (xpi/firefox-i18n-58.0b9/ne-NP.xpi) = 9f8def738641de3cb201f16e56efe08d40d5e2231d6964578d0e5d166fac4951 +SIZE (xpi/firefox-i18n-58.0b9/ne-NP.xpi) = 513866 +SHA256 (xpi/firefox-i18n-58.0b9/nl.xpi) = 56f15d34e96b935c3749a1e3cc2e8f03c8731074da33b507f86b1612179e283b +SIZE (xpi/firefox-i18n-58.0b9/nl.xpi) = 457920 +SHA256 (xpi/firefox-i18n-58.0b9/nn-NO.xpi) = 198c410054c4d4b6e6e69ee5a31d7b1de5e46be7a7689d6721e90f6ae169971a +SIZE (xpi/firefox-i18n-58.0b9/nn-NO.xpi) = 451292 +SHA256 (xpi/firefox-i18n-58.0b9/or.xpi) = 23076bd9946773f79715c82337b926ca132baa93b462a104a3fb75e9b1313ebf +SIZE (xpi/firefox-i18n-58.0b9/or.xpi) = 500111 +SHA256 (xpi/firefox-i18n-58.0b9/pa-IN.xpi) = 9304d145515d888243999699aabe7aca29fe2e7d3178d99f8290d6b9ba2f8d56 +SIZE (xpi/firefox-i18n-58.0b9/pa-IN.xpi) = 495033 +SHA256 (xpi/firefox-i18n-58.0b9/pl.xpi) = a8b29db802fafca938544e3bd9e64ede8ca13d1649610bde17f768318996b3ad +SIZE (xpi/firefox-i18n-58.0b9/pl.xpi) = 362848 +SHA256 (xpi/firefox-i18n-58.0b9/pt-BR.xpi) = 1b518147b34a4afcf0bc155b7b2ac82419b85def1cc8ae9bcef97a8618a2c626 +SIZE (xpi/firefox-i18n-58.0b9/pt-BR.xpi) = 456478 +SHA256 (xpi/firefox-i18n-58.0b9/pt-PT.xpi) = 4aacb384fcafef6e077c6c2dd0d5419b0979a13943384365d89a934d8ada1e49 +SIZE (xpi/firefox-i18n-58.0b9/pt-PT.xpi) = 459130 +SHA256 (xpi/firefox-i18n-58.0b9/rm.xpi) = 3d642f50c71bb2e135c739b87184aae6eb8c72b53b0de0f6d87c704c11aa306d +SIZE (xpi/firefox-i18n-58.0b9/rm.xpi) = 452476 +SHA256 (xpi/firefox-i18n-58.0b9/ro.xpi) = 1702188c44afeeffe5babf4c58b8307d7e5345f27f12f4007118ad99eb714791 +SIZE (xpi/firefox-i18n-58.0b9/ro.xpi) = 456189 +SHA256 (xpi/firefox-i18n-58.0b9/ru.xpi) = a2c1d93e82dbd642290c903988b44175870d8fd2be852ac8924f02f1768c51de +SIZE (xpi/firefox-i18n-58.0b9/ru.xpi) = 526135 +SHA256 (xpi/firefox-i18n-58.0b9/si.xpi) = 3a9b52086ebc64b923f2c2ded773fc700ca3c41c9ca51c7062bd8fbffa5e5583 +SIZE (xpi/firefox-i18n-58.0b9/si.xpi) = 497913 +SHA256 (xpi/firefox-i18n-58.0b9/sk.xpi) = de990779319a30e123c9a00cab286f0202e06d99ab92515872f7946adbd22d46 +SIZE (xpi/firefox-i18n-58.0b9/sk.xpi) = 479897 +SHA256 (xpi/firefox-i18n-58.0b9/sl.xpi) = aa685dee7f21160090297bc213bae56462d7734c3bdf43d4b431f78834c23fc9 +SIZE (xpi/firefox-i18n-58.0b9/sl.xpi) = 459132 +SHA256 (xpi/firefox-i18n-58.0b9/son.xpi) = 5c99d721dcb5873ea46cf307557520511a2cbcbd308e978dcbac653ac615d64d +SIZE (xpi/firefox-i18n-58.0b9/son.xpi) = 451480 +SHA256 (xpi/firefox-i18n-58.0b9/sq.xpi) = 60084bc08517a6b5f19c844b27dfc4b300c49e8560351af26fe07298e7138344 +SIZE (xpi/firefox-i18n-58.0b9/sq.xpi) = 465312 +SHA256 (xpi/firefox-i18n-58.0b9/sr.xpi) = b4deeeed4414b7db117b73eb113d1f03861c259eea1c1cb4a1d69867f55f020d +SIZE (xpi/firefox-i18n-58.0b9/sr.xpi) = 486325 +SHA256 (xpi/firefox-i18n-58.0b9/sv-SE.xpi) = fd768fa36c1ec25e43e750a6a26328bfb22d206f8a65acfb72bbd37aa5a2b57b +SIZE (xpi/firefox-i18n-58.0b9/sv-SE.xpi) = 459101 +SHA256 (xpi/firefox-i18n-58.0b9/ta.xpi) = 8f895cf90faf4a77373cd503f009c5ff58eb57b8526fbb1b82e9463bb7fa6eca +SIZE (xpi/firefox-i18n-58.0b9/ta.xpi) = 513774 +SHA256 (xpi/firefox-i18n-58.0b9/te.xpi) = 2e66d22b735622e68231d51ea8f22748ac1f1bcb50710f01b4eafc5555389792 +SIZE (xpi/firefox-i18n-58.0b9/te.xpi) = 530530 +SHA256 (xpi/firefox-i18n-58.0b9/th.xpi) = 6ae4403abb4a7db21f2b3212ce01b39893cbfc650459cd3e42a200beaacacd33 +SIZE (xpi/firefox-i18n-58.0b9/th.xpi) = 502310 +SHA256 (xpi/firefox-i18n-58.0b9/tr.xpi) = 4a81ab4d9197cae740c86075833581acde07e5dbd4b6008189d3f18f6092b1e0 +SIZE (xpi/firefox-i18n-58.0b9/tr.xpi) = 465019 +SHA256 (xpi/firefox-i18n-58.0b9/uk.xpi) = f39c151b656eecc5cd0c93bbb18b56ec55beab5192ef3567e36aed89fb8c3663 +SIZE (xpi/firefox-i18n-58.0b9/uk.xpi) = 517419 +SHA256 (xpi/firefox-i18n-58.0b9/ur.xpi) = c52185ea5ec155737385b6987d06fd658510f7c02ece0d062ae218fe15b81a63 +SIZE (xpi/firefox-i18n-58.0b9/ur.xpi) = 511179 +SHA256 (xpi/firefox-i18n-58.0b9/uz.xpi) = 962253cd296c0bb45b42faab51d19d3b709e5252151cff2a4a00bd3b3e2cdb60 +SIZE (xpi/firefox-i18n-58.0b9/uz.xpi) = 462045 +SHA256 (xpi/firefox-i18n-58.0b9/vi.xpi) = 8d4c7f6c8d92e9539acf21b659f95e05fa330e246234cbb8efe2b2548546827a +SIZE (xpi/firefox-i18n-58.0b9/vi.xpi) = 470106 +SHA256 (xpi/firefox-i18n-58.0b9/xh.xpi) = 6af885ea970fd868b4d62be1f030ce2f2252d55a701b812d980929b6b29e2030 +SIZE (xpi/firefox-i18n-58.0b9/xh.xpi) = 464808 +SHA256 (xpi/firefox-i18n-58.0b9/zh-CN.xpi) = 8e0d402f90016b5e0f5b1a4c54c7c472fab6080ef4ab346225266d343ccd211c +SIZE (xpi/firefox-i18n-58.0b9/zh-CN.xpi) = 482850 +SHA256 (xpi/firefox-i18n-58.0b9/zh-TW.xpi) = 31153a6f5cfbee4889bdf2486b9f082794824fb8a7be06cdd691b5320cbac61c +SIZE (xpi/firefox-i18n-58.0b9/zh-TW.xpi) = 480463 diff --git a/www/firefox/Makefile b/www/firefox/Makefile index 46f6ecf0b470..f582b37cd69f 100644 --- a/www/firefox/Makefile +++ b/www/firefox/Makefile @@ -2,23 +2,23 @@ # $FreeBSD$ PORTNAME= firefox -DISTVERSION= 57.0.1 +DISTVERSION= 58.0b9 PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ - MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build2/source + MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source DISTFILES= ${DISTNAME}.source${EXTRACT_SUFX} MAINTAINER= gecko@FreeBSD.org COMMENT= Web browser based on the browser portion of Mozilla BUILD_DEPENDS= nspr>=4.17:devel/nspr \ - nss>=3.33:security/nss \ + nss>=3.34:security/nss \ icu>=59.1,1:devel/icu \ libevent>=2.1.8:devel/libevent \ harfbuzz>=1.5.1:print/harfbuzz \ graphite2>=1.3.10:graphics/graphite2 \ - png>=1.6.31:graphics/png \ + png>=1.6.34:graphics/png \ libvorbis>=1.3.5,3:audio/libvorbis \ libvpx>=1.5.0:multimedia/libvpx \ sqlite3>=3.20.1:databases/sqlite3 \ diff --git a/www/firefox/distinfo b/www/firefox/distinfo index 4fa4d0f27669..c4c94f927c95 100644 --- a/www/firefox/distinfo +++ b/www/firefox/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1511948395 -SHA256 (firefox-57.0.1.source.tar.xz) = 7db7829e0771acf1be253a8841b9dc96d2ad6490a8f1430fa074e5fd857181ba -SIZE (firefox-57.0.1.source.tar.xz) = 251048924 +TIMESTAMP = 1512408140 +SHA256 (firefox-58.0b9.source.tar.xz) = 12c50e3484b7a4d6da6a461c7220ff4753e6fd5614ecdef60ba12c76bb120592 +SIZE (firefox-58.0b9.source.tar.xz) = 248010432 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..e1c130cefa17 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 +# ============================================================== @@ -266,6 +254,6 @@ index 9297e4d6f501..d8e273887e4b 100644 + +set_config('MOZ_SYSTEM_HARFBUZZ', depends_if(system_harfbuzz)(lambda _: True)) + - # Apple platform decoder support + # Mortar # ============================================================== - @depends(toolkit) + option('--enable-mortar', help='Enable mortar extension') 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();