aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Mk/Uses/gecko.mk4
-rw-r--r--devel/nspr/Makefile2
-rw-r--r--devel/nspr/distinfo4
-rw-r--r--security/ca_root_nss/Makefile2
-rw-r--r--security/ca_root_nss/distinfo4
-rw-r--r--security/nss/Makefile4
-rw-r--r--security/nss/distinfo4
-rw-r--r--www/firefox-esr-i18n/Makefile2
-rw-r--r--www/firefox-esr-i18n/distinfo352
-rw-r--r--www/firefox-esr/Makefile9
-rw-r--r--www/firefox-esr/distinfo4
-rw-r--r--www/firefox-i18n/Makefile6
-rw-r--r--www/firefox-i18n/distinfo356
-rw-r--r--www/firefox/Makefile14
-rw-r--r--www/firefox/distinfo4
-rw-r--r--www/firefox/files/patch-bug118138215
-rw-r--r--www/firefox/files/patch-bug70217914
-rw-r--r--www/firefox/files/patch-bug7797139
-rw-r--r--www/firefox/files/patch-bug98134810
-rw-r--r--www/firefox/files/patch-media_libav_config__unix.h11
-rw-r--r--www/firefox/files/patch-memory-jemalloc-Makefile.in10
-rw-r--r--www/firefox/files/patch-soundtouch-no-factory84
-rw-r--r--www/firefox/files/patch-toolkit_system_unixproxy_nsLibProxySettings.cpp10
-rw-r--r--www/firefox/files/patch-z-bug51742244
-rw-r--r--www/libxul/Makefile7
-rw-r--r--www/libxul/distinfo4
-rw-r--r--www/linux-firefox/Makefile4
-rw-r--r--www/linux-firefox/distinfo4
-rw-r--r--www/linux-firefox/pkg-plist1
-rw-r--r--www/linux-seamonkey/Makefile2
-rw-r--r--www/linux-seamonkey/distinfo4
-rw-r--r--www/linux-seamonkey/pkg-plist2
-rw-r--r--www/seamonkey-i18n/Makefile2
-rw-r--r--www/seamonkey-i18n/distinfo108
-rw-r--r--www/seamonkey/Makefile22
-rw-r--r--www/seamonkey/distinfo4
-rw-r--r--www/seamonkey/files/extra-patch-bug112551415
-rw-r--r--www/seamonkey/files/patch-bug102176148
-rw-r--r--www/seamonkey/files/patch-bug110385842
-rw-r--r--www/seamonkey/files/patch-bug1112904161
-rw-r--r--www/seamonkey/files/patch-bug112254720
-rw-r--r--www/seamonkey/files/patch-bug112557916
-rw-r--r--www/seamonkey/files/patch-bug112558013
-rw-r--r--www/seamonkey/files/patch-bug112816128
-rw-r--r--www/seamonkey/files/patch-bug114341127
-rw-r--r--www/seamonkey/files/patch-bug2921274
-rw-r--r--www/seamonkey/files/patch-bug70217930
-rw-r--r--www/seamonkey/files/patch-bug77971337
-rw-r--r--www/seamonkey/files/patch-bug82698558
-rw-r--r--www/seamonkey/files/patch-bug84756849
-rw-r--r--www/seamonkey/files/patch-bug89912695
-rw-r--r--www/seamonkey/files/patch-bug98134810
-rw-r--r--www/seamonkey/files/patch-build-pgo-profileserver.py11
-rw-r--r--www/seamonkey/files/patch-config-baseconfig.mk (renamed from www/seamonkey/files/patch-mozilla-config-baseconfig.mk)0
-rw-r--r--www/seamonkey/files/patch-ijg-libjpeg9
-rw-r--r--www/seamonkey/files/patch-ldap_ldap-sdk.mozbuild22
-rw-r--r--www/seamonkey/files/patch-media-libstagefright-foundation-AString.cpp (renamed from www/seamonkey/files/patch-mozilla-media-libstagefright-foundation-AString.cpp)0
-rw-r--r--www/seamonkey/files/patch-media-mtransport-third_party-nICEr-src-util-mbslen.c (renamed from www/seamonkey/files/patch-mozilla-media-mtransport-third_party-nICEr-src-util-mbslen.c)0
-rw-r--r--www/seamonkey/files/patch-media-webrtc-trunk-src-system_wrappers-source-spreadsortlib-spreadsort.hpp (renamed from www/seamonkey/files/patch-mozilla-media-webrtc-trunk-src-system_wrappers-source-spreadsortlib-spreadsort.hpp)4
-rw-r--r--www/seamonkey/files/patch-media_libav_config__unix.h11
-rw-r--r--www/seamonkey/files/patch-modules-libpref-init-all.js15
-rw-r--r--www/seamonkey/files/patch-mozilla-memory-jemalloc-Makefile.in10
-rw-r--r--www/seamonkey/files/patch-mozilla-memory-jemalloc-configure.ac28
-rw-r--r--www/seamonkey/files/patch-soundtouch-no-factory84
-rw-r--r--www/seamonkey/files/patch-suite-app-nsSuiteApp.cpp11
-rw-r--r--www/seamonkey/files/patch-toolkit_mozapps_installer_packager_mk (renamed from www/seamonkey/files/patch-mozilla_toolkit_mozapps_installer_packager_mk)2
-rw-r--r--www/seamonkey/files/patch-toolkit_system_unixproxy_nsLibProxySettings.cpp10
-rw-r--r--www/seamonkey/files/patch-z-bug517422162
68 files changed, 985 insertions, 1189 deletions
diff --git a/Mk/Uses/gecko.mk b/Mk/Uses/gecko.mk
index 0902f78c8a08..0799f71ab19e 100644
--- a/Mk/Uses/gecko.mk
+++ b/Mk/Uses/gecko.mk
@@ -37,12 +37,12 @@ RUN_DEPENDS+= libxul>=38:${PORTSDIR}/www/libxul
.elif ${gecko_ARGS:Mfirefox}
_GECKO_DEFAULT_VERSION= 38
-_GECKO_VERSIONS= 38 41
+_GECKO_VERSIONS= 38 42
_GECKO_TYPE= firefox
# Dependence lines for different Firefox versions
38_DEPENDS= ${LOCALBASE}/lib/firefox/firefox:${PORTSDIR}/www/firefox-esr
-41_DEPENDS= ${LOCALBASE}/lib/firefox/firefox:${PORTSDIR}/www/firefox
+42_DEPENDS= ${LOCALBASE}/lib/firefox/firefox:${PORTSDIR}/www/firefox
.if exists(${LOCALBASE}/bin/firefox)
_GECKO_INSTALLED_VER!= ${LOCALBASE}/bin/firefox --version 2>/dev/null
diff --git a/devel/nspr/Makefile b/devel/nspr/Makefile
index 3a95bf0c284f..3527435fbebb 100644
--- a/devel/nspr/Makefile
+++ b/devel/nspr/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= nspr
-DISTVERSION= 4.10.9
+DISTVERSION= 4.10.10
CATEGORIES= devel
MASTER_SITES= MOZILLA/${PORTNAME}/releases/v${PORTVERSION}/src
diff --git a/devel/nspr/distinfo b/devel/nspr/distinfo
index 52f1d21c5abb..0abe3caf37b3 100644
--- a/devel/nspr/distinfo
+++ b/devel/nspr/distinfo
@@ -1,2 +1,2 @@
-SHA256 (nspr-4.10.9.tar.gz) = 4112ff6ad91d32696ca0c6c3d4abef6367b5dc0127fa172fcb3c3ab81bb2d881
-SIZE (nspr-4.10.9.tar.gz) = 1134015
+SHA256 (nspr-4.10.10.tar.gz) = 343614971c30520d0fa55f4af0a72578e2d8674bb71caf7187490c3379523107
+SIZE (nspr-4.10.10.tar.gz) = 1134164
diff --git a/security/ca_root_nss/Makefile b/security/ca_root_nss/Makefile
index 402c70649f92..9138af239e3c 100644
--- a/security/ca_root_nss/Makefile
+++ b/security/ca_root_nss/Makefile
@@ -32,7 +32,7 @@ PLIST_SUB+= CERTDIR=${CERTDIR}
# !!! Please DO NOT submit patches for new version until it has !!!
# !!! been committed there first. !!!
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-VERSION_NSS= 3.20
+VERSION_NSS= 3.20.1
#NSS_SUFFIX= -with-ckbi-1.98
CERTDATA_TXT_PATH= nss-${VERSION_NSS}/nss/lib/ckfw/builtins/certdata.txt
BUNDLE_PROCESSOR= MAca-bundle.pl
diff --git a/security/ca_root_nss/distinfo b/security/ca_root_nss/distinfo
index 240fc588f7f2..3445661eb2ff 100644
--- a/security/ca_root_nss/distinfo
+++ b/security/ca_root_nss/distinfo
@@ -1,2 +1,2 @@
-SHA256 (nss-3.20.tar.gz) = 5e38d4b9837ca338af966b97fc91c07f67ad647fb38dc4af3cfd0d84e477d15c
-SIZE (nss-3.20.tar.gz) = 6955552
+SHA256 (nss-3.20.1.tar.gz) = ad3c8f11dfd9570c2d04a6140d5ef7c2bdd0fe30d6c9e5548721a4251a5e8c97
+SIZE (nss-3.20.1.tar.gz) = 6958956
diff --git a/security/nss/Makefile b/security/nss/Makefile
index 4574f4d3cfaa..bdde29353573 100644
--- a/security/nss/Makefile
+++ b/security/nss/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= nss
-PORTVERSION= 3.20
+PORTVERSION= 3.20.1
#DISTVERSIONSUFFIX= -with-ckbi-1.98
CATEGORIES= security
MASTER_SITES= MOZILLA/security/${PORTNAME}/releases/${DISTNAME:tu:C/[-.]/_/g}_RTM/src
@@ -11,7 +11,7 @@ MAINTAINER= gecko@FreeBSD.org
COMMENT= Libraries to support development of security-enabled applications
BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip \
- nspr>=4.10.8:${PORTSDIR}/devel/nspr \
+ nspr>=4.10.10:${PORTSDIR}/devel/nspr \
sqlite3>=3.7.15:${PORTSDIR}/databases/sqlite3
LIB_DEPENDS= libnspr4.so:${PORTSDIR}/devel/nspr \
libsqlite3.so:${PORTSDIR}/databases/sqlite3
diff --git a/security/nss/distinfo b/security/nss/distinfo
index 240fc588f7f2..3445661eb2ff 100644
--- a/security/nss/distinfo
+++ b/security/nss/distinfo
@@ -1,2 +1,2 @@
-SHA256 (nss-3.20.tar.gz) = 5e38d4b9837ca338af966b97fc91c07f67ad647fb38dc4af3cfd0d84e477d15c
-SIZE (nss-3.20.tar.gz) = 6955552
+SHA256 (nss-3.20.1.tar.gz) = ad3c8f11dfd9570c2d04a6140d5ef7c2bdd0fe30d6c9e5548721a4251a5e8c97
+SIZE (nss-3.20.1.tar.gz) = 6958956
diff --git a/www/firefox-esr-i18n/Makefile b/www/firefox-esr-i18n/Makefile
index ed63579697b0..bbe425c95799 100644
--- a/www/firefox-esr-i18n/Makefile
+++ b/www/firefox-esr-i18n/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= firefox
-PORTVERSION= 38.3.0
+PORTVERSION= 38.4.0
CATEGORIES= www
MASTER_SITES= MOZILLA/${PORTNAME:S|-i18n||}/releases/${DISTVERSION}esr/linux-i686/xpi \
MOZILLA/${PORTNAME:S|-i18n||}/candidates/${DISTVERSION}esr-candidates/build2/linux-i686/xpi
diff --git a/www/firefox-esr-i18n/distinfo b/www/firefox-esr-i18n/distinfo
index 53cb969368bc..a6ca649bad03 100644
--- a/www/firefox-esr-i18n/distinfo
+++ b/www/firefox-esr-i18n/distinfo
@@ -1,176 +1,176 @@
-SHA256 (xpi/firefox-38.3.0/ach.xpi) = 2f72ae6bad2fe67c93a5384cb32ab2991166b4507ee4d2678fd3c192719b4197
-SIZE (xpi/firefox-38.3.0/ach.xpi) = 477970
-SHA256 (xpi/firefox-38.3.0/af.xpi) = ffa2d6e68d8c3ca3fe4d36372ac565fd34ad925fdc1f3f46382afa044d8d55fd
-SIZE (xpi/firefox-38.3.0/af.xpi) = 483326
-SHA256 (xpi/firefox-38.3.0/an.xpi) = d8d90a799d5e7d47a44f4afd5fba10f8815ff09eae34276f4e8e817befb9c6b8
-SIZE (xpi/firefox-38.3.0/an.xpi) = 461423
-SHA256 (xpi/firefox-38.3.0/ar.xpi) = 60fd61bc5ad7db8857232deb0dae2f49882d9803d86d852daabe5debaddac467
-SIZE (xpi/firefox-38.3.0/ar.xpi) = 516496
-SHA256 (xpi/firefox-38.3.0/as.xpi) = 14864a2372815dfd2c9bc726571b4d0d68169d55f9d0d150e91dfaa73e4cf8b6
-SIZE (xpi/firefox-38.3.0/as.xpi) = 509574
-SHA256 (xpi/firefox-38.3.0/ast.xpi) = b0f9e9f5cbcd4e5b5dd6bbf3aae4d6edbf7f204e2d99f37db313a1dc8001f5d5
-SIZE (xpi/firefox-38.3.0/ast.xpi) = 397203
-SHA256 (xpi/firefox-38.3.0/az.xpi) = 70c7ed401c48843c96486799c54498405e137196ea49e643513c43e3ea154bef
-SIZE (xpi/firefox-38.3.0/az.xpi) = 489154
-SHA256 (xpi/firefox-38.3.0/be.xpi) = 5b2ef1a4f93de18c8b27e703ec5da6bc760a09d67e863c0116593b7bacba38ff
-SIZE (xpi/firefox-38.3.0/be.xpi) = 441058
-SHA256 (xpi/firefox-38.3.0/bg.xpi) = fa3ada11deeb52b3125b49428570c3fb8fc9956b3aa2124f6b5c1017512f715e
-SIZE (xpi/firefox-38.3.0/bg.xpi) = 487819
-SHA256 (xpi/firefox-38.3.0/bn-BD.xpi) = 865456f6c52520446b829ca001268b6a8a9c4ca8ee597c00e7313193adf52b9f
-SIZE (xpi/firefox-38.3.0/bn-BD.xpi) = 528690
-SHA256 (xpi/firefox-38.3.0/bn-IN.xpi) = 093e4d5fe1fab9ce3eac28a1616857a9b8a106bd91d07047a80ec0f7ae87a1a4
-SIZE (xpi/firefox-38.3.0/bn-IN.xpi) = 527927
-SHA256 (xpi/firefox-38.3.0/br.xpi) = cca671ee4ee031d3acf90cf732b0b03a98a6eb14a3e10d0fdd4105d6fb2ca7cd
-SIZE (xpi/firefox-38.3.0/br.xpi) = 441961
-SHA256 (xpi/firefox-38.3.0/bs.xpi) = 1ae378259f25e2a4b8b08e5f3c907476c7b9828b8c2bbdab5f733adec486d487
-SIZE (xpi/firefox-38.3.0/bs.xpi) = 485305
-SHA256 (xpi/firefox-38.3.0/ca.xpi) = a34d02f928a6bef8ee204c331073b933ee4c7e85e0840ec7471c4018eea555ba
-SIZE (xpi/firefox-38.3.0/ca.xpi) = 458091
-SHA256 (xpi/firefox-38.3.0/cs.xpi) = 9fa350f1aea6fd57c10908aa84a401e6d5b4111d34e7ed0c769807c62223ec0e
-SIZE (xpi/firefox-38.3.0/cs.xpi) = 446725
-SHA256 (xpi/firefox-38.3.0/cy.xpi) = 78f9cacf491b6ff5888782455a3b4d7c1ed0ae5298dd825a8de15bf42c0dbab8
-SIZE (xpi/firefox-38.3.0/cy.xpi) = 444385
-SHA256 (xpi/firefox-38.3.0/da.xpi) = 6b24f9c8f926d28106c17e1adec975607f869d5f1dc2202ad1b0047da03acd0c
-SIZE (xpi/firefox-38.3.0/da.xpi) = 450762
-SHA256 (xpi/firefox-38.3.0/de.xpi) = 64bbc4dce5f8bd357dcadec32fe18f9d12d235dcf1016b7490d9802dba9d2e9d
-SIZE (xpi/firefox-38.3.0/de.xpi) = 451628
-SHA256 (xpi/firefox-38.3.0/dsb.xpi) = 80453680d665de33f10ed1e8f675d546fbc622fbab78a96119470ec553ff5e81
-SIZE (xpi/firefox-38.3.0/dsb.xpi) = 470924
-SHA256 (xpi/firefox-38.3.0/el.xpi) = 736da042d960010da3298191613c5df4e3813f80519359725c0cce4b9071c9b1
-SIZE (xpi/firefox-38.3.0/el.xpi) = 498370
-SHA256 (xpi/firefox-38.3.0/en-GB.xpi) = fb822610d286841e79799aabe37b28b3a49dd602b2115b0b44e25656d78e340f
-SIZE (xpi/firefox-38.3.0/en-GB.xpi) = 437846
-SHA256 (xpi/firefox-38.3.0/en-US.xpi) = d78090784e0aaadc9deb3e74751dd5a524abf450295c873d78ace40bdd829960
-SIZE (xpi/firefox-38.3.0/en-US.xpi) = 469718
-SHA256 (xpi/firefox-38.3.0/en-ZA.xpi) = c323f421203600958b966bab2e7067948be7a5ce136b54bfe36b15eec74a0552
-SIZE (xpi/firefox-38.3.0/en-ZA.xpi) = 439926
-SHA256 (xpi/firefox-38.3.0/eo.xpi) = 524bc6a5bd979ebdc7f82f63d4c721fb48920907d356455943654759dad09e03
-SIZE (xpi/firefox-38.3.0/eo.xpi) = 488370
-SHA256 (xpi/firefox-38.3.0/es-AR.xpi) = 97cde7ab000ed7167f45d86e0ca7452006f90961f71fc74137bed72e100b17c1
-SIZE (xpi/firefox-38.3.0/es-AR.xpi) = 453983
-SHA256 (xpi/firefox-38.3.0/es-CL.xpi) = 599ad5f49f6578e1a625e8b594fb9d51414b3ac09010f133a15859acef8baaa8
-SIZE (xpi/firefox-38.3.0/es-CL.xpi) = 384680
-SHA256 (xpi/firefox-38.3.0/es-ES.xpi) = 1471acb38112acd82a7404b8ff5c7fb57bb5f90faf5b99d6a37c6ab6472ec669
-SIZE (xpi/firefox-38.3.0/es-ES.xpi) = 374073
-SHA256 (xpi/firefox-38.3.0/es-MX.xpi) = 31c80e68ddd95628cb8484677f830f952be96ff64897e11d128077e0fcbce7ae
-SIZE (xpi/firefox-38.3.0/es-MX.xpi) = 457050
-SHA256 (xpi/firefox-38.3.0/et.xpi) = 1ea45310456c3b3649ead3b172777d80263c7e18b2f6ba73d214b8bea3fee864
-SIZE (xpi/firefox-38.3.0/et.xpi) = 443228
-SHA256 (xpi/firefox-38.3.0/eu.xpi) = f7df003ce694defcb73b6bce207c0b3a0a81226651780636b196f9badd590958
-SIZE (xpi/firefox-38.3.0/eu.xpi) = 466555
-SHA256 (xpi/firefox-38.3.0/fa.xpi) = 11eae8c5c93095e5dd9161ec579775a7e84fa38b5a715ce5771e69dd80ee2004
-SIZE (xpi/firefox-38.3.0/fa.xpi) = 518281
-SHA256 (xpi/firefox-38.3.0/ff.xpi) = d512a79681dc961f3c4b1d59846dc2d79a75b04aa591ae38fe9f810c946d0b95
-SIZE (xpi/firefox-38.3.0/ff.xpi) = 454587
-SHA256 (xpi/firefox-38.3.0/fi.xpi) = b64d53d522244f5bff25e03b19c0e59e7c0e1af796296bba249b9aab82803fb9
-SIZE (xpi/firefox-38.3.0/fi.xpi) = 444852
-SHA256 (xpi/firefox-38.3.0/fr.xpi) = 3c602755066a100f54726f813d1c7d0e02e634ad7911be1107c0b9f726a1948d
-SIZE (xpi/firefox-38.3.0/fr.xpi) = 461402
-SHA256 (xpi/firefox-38.3.0/fy-NL.xpi) = e9f2a84766edf7dd97791d0b84723a48f6441d9ddee4797d0771f805fcac7c43
-SIZE (xpi/firefox-38.3.0/fy-NL.xpi) = 455537
-SHA256 (xpi/firefox-38.3.0/ga-IE.xpi) = ac7c95ccb1061c812fb88b736e0008fccc1faceea33cd8516a8db430ab297b64
-SIZE (xpi/firefox-38.3.0/ga-IE.xpi) = 469624
-SHA256 (xpi/firefox-38.3.0/gd.xpi) = dd67970c734223e4152f987cbc3db474c54a331f0e11436b948bdd6b361b9bcc
-SIZE (xpi/firefox-38.3.0/gd.xpi) = 454616
-SHA256 (xpi/firefox-38.3.0/gl.xpi) = f2df908b7153976bb3b5c463b2e413e0d0b616aa47d13321289c23e546dfa9fe
-SIZE (xpi/firefox-38.3.0/gl.xpi) = 448924
-SHA256 (xpi/firefox-38.3.0/gu-IN.xpi) = a6ba0d884228ea0cd32c6b7813943f74d371cf1094602773dd4c2aa09e6148a1
-SIZE (xpi/firefox-38.3.0/gu-IN.xpi) = 477980
-SHA256 (xpi/firefox-38.3.0/he.xpi) = 8f1189a915932254dd71a2cb1bc1c8af2650abed6400ed58c5899872ecc500aa
-SIZE (xpi/firefox-38.3.0/he.xpi) = 486785
-SHA256 (xpi/firefox-38.3.0/hi-IN.xpi) = 7eb0158c7cf4dc9b429964f404d9e5fa6e70a57c4b4b28ce70b998b62f847092
-SIZE (xpi/firefox-38.3.0/hi-IN.xpi) = 508167
-SHA256 (xpi/firefox-38.3.0/hr.xpi) = da6a302f08ebce5f02d5fd09fe77148dd6607149362c44bf17aad943ea178939
-SIZE (xpi/firefox-38.3.0/hr.xpi) = 478271
-SHA256 (xpi/firefox-38.3.0/hsb.xpi) = 712603889391534f5bc4125621a00deca7d8ceb008ebabbfefb71d75393ea817
-SIZE (xpi/firefox-38.3.0/hsb.xpi) = 468720
-SHA256 (xpi/firefox-38.3.0/hu.xpi) = de14abb876cb407f723025787ee7a1ca7820cc0737d10ff6bf3b9516959449be
-SIZE (xpi/firefox-38.3.0/hu.xpi) = 453554
-SHA256 (xpi/firefox-38.3.0/hy-AM.xpi) = 0d32d2ed9229fa268dde02e627088bab563671633b447bde7f477a567fd001a8
-SIZE (xpi/firefox-38.3.0/hy-AM.xpi) = 534264
-SHA256 (xpi/firefox-38.3.0/id.xpi) = 9d95ec48a5ccff91c0281db567ffda7aeef684c1aa6058bd3a27b76d9d45665a
-SIZE (xpi/firefox-38.3.0/id.xpi) = 431488
-SHA256 (xpi/firefox-38.3.0/is.xpi) = f6e3da8b25067d8978043c5dceba199858650372cff1f57da61e65649b9a02a5
-SIZE (xpi/firefox-38.3.0/is.xpi) = 485129
-SHA256 (xpi/firefox-38.3.0/it.xpi) = 961f916fcffbbc3f2852f3cb1a337e54e1f5b62389c3ae8888441c991c5289f7
-SIZE (xpi/firefox-38.3.0/it.xpi) = 368409
-SHA256 (xpi/firefox-38.3.0/ja.xpi) = 53cdacca5fdf51204a47dd20a395d6c3f77278196e4283d11e3e47abcc071f58
-SIZE (xpi/firefox-38.3.0/ja.xpi) = 479113
-SHA256 (xpi/firefox-38.3.0/kk.xpi) = 41088142a35e2904779b24e9d54ada4e59f3bb398e92796a93712839f3ffc7c4
-SIZE (xpi/firefox-38.3.0/kk.xpi) = 503568
-SHA256 (xpi/firefox-38.3.0/km.xpi) = ecc6566e22d7b522f8a5ce39e8264a71bf04f22d05c1f83f9c57704b1bac0259
-SIZE (xpi/firefox-38.3.0/km.xpi) = 565673
-SHA256 (xpi/firefox-38.3.0/kn.xpi) = 636b368787d841d747f1d714b40eb2ae5e6500f2d933d39003e9de6d52c7d54e
-SIZE (xpi/firefox-38.3.0/kn.xpi) = 533463
-SHA256 (xpi/firefox-38.3.0/ko.xpi) = 489bdb57e8aa63fd54999319fdb0985a4bff5144aa558fddcf4e977226a780c4
-SIZE (xpi/firefox-38.3.0/ko.xpi) = 460853
-SHA256 (xpi/firefox-38.3.0/lij.xpi) = 79084ffafbde4a7758118ad3b2cc526052833cb4e0319c9f8ea5b4d393a20bff
-SIZE (xpi/firefox-38.3.0/lij.xpi) = 444239
-SHA256 (xpi/firefox-38.3.0/lt.xpi) = a791d826ffb215f396e2c674efb29e2a4ea3b675b538978c46162adbb3c97b00
-SIZE (xpi/firefox-38.3.0/lt.xpi) = 486452
-SHA256 (xpi/firefox-38.3.0/lv.xpi) = b10fa69f49de1197b3ae30cb247b11bb34094c895694feaa770ed09d2a346251
-SIZE (xpi/firefox-38.3.0/lv.xpi) = 467198
-SHA256 (xpi/firefox-38.3.0/mai.xpi) = 50eb11e00cdf99da0d4e1d06d83be903a060a53416baffb666dbf166600aeac1
-SIZE (xpi/firefox-38.3.0/mai.xpi) = 514666
-SHA256 (xpi/firefox-38.3.0/mk.xpi) = 3ac79a90e37cb6f6cfb7b342a26957f38524d6a09be6644534917d2e3405dde0
-SIZE (xpi/firefox-38.3.0/mk.xpi) = 529205
-SHA256 (xpi/firefox-38.3.0/ml.xpi) = 19615835b449dabf86177e251e5622945ce248497c015ea56d66b0aa6ccb8e73
-SIZE (xpi/firefox-38.3.0/ml.xpi) = 528919
-SHA256 (xpi/firefox-38.3.0/mr.xpi) = 7d4093a8136b46c9b8122d5c8e6917a633ddb0fda208ab01a49bc4bc6e98ecf3
-SIZE (xpi/firefox-38.3.0/mr.xpi) = 505961
-SHA256 (xpi/firefox-38.3.0/ms.xpi) = bb2eef3b76d0218fedb51f5eaaa8e1232f8d0e4f9a4ad1df75b6f93f59f5db62
-SIZE (xpi/firefox-38.3.0/ms.xpi) = 489872
-SHA256 (xpi/firefox-38.3.0/nb-NO.xpi) = c474c99d1d240ea93e891c9e2a01e39ec630024a75a3d809c08d56a75f7a70c8
-SIZE (xpi/firefox-38.3.0/nb-NO.xpi) = 444176
-SHA256 (xpi/firefox-38.3.0/nl.xpi) = f07caf8da3bfdef6d35a9e0e2a33dad23347afb6176d6acba1f3123abfa68572
-SIZE (xpi/firefox-38.3.0/nl.xpi) = 443995
-SHA256 (xpi/firefox-38.3.0/nn-NO.xpi) = 62e4d03e108833164c0f00126782d38804548e4e958d2640937f85b50133201c
-SIZE (xpi/firefox-38.3.0/nn-NO.xpi) = 438452
-SHA256 (xpi/firefox-38.3.0/or.xpi) = 05b3bfeab432b1119bd605822bbaf632d7d6e6704b8f34db8c407c83bff3daef
-SIZE (xpi/firefox-38.3.0/or.xpi) = 527050
-SHA256 (xpi/firefox-38.3.0/pa-IN.xpi) = bd393db4f3d07a0b362cc652c5b875d36b2e06b1fca85c27028d5a6fce708c3d
-SIZE (xpi/firefox-38.3.0/pa-IN.xpi) = 493723
-SHA256 (xpi/firefox-38.3.0/pl.xpi) = b943b81c9a350804deab5037b14c9eb21ff0381b26fb9fb150c4a3bf0ea62f6c
-SIZE (xpi/firefox-38.3.0/pl.xpi) = 406567
-SHA256 (xpi/firefox-38.3.0/pt-BR.xpi) = c461053c9c33023b6acc2eaebd231f7122b892e01dfefcbb2657c422bfe7319c
-SIZE (xpi/firefox-38.3.0/pt-BR.xpi) = 459814
-SHA256 (xpi/firefox-38.3.0/pt-PT.xpi) = 30b4ee033665b5c364cf8d4a4f21f4b1575eaffc04afa5f6949d94257aeadb14
-SIZE (xpi/firefox-38.3.0/pt-PT.xpi) = 439976
-SHA256 (xpi/firefox-38.3.0/rm.xpi) = e952371a3fc8ecc3302f0d357f76e2f1a68ead841404ac000e9bfff2db3f2c3a
-SIZE (xpi/firefox-38.3.0/rm.xpi) = 446287
-SHA256 (xpi/firefox-38.3.0/ro.xpi) = a0eef60a81db20e4414dbcffa603d62a0b14e5d0f2d5a84e800d67f7e0af3837
-SIZE (xpi/firefox-38.3.0/ro.xpi) = 494080
-SHA256 (xpi/firefox-38.3.0/ru.xpi) = 761576f89459725d0c4d9f594a594d226c539544f5bcd6cc430349bbef012480
-SIZE (xpi/firefox-38.3.0/ru.xpi) = 414418
-SHA256 (xpi/firefox-38.3.0/si.xpi) = 9ff6fe74ca153036cd3d8b10fd6f517430df24b28808af549b70f01cbc4291f7
-SIZE (xpi/firefox-38.3.0/si.xpi) = 537394
-SHA256 (xpi/firefox-38.3.0/sk.xpi) = ab2e346ac3b9f4d8b7b7ed7e72f668c44e6050a39905c93643c7ee2c37e160ef
-SIZE (xpi/firefox-38.3.0/sk.xpi) = 469436
-SHA256 (xpi/firefox-38.3.0/sl.xpi) = 3d63cd25df083ae816a0b5cc5cf9ca9f4e9bea519a48f6385400e8b7764531d6
-SIZE (xpi/firefox-38.3.0/sl.xpi) = 441594
-SHA256 (xpi/firefox-38.3.0/son.xpi) = 5fc68ae38ad84c8f475eee261930c0625402e6e6302607c9ff540014c70e0e44
-SIZE (xpi/firefox-38.3.0/son.xpi) = 449268
-SHA256 (xpi/firefox-38.3.0/sq.xpi) = 578e4919e2b66ba26fb7a8f2922d8e2a13a28459702c251986a77a0cafb19ad3
-SIZE (xpi/firefox-38.3.0/sq.xpi) = 486075
-SHA256 (xpi/firefox-38.3.0/sr.xpi) = 5e7de79f7a75219c0a5f7ad4c385c8497c1c126282202aee5a2a44d3b030d912
-SIZE (xpi/firefox-38.3.0/sr.xpi) = 479420
-SHA256 (xpi/firefox-38.3.0/sv-SE.xpi) = 01cd4582aaf949149c322c1a47a8019dca971d0c9629137d688c2b22f3ab3d9b
-SIZE (xpi/firefox-38.3.0/sv-SE.xpi) = 452632
-SHA256 (xpi/firefox-38.3.0/ta.xpi) = 38e36c769037bcd8b56b728de2349fe69766a63142a06798d9c9a617779900d3
-SIZE (xpi/firefox-38.3.0/ta.xpi) = 506606
-SHA256 (xpi/firefox-38.3.0/te.xpi) = e8ee36728838656bb0d0f743e1ea28727f631bbec17d370b6b4c09c641c15952
-SIZE (xpi/firefox-38.3.0/te.xpi) = 526253
-SHA256 (xpi/firefox-38.3.0/th.xpi) = 62528397a9b092a0a8eaaa23b29e8e0092d78dc7920e1062974cb0579898409f
-SIZE (xpi/firefox-38.3.0/th.xpi) = 534270
-SHA256 (xpi/firefox-38.3.0/tr.xpi) = bbaeb1722a9e1e6b52a7569f4b00f54f1fdf87acda88d52eda2892ab103426a7
-SIZE (xpi/firefox-38.3.0/tr.xpi) = 481076
-SHA256 (xpi/firefox-38.3.0/uk.xpi) = 60c8b03bbf4805c3ba69234fa9cb04832d05b69b0df96257421331fa676d128c
-SIZE (xpi/firefox-38.3.0/uk.xpi) = 493314
-SHA256 (xpi/firefox-38.3.0/vi.xpi) = c24aa36964a321b9cab209a0ba851ccc268db3114f9209ff742c4ec0f4e4c8c8
-SIZE (xpi/firefox-38.3.0/vi.xpi) = 467505
-SHA256 (xpi/firefox-38.3.0/xh.xpi) = 93f9e1dfe71a596ebce79affb5764ea7057a8082bac65c902511bf3b5b48b656
-SIZE (xpi/firefox-38.3.0/xh.xpi) = 450242
-SHA256 (xpi/firefox-38.3.0/zh-CN.xpi) = 1c1def4062ce15660670d7d31ee7672359fc50e9fe4b1f8d80e96f0d8adda199
-SIZE (xpi/firefox-38.3.0/zh-CN.xpi) = 488277
-SHA256 (xpi/firefox-38.3.0/zh-TW.xpi) = 1dbaae6ea46991f5298bb5c03f0926b48d77c058ff07c44601377ecbe9837be3
-SIZE (xpi/firefox-38.3.0/zh-TW.xpi) = 467844
+SHA256 (xpi/firefox-38.4.0/ach.xpi) = 367e6432d3760e7403eea1ba3f59babd7846721812d51cc952fcfed9f62773c5
+SIZE (xpi/firefox-38.4.0/ach.xpi) = 477970
+SHA256 (xpi/firefox-38.4.0/af.xpi) = d88130018dfd2909551e1fdf93ef17fde5423218a1bc75cc051eadc828861d45
+SIZE (xpi/firefox-38.4.0/af.xpi) = 483326
+SHA256 (xpi/firefox-38.4.0/an.xpi) = 46a554e2edb3d825a8831551f2c6b939f45c545fba05e3ef0be2ac3c36dbd883
+SIZE (xpi/firefox-38.4.0/an.xpi) = 461422
+SHA256 (xpi/firefox-38.4.0/ar.xpi) = aee825dee23f8aeaafe1775918d9a17384073836ef3a934c50580d9cab1116b4
+SIZE (xpi/firefox-38.4.0/ar.xpi) = 516496
+SHA256 (xpi/firefox-38.4.0/as.xpi) = e0c77be1178038fc122951f6522d9c28377c862bed0844ac7e41b6c1b57aaaec
+SIZE (xpi/firefox-38.4.0/as.xpi) = 509574
+SHA256 (xpi/firefox-38.4.0/ast.xpi) = 895e06fdf8b0bd232fe89fb5254b9c2b114ff7bd8257a3a93062ce0549a2416c
+SIZE (xpi/firefox-38.4.0/ast.xpi) = 397202
+SHA256 (xpi/firefox-38.4.0/az.xpi) = 903c9468cf859252d9201ab63b5ee430e46979eddb0b20b5e9bb7f7ef764b729
+SIZE (xpi/firefox-38.4.0/az.xpi) = 489153
+SHA256 (xpi/firefox-38.4.0/be.xpi) = 698a0ac8f2d802d55d55dfc55d6a870d9269a81e73506ba2ccbe9875e4bad00a
+SIZE (xpi/firefox-38.4.0/be.xpi) = 441057
+SHA256 (xpi/firefox-38.4.0/bg.xpi) = ed0f3767bca984504cd14925eac0a85555b794669fbab204f6b66565fe5572d4
+SIZE (xpi/firefox-38.4.0/bg.xpi) = 487819
+SHA256 (xpi/firefox-38.4.0/bn-BD.xpi) = 3b9130b35ba2dbee86e6b7cc7e1db9bf5e58ad58629c2c73ac383890602b1cf0
+SIZE (xpi/firefox-38.4.0/bn-BD.xpi) = 528690
+SHA256 (xpi/firefox-38.4.0/bn-IN.xpi) = 23e256860312a7fd7287fb9734bb4cd23a054c7658ba50d0eb0a0aa59008ed0c
+SIZE (xpi/firefox-38.4.0/bn-IN.xpi) = 527928
+SHA256 (xpi/firefox-38.4.0/br.xpi) = 4db2bb1cb2e6ed5e97c30a387e3b1ee971ea5b8f9f62314806d9256439bffafd
+SIZE (xpi/firefox-38.4.0/br.xpi) = 441962
+SHA256 (xpi/firefox-38.4.0/bs.xpi) = aac006ad04fd94454de660eb22615386659c9d7cb76a76661c87c7fe9a0ba2e6
+SIZE (xpi/firefox-38.4.0/bs.xpi) = 485305
+SHA256 (xpi/firefox-38.4.0/ca.xpi) = 9abe8bdfc09c11bddcd92f052760edad97fba5396c535b3382f2add3b0ff6834
+SIZE (xpi/firefox-38.4.0/ca.xpi) = 458092
+SHA256 (xpi/firefox-38.4.0/cs.xpi) = 7e5c23a4e3926d2dc1d21ac59d616597312e2cd92a3e13322f0a8b767ebbf1de
+SIZE (xpi/firefox-38.4.0/cs.xpi) = 446726
+SHA256 (xpi/firefox-38.4.0/cy.xpi) = cd6d186edfbfb28e9fd1a5629dbecd6f6cff3a664ef4402ba1aa6e78b0bcee94
+SIZE (xpi/firefox-38.4.0/cy.xpi) = 444385
+SHA256 (xpi/firefox-38.4.0/da.xpi) = 0c01576ce10bafc4eb825cc469487df34ec305537bf8ff0a28023b3488d6a3d6
+SIZE (xpi/firefox-38.4.0/da.xpi) = 450762
+SHA256 (xpi/firefox-38.4.0/de.xpi) = 7f69136d81c323374b0148c5d568d069824c21a550fd11df7516251982312a11
+SIZE (xpi/firefox-38.4.0/de.xpi) = 451629
+SHA256 (xpi/firefox-38.4.0/dsb.xpi) = cb3a5f1149b08ab063504d642181db5b23a31bd068d59a98a3e15e9f94934335
+SIZE (xpi/firefox-38.4.0/dsb.xpi) = 470923
+SHA256 (xpi/firefox-38.4.0/el.xpi) = 5ac04011963f07691b6406094efe3f16455c7cb952d08891e6a3d072789130e9
+SIZE (xpi/firefox-38.4.0/el.xpi) = 498370
+SHA256 (xpi/firefox-38.4.0/en-GB.xpi) = 21f4db34f3277636b6cc41be7508025e201fc9770bf962906eefeb04543a26ff
+SIZE (xpi/firefox-38.4.0/en-GB.xpi) = 437845
+SHA256 (xpi/firefox-38.4.0/en-US.xpi) = fa4b38cab1689369da78e317a2dd8aeb2c5c9575a3a3bb971118e2c9e1984f40
+SIZE (xpi/firefox-38.4.0/en-US.xpi) = 469718
+SHA256 (xpi/firefox-38.4.0/en-ZA.xpi) = 1de92cc4b659074953146880f26090d060030734b050ca4e9e99ca082930ee3f
+SIZE (xpi/firefox-38.4.0/en-ZA.xpi) = 439926
+SHA256 (xpi/firefox-38.4.0/eo.xpi) = bda681afa425465404fd3b3ee3e5ddc78da046884ad1288478f3567ad23f6cc4
+SIZE (xpi/firefox-38.4.0/eo.xpi) = 488369
+SHA256 (xpi/firefox-38.4.0/es-AR.xpi) = 39e09539cbdb65176f5f7505ed717bb6621492eaf24782a96beec3059a06c8e7
+SIZE (xpi/firefox-38.4.0/es-AR.xpi) = 453983
+SHA256 (xpi/firefox-38.4.0/es-CL.xpi) = 519db83d328d45e0617e191a03d6eeb852f6fb78266aebb7b5fb20c788d1043b
+SIZE (xpi/firefox-38.4.0/es-CL.xpi) = 384678
+SHA256 (xpi/firefox-38.4.0/es-ES.xpi) = b39ef0e44adba821e4f9ded5d5bc3fad5f6970e090453fa509b104bd84876b00
+SIZE (xpi/firefox-38.4.0/es-ES.xpi) = 374073
+SHA256 (xpi/firefox-38.4.0/es-MX.xpi) = c7db8de566c0b4d0ae916877145e0766919379c583405c5ab3f395ddae4dcab6
+SIZE (xpi/firefox-38.4.0/es-MX.xpi) = 457050
+SHA256 (xpi/firefox-38.4.0/et.xpi) = c0ac4b4ef61e1ca128b63fb88410788c9aaf54e0c6a8012be379d093f465fe07
+SIZE (xpi/firefox-38.4.0/et.xpi) = 443228
+SHA256 (xpi/firefox-38.4.0/eu.xpi) = fa7ed638416b030a54104bfaa399aee0670cbcb9066a7accd3ecb543dcfc6774
+SIZE (xpi/firefox-38.4.0/eu.xpi) = 466555
+SHA256 (xpi/firefox-38.4.0/fa.xpi) = 6229f7ff2312dba7678b51d7b63b66c76bf0f044065149393627513bb0939fb0
+SIZE (xpi/firefox-38.4.0/fa.xpi) = 518282
+SHA256 (xpi/firefox-38.4.0/ff.xpi) = acdc6ac3318a9fefa6fe86ea4449cc58b2e5fa251ee9054b65a77ba6fa6203d9
+SIZE (xpi/firefox-38.4.0/ff.xpi) = 454587
+SHA256 (xpi/firefox-38.4.0/fi.xpi) = bf1fd7170359bf1dde30bbb6e67df575ee7ac26bd26d2d3627c12688cf689dad
+SIZE (xpi/firefox-38.4.0/fi.xpi) = 444852
+SHA256 (xpi/firefox-38.4.0/fr.xpi) = 1609e9fff4c9f221553628be4d64c3d70e7b55fe0120a049d27f7aaaa129590e
+SIZE (xpi/firefox-38.4.0/fr.xpi) = 461402
+SHA256 (xpi/firefox-38.4.0/fy-NL.xpi) = e8cac9a32aea385bc389abf2e15722295de61776a4cc098e65c6b5b512d1ad89
+SIZE (xpi/firefox-38.4.0/fy-NL.xpi) = 455538
+SHA256 (xpi/firefox-38.4.0/ga-IE.xpi) = b5ac39f748c770e2208cd61a83819b42d1dff136e6dd5af230f7eea51d542ce2
+SIZE (xpi/firefox-38.4.0/ga-IE.xpi) = 469624
+SHA256 (xpi/firefox-38.4.0/gd.xpi) = 964f0c93adde0188ff3664c73ab04bb2e50201a7e4156200e4d471ef9a10772d
+SIZE (xpi/firefox-38.4.0/gd.xpi) = 454616
+SHA256 (xpi/firefox-38.4.0/gl.xpi) = 2150be83227315de82333e41e5496da5d3b823645a98404ef31d2cd98f6bd1e2
+SIZE (xpi/firefox-38.4.0/gl.xpi) = 448925
+SHA256 (xpi/firefox-38.4.0/gu-IN.xpi) = 4a6b29fc389af54c294f5cbba27780aa6a5e63329af5d1407f42ab240462099d
+SIZE (xpi/firefox-38.4.0/gu-IN.xpi) = 477980
+SHA256 (xpi/firefox-38.4.0/he.xpi) = 2fafcb398ae4ad3aab1498fd22f8ab713f966f96753301fc2385f0c5d0ab1568
+SIZE (xpi/firefox-38.4.0/he.xpi) = 486785
+SHA256 (xpi/firefox-38.4.0/hi-IN.xpi) = c2b5eed1fd8ad921f79feaca0ad43ac969e3171e8d1d579ae99c2c1c17202379
+SIZE (xpi/firefox-38.4.0/hi-IN.xpi) = 508167
+SHA256 (xpi/firefox-38.4.0/hr.xpi) = 1f2d14ece4cd0cad5cc7265a12498f669397b220b335244b70c62e826eda720d
+SIZE (xpi/firefox-38.4.0/hr.xpi) = 478272
+SHA256 (xpi/firefox-38.4.0/hsb.xpi) = ec5fa60642854beacf8a031b17f6657c55666cd2fcc025829fc94c0ceaf671a9
+SIZE (xpi/firefox-38.4.0/hsb.xpi) = 468720
+SHA256 (xpi/firefox-38.4.0/hu.xpi) = 1ae11147ddd2fcd7c4235713a19ca4a31ff6b77d313b1e139f66627b5b839cfc
+SIZE (xpi/firefox-38.4.0/hu.xpi) = 453555
+SHA256 (xpi/firefox-38.4.0/hy-AM.xpi) = e109740e0837c75732fa40c124b51355ed7cc3cd0dc4ec6a9f078298674c215b
+SIZE (xpi/firefox-38.4.0/hy-AM.xpi) = 534265
+SHA256 (xpi/firefox-38.4.0/id.xpi) = 60220cae6623614bc6b11667849ddb5f2251c4b8f4c0bacf99bfa81c4a407d4e
+SIZE (xpi/firefox-38.4.0/id.xpi) = 431489
+SHA256 (xpi/firefox-38.4.0/is.xpi) = 20e4a96ac76793eadfc43c5094f92aae81fc439fb0df94204b48bbd022df5247
+SIZE (xpi/firefox-38.4.0/is.xpi) = 485128
+SHA256 (xpi/firefox-38.4.0/it.xpi) = c3038ebd54153273d4d510dda53f144b2820944231659ad3e01dccabd53d0a6f
+SIZE (xpi/firefox-38.4.0/it.xpi) = 368409
+SHA256 (xpi/firefox-38.4.0/ja.xpi) = eed8773e7f2b2706884ef844805a3ff4d8efb20a800ed9b1359e392dc6f365e7
+SIZE (xpi/firefox-38.4.0/ja.xpi) = 479114
+SHA256 (xpi/firefox-38.4.0/kk.xpi) = 1ee8d139df0b85421f9319976200f7e982106d7dbdd13e0763e4f44748828da4
+SIZE (xpi/firefox-38.4.0/kk.xpi) = 503568
+SHA256 (xpi/firefox-38.4.0/km.xpi) = c6adbc64a942764b10f4cb44ea524d6ee3ac9fa82b23ab856abe8ebdef6c3abd
+SIZE (xpi/firefox-38.4.0/km.xpi) = 565674
+SHA256 (xpi/firefox-38.4.0/kn.xpi) = 029c65dc35f6b7e4b1f9f4ce968fd239b8a5ec79dedabff81d167fc91fffd4a3
+SIZE (xpi/firefox-38.4.0/kn.xpi) = 533464
+SHA256 (xpi/firefox-38.4.0/ko.xpi) = 89299b59c51db6b5d0d55c03df290f1b3cc2cce728e2ff21af352c2b568ea44c
+SIZE (xpi/firefox-38.4.0/ko.xpi) = 460854
+SHA256 (xpi/firefox-38.4.0/lij.xpi) = 68f9d1abd49b20a3b3bd79d4b7ace1099ab8b6d9cb094a84bcabd90cd3a4142a
+SIZE (xpi/firefox-38.4.0/lij.xpi) = 444241
+SHA256 (xpi/firefox-38.4.0/lt.xpi) = 769c238f3d90b896e6e6bc0b04ed29e348e4a60a08df49f28f943358ad036063
+SIZE (xpi/firefox-38.4.0/lt.xpi) = 486451
+SHA256 (xpi/firefox-38.4.0/lv.xpi) = 0b90f73e86ca10f69d0f06819f7fe226a84886d42f10e653133bdba67112f61a
+SIZE (xpi/firefox-38.4.0/lv.xpi) = 467198
+SHA256 (xpi/firefox-38.4.0/mai.xpi) = d62055e9c602e3d5807cd6ebca9626d2f31bea3155c59a0eb1a8c2fde746d24d
+SIZE (xpi/firefox-38.4.0/mai.xpi) = 514666
+SHA256 (xpi/firefox-38.4.0/mk.xpi) = 968070d4aee6819afbbc303e215b21afe2884a3004dc7d7696113b01423166da
+SIZE (xpi/firefox-38.4.0/mk.xpi) = 529205
+SHA256 (xpi/firefox-38.4.0/ml.xpi) = 01fa6077c6c05be1ce76db8e44b2c8462fe0a7a7818b1ddf9f6b2fa0d44c41cb
+SIZE (xpi/firefox-38.4.0/ml.xpi) = 528918
+SHA256 (xpi/firefox-38.4.0/mr.xpi) = 59ffe1bbd930b12681e2576b77e01ff4dc2aa79250e2f3f460264f8b68b6f1de
+SIZE (xpi/firefox-38.4.0/mr.xpi) = 505961
+SHA256 (xpi/firefox-38.4.0/ms.xpi) = 70dff1a3bdcdeba70d01e9e7d86191d0ad81bd1cf064e98b227f1734222e0729
+SIZE (xpi/firefox-38.4.0/ms.xpi) = 489872
+SHA256 (xpi/firefox-38.4.0/nb-NO.xpi) = 61c1be8e542963a86a799a1842557e334d62d0121ee259ce52eb701d938db2d7
+SIZE (xpi/firefox-38.4.0/nb-NO.xpi) = 444176
+SHA256 (xpi/firefox-38.4.0/nl.xpi) = 6f09424512979109b8e2292de57fedb9753d293d550f35114402630b7fc93340
+SIZE (xpi/firefox-38.4.0/nl.xpi) = 443994
+SHA256 (xpi/firefox-38.4.0/nn-NO.xpi) = 6e90022dbfdba748891f6e28582cab5a4b0287dd0c46774f9020250097eff4d1
+SIZE (xpi/firefox-38.4.0/nn-NO.xpi) = 438451
+SHA256 (xpi/firefox-38.4.0/or.xpi) = 3866337ad94d5ece643389ed7654d266d14b689674b92fbe4f87db1a11608419
+SIZE (xpi/firefox-38.4.0/or.xpi) = 527049
+SHA256 (xpi/firefox-38.4.0/pa-IN.xpi) = c39aeb6943b6e9a83d5f2d499683e8125cbe4a585b3c14bf357664def646cb81
+SIZE (xpi/firefox-38.4.0/pa-IN.xpi) = 493722
+SHA256 (xpi/firefox-38.4.0/pl.xpi) = cd5d694904802f1aa51d84390423f37500bbe6d2864e47bc0e09d2bc19a2c54d
+SIZE (xpi/firefox-38.4.0/pl.xpi) = 406566
+SHA256 (xpi/firefox-38.4.0/pt-BR.xpi) = 4ccd547e9ac19788c99ae876bd829e349e22be55aa9c2e194547d6986aa20209
+SIZE (xpi/firefox-38.4.0/pt-BR.xpi) = 459813
+SHA256 (xpi/firefox-38.4.0/pt-PT.xpi) = eed43d8ae9b455983b05e288f7368114b6caf92ff801b1fd22e4bbc49bbb7288
+SIZE (xpi/firefox-38.4.0/pt-PT.xpi) = 439975
+SHA256 (xpi/firefox-38.4.0/rm.xpi) = 5d91ca7d0f27ecee359d0a49be2d26219d15b985cee981fcb64c0bc0c4ba0022
+SIZE (xpi/firefox-38.4.0/rm.xpi) = 446287
+SHA256 (xpi/firefox-38.4.0/ro.xpi) = fe39cc3c54be8647bce103e6c0f04e8ebbe842a65e3c916aa82660f1b4a1cfe6
+SIZE (xpi/firefox-38.4.0/ro.xpi) = 494079
+SHA256 (xpi/firefox-38.4.0/ru.xpi) = b31e7ffac7efc34e4d1672095f716f0cba43860fac1e596b7023be78a8306b74
+SIZE (xpi/firefox-38.4.0/ru.xpi) = 414419
+SHA256 (xpi/firefox-38.4.0/si.xpi) = 50692d44a2f2952a3dacd36f34c6b34e85cd16d9d13f795719e86e8afd59d62c
+SIZE (xpi/firefox-38.4.0/si.xpi) = 537393
+SHA256 (xpi/firefox-38.4.0/sk.xpi) = 245d5150c762c0c7206dd2f8869b2a8a8b734d0b48ece4985d332815ba71691d
+SIZE (xpi/firefox-38.4.0/sk.xpi) = 469436
+SHA256 (xpi/firefox-38.4.0/sl.xpi) = 84f23d6d865f70f1e6701ac34bdf4f894f20d31fb098cbadb4bc0a3d7182e60c
+SIZE (xpi/firefox-38.4.0/sl.xpi) = 441594
+SHA256 (xpi/firefox-38.4.0/son.xpi) = 75ef6f5fba0b8174ce1d6415579b57153bf60551e89c05632dea43e5a6044a96
+SIZE (xpi/firefox-38.4.0/son.xpi) = 449268
+SHA256 (xpi/firefox-38.4.0/sq.xpi) = 4e9da99e5dd7b2fbb5e5627c91415ef39d1fca7e7ae1a423bb5830b37bc423e9
+SIZE (xpi/firefox-38.4.0/sq.xpi) = 486075
+SHA256 (xpi/firefox-38.4.0/sr.xpi) = 2447105f3d0850f8d7aa402196ed34df8e5dcb52291900dc03f1d79f04ffd1cd
+SIZE (xpi/firefox-38.4.0/sr.xpi) = 479419
+SHA256 (xpi/firefox-38.4.0/sv-SE.xpi) = cb330410d3894b7b786be927d94eda5f9cb606682ee5cd3ca44eaed5a5a36dae
+SIZE (xpi/firefox-38.4.0/sv-SE.xpi) = 452632
+SHA256 (xpi/firefox-38.4.0/ta.xpi) = 5ed639206c9b42064972edd8296163ebb517843aafab2cd6d5e1dbc2ae72af89
+SIZE (xpi/firefox-38.4.0/ta.xpi) = 506606
+SHA256 (xpi/firefox-38.4.0/te.xpi) = e8d4352c5aae8a0134eaef285d1a29264ecde26362725fecdfa156033353e834
+SIZE (xpi/firefox-38.4.0/te.xpi) = 526253
+SHA256 (xpi/firefox-38.4.0/th.xpi) = 2404ecfd24b2dbbcad006316599a6f2cceb687cdfca97186f2756c4a2dcfb257
+SIZE (xpi/firefox-38.4.0/th.xpi) = 534270
+SHA256 (xpi/firefox-38.4.0/tr.xpi) = f57103f13eabc494778c281d8d0eaf81a9a9c63f09ae5bdb8a3eacbdcb00a05e
+SIZE (xpi/firefox-38.4.0/tr.xpi) = 481076
+SHA256 (xpi/firefox-38.4.0/uk.xpi) = f518976f47472b555834208eb190cb13cc3e625a0f2784d35e1c70d58ce5d991
+SIZE (xpi/firefox-38.4.0/uk.xpi) = 493313
+SHA256 (xpi/firefox-38.4.0/vi.xpi) = 44b50cdaa3d51520fa546b3afd7fae9d872567e25344666938773b1f3e2623bb
+SIZE (xpi/firefox-38.4.0/vi.xpi) = 467504
+SHA256 (xpi/firefox-38.4.0/xh.xpi) = 46d94a693d96f4a920aa8401a58eb6a96cff21aa9aba54fecf2c8c0987b4caa0
+SIZE (xpi/firefox-38.4.0/xh.xpi) = 450242
+SHA256 (xpi/firefox-38.4.0/zh-CN.xpi) = e981e5a29a7fcd9752ebddb587ea57ca64d67363ab2b77d9ca477f58f8789a3c
+SIZE (xpi/firefox-38.4.0/zh-CN.xpi) = 488276
+SHA256 (xpi/firefox-38.4.0/zh-TW.xpi) = 5f2e8226cbe93c1f7082b21725bd87ca66ebd20f2429e7c65ae43490eeb5f447
+SIZE (xpi/firefox-38.4.0/zh-TW.xpi) = 467843
diff --git a/www/firefox-esr/Makefile b/www/firefox-esr/Makefile
index 58c403ece77d..32dc5f6014b8 100644
--- a/www/firefox-esr/Makefile
+++ b/www/firefox-esr/Makefile
@@ -2,9 +2,8 @@
# $FreeBSD$
PORTNAME= firefox
-DISTVERSION= 38.3.0
+DISTVERSION= 38.4.0
DISTVERSIONSUFFIX=esr.source
-PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= www ipv6
MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}esr/source \
@@ -14,8 +13,8 @@ PKGNAMESUFFIX= -esr
MAINTAINER= gecko@FreeBSD.org
COMMENT= Web browser based on the browser portion of Mozilla
-BUILD_DEPENDS= nspr>=4.10.8:${PORTSDIR}/devel/nspr \
- nss>=3.19.2:${PORTSDIR}/security/nss \
+BUILD_DEPENDS= nspr>=4.10.10:${PORTSDIR}/devel/nspr \
+ nss>=3.19.2.1:${PORTSDIR}/security/nss \
libevent2>=2.0.21_2:${PORTSDIR}/devel/libevent2 \
soundtouch>=1.8.0:${PORTSDIR}/audio/soundtouch \
harfbuzz>=0.9.34:${PORTSDIR}/print/harfbuzz \
@@ -34,7 +33,7 @@ LIB_DEPENDS= libv4l2.so:${PORTSDIR}/multimedia/libv4l
USE_GECKO= gecko
CPE_PRODUCT= ${PORTNAME}_esr
-CONFLICTS_INSTALL= firefox-4[0-4].* firefox-3[02-9].* firefox-2[0-35-9].*
+CONFLICTS_INSTALL= firefox-4[0-46-9].* firefox-3[02-9].* firefox-2[0-35-9].*
MOZ_PKGCONFIG_FILES= # empty
USE_MOZILLA= -opus
MOZILLA_NAME= Firefox
diff --git a/www/firefox-esr/distinfo b/www/firefox-esr/distinfo
index 0ff598db0d1b..2abd10b1a918 100644
--- a/www/firefox-esr/distinfo
+++ b/www/firefox-esr/distinfo
@@ -1,2 +1,2 @@
-SHA256 (firefox-38.3.0esr.source.tar.bz2) = 809f65502d256568220c52bfe09646588f21653c8c487e8018b10ff87ca67f1c
-SIZE (firefox-38.3.0esr.source.tar.bz2) = 181401628
+SHA256 (firefox-38.4.0esr.source.tar.bz2) = 028a1f7ce16b3016b0d98e5a5ef73bcb3f732b80d406e54f49e3c246e207f2c7
+SIZE (firefox-38.4.0esr.source.tar.bz2) = 181383793
diff --git a/www/firefox-i18n/Makefile b/www/firefox-i18n/Makefile
index 2569379a4f6f..604ab832e603 100644
--- a/www/firefox-i18n/Makefile
+++ b/www/firefox-i18n/Makefile
@@ -2,10 +2,10 @@
# $FreeBSD$
PORTNAME= firefox-i18n
-PORTVERSION= 41.0.2
+PORTVERSION= 42.0
CATEGORIES= www
MASTER_SITES= MOZILLA/${PORTNAME:S|-i18n||}/releases/${DISTVERSION}/linux-i686/xpi \
- MOZILLA/${PORTNAME:S|-i18n||}/candidates/${DISTVERSION}-candidates/build1/linux-i686/xpi
+ MOZILLA/${PORTNAME:S|-i18n||}/candidates/${DISTVERSION}-candidates/build2/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:${PORTSDIR}/archivers/zip
-USES= zip:infozip gecko:firefox,41,build
+USES= zip:infozip gecko:firefox,42,build
USE_XPI= firefox linux-firefox
NO_ARCH= yes
diff --git a/www/firefox-i18n/distinfo b/www/firefox-i18n/distinfo
index 4683052f974d..392eb32c2c90 100644
--- a/www/firefox-i18n/distinfo
+++ b/www/firefox-i18n/distinfo
@@ -1,178 +1,178 @@
-SHA256 (xpi/firefox-i18n-41.0.2/ach.xpi) = 3b332869d2deaf179015e59edc3f6c7ee0338018ae0c542d173f0805bfc22064
-SIZE (xpi/firefox-i18n-41.0.2/ach.xpi) = 483441
-SHA256 (xpi/firefox-i18n-41.0.2/af.xpi) = 483ebf4ad220bc63b00fc5ed14cc0daa5093e8618a1f766e27ef7ea702d88404
-SIZE (xpi/firefox-i18n-41.0.2/af.xpi) = 486122
-SHA256 (xpi/firefox-i18n-41.0.2/an.xpi) = 141e88b1570061128d7538b86f8a506c9ade736532127615470ab52d2305b43b
-SIZE (xpi/firefox-i18n-41.0.2/an.xpi) = 464518
-SHA256 (xpi/firefox-i18n-41.0.2/ar.xpi) = fbe22a9b348c6a822c7578392d65f229be88da6d03908160ff1c84dc0712884f
-SIZE (xpi/firefox-i18n-41.0.2/ar.xpi) = 521161
-SHA256 (xpi/firefox-i18n-41.0.2/as.xpi) = 95b7be1a421bd70d66f6564df38692230a6cbbcac8f9f49be8ec0a8fd1c11beb
-SIZE (xpi/firefox-i18n-41.0.2/as.xpi) = 511220
-SHA256 (xpi/firefox-i18n-41.0.2/ast.xpi) = ab8e967adfefe0e91290f72617a073790ef279485c06745f9541b329db8051b7
-SIZE (xpi/firefox-i18n-41.0.2/ast.xpi) = 399124
-SHA256 (xpi/firefox-i18n-41.0.2/az.xpi) = b4427e377344c51f76b3707bfbf81d1f7a2bdd507dd06794cfd39a24de9e9017
-SIZE (xpi/firefox-i18n-41.0.2/az.xpi) = 492918
-SHA256 (xpi/firefox-i18n-41.0.2/be.xpi) = c225c0927f0855462c4157c3cdcb89660202c1dc16689a66ad8be7cef837fefd
-SIZE (xpi/firefox-i18n-41.0.2/be.xpi) = 453405
-SHA256 (xpi/firefox-i18n-41.0.2/bg.xpi) = 7a8f79c1d0b2ec0a5838d2b94c0c920e7143d1be8186122663853ac9748a088d
-SIZE (xpi/firefox-i18n-41.0.2/bg.xpi) = 492967
-SHA256 (xpi/firefox-i18n-41.0.2/bn-BD.xpi) = dafbf53ff047ccd787c6996989126feb4749b4569967d47bd6fba56f51055e43
-SIZE (xpi/firefox-i18n-41.0.2/bn-BD.xpi) = 527572
-SHA256 (xpi/firefox-i18n-41.0.2/bn-IN.xpi) = e12b7af83786242d78b28b6e398db791fe336bfda9cecde66b0275feabca0dca
-SIZE (xpi/firefox-i18n-41.0.2/bn-IN.xpi) = 530270
-SHA256 (xpi/firefox-i18n-41.0.2/br.xpi) = f1b321fa81746f334c795555d6cc5e6196462a22bcd4e2f8092a413209ab1bb8
-SIZE (xpi/firefox-i18n-41.0.2/br.xpi) = 444532
-SHA256 (xpi/firefox-i18n-41.0.2/bs.xpi) = f0998f8e15698245757ce27b5b91bc228b3dc7e182029594f500cc7b6bb0ae03
-SIZE (xpi/firefox-i18n-41.0.2/bs.xpi) = 486282
-SHA256 (xpi/firefox-i18n-41.0.2/ca.xpi) = a81e043f4cae9e5aba31e904899d57aaf55001a4f7f1967e6262aa2632b7f3e8
-SIZE (xpi/firefox-i18n-41.0.2/ca.xpi) = 461322
-SHA256 (xpi/firefox-i18n-41.0.2/cs.xpi) = 3dd5156b50781e20caac4c96c42631f60c0c8d06a28f7e495f17bb43dff60bc0
-SIZE (xpi/firefox-i18n-41.0.2/cs.xpi) = 450334
-SHA256 (xpi/firefox-i18n-41.0.2/cy.xpi) = 93a3c98479aa4be8531e4665eef9b0051605cf1d4c897147b223e1a350a3221a
-SIZE (xpi/firefox-i18n-41.0.2/cy.xpi) = 448184
-SHA256 (xpi/firefox-i18n-41.0.2/da.xpi) = 5cac7e3161cc1fc01cc22ba9b9f10a58dd111c241c5305589249987643877ad0
-SIZE (xpi/firefox-i18n-41.0.2/da.xpi) = 453404
-SHA256 (xpi/firefox-i18n-41.0.2/de.xpi) = d7d0130fe5dfadaffd2585665e53390dae2572209176070d810345145f9a86cf
-SIZE (xpi/firefox-i18n-41.0.2/de.xpi) = 455711
-SHA256 (xpi/firefox-i18n-41.0.2/dsb.xpi) = f59b75f1a340a80ac4ddb781d77a3e3bf102496677828446aa2a79064195f41c
-SIZE (xpi/firefox-i18n-41.0.2/dsb.xpi) = 474538
-SHA256 (xpi/firefox-i18n-41.0.2/el.xpi) = 36719f38269d0819ea05fe2a46c89cb4bd2859d26a740c46901e94e4bbd40175
-SIZE (xpi/firefox-i18n-41.0.2/el.xpi) = 501621
-SHA256 (xpi/firefox-i18n-41.0.2/en-GB.xpi) = 0c0029261b1f446e33aca64a3b6d42d5da1d3399770c3ace221d37fd44a9ca83
-SIZE (xpi/firefox-i18n-41.0.2/en-GB.xpi) = 441099
-SHA256 (xpi/firefox-i18n-41.0.2/en-US.xpi) = cb7eab8536840a63409b5480170046227540d89f1973d121f713e1d59240f150
-SIZE (xpi/firefox-i18n-41.0.2/en-US.xpi) = 471247
-SHA256 (xpi/firefox-i18n-41.0.2/en-ZA.xpi) = 830d11b44164e2a92a9bd68fb7b85b095de7e4fc2ea92bae1fa316688868b695
-SIZE (xpi/firefox-i18n-41.0.2/en-ZA.xpi) = 444146
-SHA256 (xpi/firefox-i18n-41.0.2/eo.xpi) = 2aa44595d2745809a989a533584de0ad4f3c63de2e1b5b8536645b5e05d88b28
-SIZE (xpi/firefox-i18n-41.0.2/eo.xpi) = 487996
-SHA256 (xpi/firefox-i18n-41.0.2/es-AR.xpi) = 2c70f52a537657073bc02530015a950c08d8248033426af2678e99c6680ec25c
-SIZE (xpi/firefox-i18n-41.0.2/es-AR.xpi) = 456519
-SHA256 (xpi/firefox-i18n-41.0.2/es-CL.xpi) = d1cf2f9c65022cdc241ddaa168054467a53f32542744f79e85a8ee986bc4df4c
-SIZE (xpi/firefox-i18n-41.0.2/es-CL.xpi) = 381634
-SHA256 (xpi/firefox-i18n-41.0.2/es-ES.xpi) = 719cbe56de47866677d1102dd3f962be403339f8979eaac619c5c8c2eceaecb3
-SIZE (xpi/firefox-i18n-41.0.2/es-ES.xpi) = 370112
-SHA256 (xpi/firefox-i18n-41.0.2/es-MX.xpi) = e55cd314abaa79123fec2bf8bae49afaf8771065c0698ac0ba996844bd608457
-SIZE (xpi/firefox-i18n-41.0.2/es-MX.xpi) = 460285
-SHA256 (xpi/firefox-i18n-41.0.2/et.xpi) = aa542ee5e33cbe402819741ded10402fa8e9f962cdb877cfbabf1d84290d982c
-SIZE (xpi/firefox-i18n-41.0.2/et.xpi) = 445440
-SHA256 (xpi/firefox-i18n-41.0.2/eu.xpi) = e489687bff01f23761a2419d406885d0d0f21c9c5837994698ac037720a85145
-SIZE (xpi/firefox-i18n-41.0.2/eu.xpi) = 469718
-SHA256 (xpi/firefox-i18n-41.0.2/fa.xpi) = 229d1e5c884b8efdccb591d2b7a10cb58926bfab8c1bd4a71c3eb1aa155a1050
-SIZE (xpi/firefox-i18n-41.0.2/fa.xpi) = 516159
-SHA256 (xpi/firefox-i18n-41.0.2/ff.xpi) = d09fa597de20f69d7332a63abafd97edfada4b42a9f4e3cd55b2720adb644120
-SIZE (xpi/firefox-i18n-41.0.2/ff.xpi) = 454689
-SHA256 (xpi/firefox-i18n-41.0.2/fi.xpi) = 9e8a4e9446f614cafa6a7d712e6111f8443c255c5ed37fb2b67fc4936fa71c8c
-SIZE (xpi/firefox-i18n-41.0.2/fi.xpi) = 447176
-SHA256 (xpi/firefox-i18n-41.0.2/fr.xpi) = fae768e7985278c934aefcdb00276e8c78b68ec84ef6247a83071be23f29a508
-SIZE (xpi/firefox-i18n-41.0.2/fr.xpi) = 465093
-SHA256 (xpi/firefox-i18n-41.0.2/fy-NL.xpi) = 2b44c34009035ce1b2745d2ad7a8e33075816064c5211ec2d7e1a952ae4ca448
-SIZE (xpi/firefox-i18n-41.0.2/fy-NL.xpi) = 458776
-SHA256 (xpi/firefox-i18n-41.0.2/ga-IE.xpi) = 9fcc57c31db1d99c10fc97836ab1c194f24ed9766e07f164f6696b63b0fe2c76
-SIZE (xpi/firefox-i18n-41.0.2/ga-IE.xpi) = 473257
-SHA256 (xpi/firefox-i18n-41.0.2/gd.xpi) = dca6278f751731680bc8c59d021e26f19a208e9c161721d9964ef12b400cc57a
-SIZE (xpi/firefox-i18n-41.0.2/gd.xpi) = 457499
-SHA256 (xpi/firefox-i18n-41.0.2/gl.xpi) = 535273fc56ea8f96808e89946e4a9fe35b5aaffc8e519586a28bae82757048ad
-SIZE (xpi/firefox-i18n-41.0.2/gl.xpi) = 452612
-SHA256 (xpi/firefox-i18n-41.0.2/gu-IN.xpi) = f35c50d2ed63af609b30e6f156b41313fe94597e387ddb1383e7805eedc603a8
-SIZE (xpi/firefox-i18n-41.0.2/gu-IN.xpi) = 487515
-SHA256 (xpi/firefox-i18n-41.0.2/he.xpi) = 999eab777e50e805afe8c6e56316debe7f975f2f4767a84abeec91ba93177551
-SIZE (xpi/firefox-i18n-41.0.2/he.xpi) = 486490
-SHA256 (xpi/firefox-i18n-41.0.2/hi-IN.xpi) = f71970e0324daed4cd7138bffe6eb1dc6188abfb3318c2ce05b64f8e49bb1c7d
-SIZE (xpi/firefox-i18n-41.0.2/hi-IN.xpi) = 509163
-SHA256 (xpi/firefox-i18n-41.0.2/hr.xpi) = ab287bef0714c86b94b470c780fd67de6be945b3bc6b7621c2ed2592892978be
-SIZE (xpi/firefox-i18n-41.0.2/hr.xpi) = 481336
-SHA256 (xpi/firefox-i18n-41.0.2/hsb.xpi) = 2ea56c387173b14dd9a869126681306acd71c2113c8e175c80d1b98bced01b5d
-SIZE (xpi/firefox-i18n-41.0.2/hsb.xpi) = 472167
-SHA256 (xpi/firefox-i18n-41.0.2/hu.xpi) = decd311d7ac7627bf08826f7f4aa6950027737248aa3ce27b90e71c4e36e475b
-SIZE (xpi/firefox-i18n-41.0.2/hu.xpi) = 457035
-SHA256 (xpi/firefox-i18n-41.0.2/hy-AM.xpi) = 40f60779decf80bc7700c90a82ec2a5fbc0aa1abfd42a5f0c682b32abb01773f
-SIZE (xpi/firefox-i18n-41.0.2/hy-AM.xpi) = 538341
-SHA256 (xpi/firefox-i18n-41.0.2/id.xpi) = 753cc258df6a78e53a0d8ce45b512b13a71e1abdf2e9982dd60090271ac33ad9
-SIZE (xpi/firefox-i18n-41.0.2/id.xpi) = 433972
-SHA256 (xpi/firefox-i18n-41.0.2/is.xpi) = 6e1b57592d0d7e3f8436413d74563deed7d84b61e3c70f4ec39b9fb0eccbf83f
-SIZE (xpi/firefox-i18n-41.0.2/is.xpi) = 488113
-SHA256 (xpi/firefox-i18n-41.0.2/it.xpi) = 1baa5e11d2eb38e55a71ad38a1418bdf5328cd1c264cb4dd2b9a491f796a69af
-SIZE (xpi/firefox-i18n-41.0.2/it.xpi) = 363986
-SHA256 (xpi/firefox-i18n-41.0.2/ja.xpi) = 344b5893cee511bf143954a9280778888c8f8357a13ddd8985e682b62c3deae6
-SIZE (xpi/firefox-i18n-41.0.2/ja.xpi) = 483304
-SHA256 (xpi/firefox-i18n-41.0.2/kk.xpi) = 32ad8ce5f3d8e2fc06d2fbedf92dbbc125ffb7b70db92d75906587d5897d570e
-SIZE (xpi/firefox-i18n-41.0.2/kk.xpi) = 508365
-SHA256 (xpi/firefox-i18n-41.0.2/km.xpi) = d7d37587be6f9fc03b6a40073fcb256cbc50c4b99beda32c2478763fea786e4c
-SIZE (xpi/firefox-i18n-41.0.2/km.xpi) = 571709
-SHA256 (xpi/firefox-i18n-41.0.2/kn.xpi) = c6351d7aaebcb32763589185be4bd11a7e397feb19de97ad15033605a6e3b95d
-SIZE (xpi/firefox-i18n-41.0.2/kn.xpi) = 539238
-SHA256 (xpi/firefox-i18n-41.0.2/ko.xpi) = acd6cd30ca2a6fd958090cd2479dfbb43e21d0e3985a39206d939f5c4e2a3697
-SIZE (xpi/firefox-i18n-41.0.2/ko.xpi) = 464905
-SHA256 (xpi/firefox-i18n-41.0.2/lij.xpi) = f436be27b037e20e43656e12ac130f6852be20ed7023c7a538f809bf6a571579
-SIZE (xpi/firefox-i18n-41.0.2/lij.xpi) = 451194
-SHA256 (xpi/firefox-i18n-41.0.2/lt.xpi) = 5563a4698e9638f68a9ebf488784dc51c6fd0c3daef4720fb85be852ecf454b3
-SIZE (xpi/firefox-i18n-41.0.2/lt.xpi) = 490119
-SHA256 (xpi/firefox-i18n-41.0.2/lv.xpi) = bdc3c617ee7a09f8aed475095c49e92eec9994ca2a78417596bf8ecc80ecd8eb
-SIZE (xpi/firefox-i18n-41.0.2/lv.xpi) = 470365
-SHA256 (xpi/firefox-i18n-41.0.2/mai.xpi) = fdbb724710d2f1ed3e7dae9be8ef27b4cf89af14b1b9ca022798d1e148fd44aa
-SIZE (xpi/firefox-i18n-41.0.2/mai.xpi) = 517161
-SHA256 (xpi/firefox-i18n-41.0.2/mk.xpi) = 28630b55e19e64b1a352a0f8520c74c47c109669dd0c8808b7f821e7db23c6c2
-SIZE (xpi/firefox-i18n-41.0.2/mk.xpi) = 530866
-SHA256 (xpi/firefox-i18n-41.0.2/ml.xpi) = ca41ab32a883c8ea15423b5ddfe70f84e699c110510ea5bb6aa686a7e4d849f1
-SIZE (xpi/firefox-i18n-41.0.2/ml.xpi) = 529032
-SHA256 (xpi/firefox-i18n-41.0.2/mr.xpi) = 8b0c214f69b0616a20e43dd2008b8a98a17cd81337ff463d3f3989d8c53720f9
-SIZE (xpi/firefox-i18n-41.0.2/mr.xpi) = 511325
-SHA256 (xpi/firefox-i18n-41.0.2/ms.xpi) = e78f4cb5c455803e2d8ee288f1332dd9cfd71995e07d5abdb192c1a14554ed4f
-SIZE (xpi/firefox-i18n-41.0.2/ms.xpi) = 493484
-SHA256 (xpi/firefox-i18n-41.0.2/nb-NO.xpi) = a03636d86a7c1c889ad13b55c7f3b51acc611bc8eaf239a24096600772f5b0fb
-SIZE (xpi/firefox-i18n-41.0.2/nb-NO.xpi) = 446372
-SHA256 (xpi/firefox-i18n-41.0.2/nl.xpi) = 84f8b2409d757f958ad2e8f4fd0a22a1d970972f532f18e13662b3216ce00a3d
-SIZE (xpi/firefox-i18n-41.0.2/nl.xpi) = 446547
-SHA256 (xpi/firefox-i18n-41.0.2/nn-NO.xpi) = 55fb43569f6732f83381c1c98c7aaa9d910a2ca736f968d5e5be1307a6adae02
-SIZE (xpi/firefox-i18n-41.0.2/nn-NO.xpi) = 442562
-SHA256 (xpi/firefox-i18n-41.0.2/or.xpi) = 2894a6ab898304623de57ea34650e7a3aa2e5cf712f1f72c7c80156c173660a0
-SIZE (xpi/firefox-i18n-41.0.2/or.xpi) = 528106
-SHA256 (xpi/firefox-i18n-41.0.2/pa-IN.xpi) = 7703f4bc3520ed927742a1395c7d5a8783cb859406f37be521f593cc0927c588
-SIZE (xpi/firefox-i18n-41.0.2/pa-IN.xpi) = 498583
-SHA256 (xpi/firefox-i18n-41.0.2/pl.xpi) = 234067974ece5ee3cdec275236d0300425b255d172983e96f8ad28d5ebf490d3
-SIZE (xpi/firefox-i18n-41.0.2/pl.xpi) = 400466
-SHA256 (xpi/firefox-i18n-41.0.2/pt-BR.xpi) = 9f3cbce24801b9c123d31b5f9d5ecaffa17deca8fc48660a0361279882450a24
-SIZE (xpi/firefox-i18n-41.0.2/pt-BR.xpi) = 463059
-SHA256 (xpi/firefox-i18n-41.0.2/pt-PT.xpi) = 56f32e241341cb2ec49f8f5126172d9a300f14790303dc4bee516eb41204176c
-SIZE (xpi/firefox-i18n-41.0.2/pt-PT.xpi) = 443383
-SHA256 (xpi/firefox-i18n-41.0.2/rm.xpi) = 3df17252f03697206305cd7e9b62f26eeffcba84b5e195263d4d47e0c0c0d0cb
-SIZE (xpi/firefox-i18n-41.0.2/rm.xpi) = 450640
-SHA256 (xpi/firefox-i18n-41.0.2/ro.xpi) = 9bc4c4e037de7073614fbf28ac9ea0168bec75c1b270289a1455674de85b60a2
-SIZE (xpi/firefox-i18n-41.0.2/ro.xpi) = 497507
-SHA256 (xpi/firefox-i18n-41.0.2/ru.xpi) = 1ff21845c49dea827abec9cc4641a3aee002f640539af985f88eb40be077aeb5
-SIZE (xpi/firefox-i18n-41.0.2/ru.xpi) = 412447
-SHA256 (xpi/firefox-i18n-41.0.2/si.xpi) = ac952730b5591f503cfb30efbc25dfce92f54529413e39ae88ff30010da098e2
-SIZE (xpi/firefox-i18n-41.0.2/si.xpi) = 537934
-SHA256 (xpi/firefox-i18n-41.0.2/sk.xpi) = f4ad85d1fe87aa2ef449a1f5a5de2b59b4867c1e8f854464154edf4f2f39c138
-SIZE (xpi/firefox-i18n-41.0.2/sk.xpi) = 472935
-SHA256 (xpi/firefox-i18n-41.0.2/sl.xpi) = 43eb2da1524e905740782567ae9dfa5a4adbeec2ec04ef93a8cb3f7d570982c5
-SIZE (xpi/firefox-i18n-41.0.2/sl.xpi) = 445746
-SHA256 (xpi/firefox-i18n-41.0.2/son.xpi) = 88b3a01be297e83a99ca9bcc4643184d9bbccd19d1ac116995acacfc13a58486
-SIZE (xpi/firefox-i18n-41.0.2/son.xpi) = 453253
-SHA256 (xpi/firefox-i18n-41.0.2/sq.xpi) = fae5953665c35ffc5171830ccabeb21bd1692abb67d42633f8de4e909b12dcf2
-SIZE (xpi/firefox-i18n-41.0.2/sq.xpi) = 491168
-SHA256 (xpi/firefox-i18n-41.0.2/sr.xpi) = ce99e8e6b04601855de447bbfcc7b00fe626e1e3e06c60a132e87c7cabf5d017
-SIZE (xpi/firefox-i18n-41.0.2/sr.xpi) = 482971
-SHA256 (xpi/firefox-i18n-41.0.2/sv-SE.xpi) = fb86b719756909ee167bb2ddfa399d5afaf9393100245065ec84b81fadcbf5da
-SIZE (xpi/firefox-i18n-41.0.2/sv-SE.xpi) = 455382
-SHA256 (xpi/firefox-i18n-41.0.2/ta.xpi) = 7c077f044283b145ce62680981bb1f2631f918813d5e389489f0a209a0d72df0
-SIZE (xpi/firefox-i18n-41.0.2/ta.xpi) = 509544
-SHA256 (xpi/firefox-i18n-41.0.2/te.xpi) = 93ed5ffa7e4533bc406bc8a86c000bdd9fc098e9a65c729ce9fca5cce8f177ba
-SIZE (xpi/firefox-i18n-41.0.2/te.xpi) = 530204
-SHA256 (xpi/firefox-i18n-41.0.2/th.xpi) = e9144da3dcc69956e0c6b4223afcf483941858e3d9dd8dc94ead6c062a9d098b
-SIZE (xpi/firefox-i18n-41.0.2/th.xpi) = 539600
-SHA256 (xpi/firefox-i18n-41.0.2/tr.xpi) = 45225ade5b3311689b6372c7e45b765a6e58d2047750c5f4a1b906bccd903d70
-SIZE (xpi/firefox-i18n-41.0.2/tr.xpi) = 484232
-SHA256 (xpi/firefox-i18n-41.0.2/uk.xpi) = d94b1aafe66728445d1a886bbf2cf05bc3d56c3ab9dd892ad5f37b3f32d3763f
-SIZE (xpi/firefox-i18n-41.0.2/uk.xpi) = 500110
-SHA256 (xpi/firefox-i18n-41.0.2/uz.xpi) = 555465a0162d8b2b3fbc1f69d944d0fc94cd642cbac584ed30664cffebaa964b
-SIZE (xpi/firefox-i18n-41.0.2/uz.xpi) = 501948
-SHA256 (xpi/firefox-i18n-41.0.2/vi.xpi) = c296449a51d669439369f63aa943f55bf6cfaab901ac033322e137afe7bdeae6
-SIZE (xpi/firefox-i18n-41.0.2/vi.xpi) = 470336
-SHA256 (xpi/firefox-i18n-41.0.2/xh.xpi) = 8e145e9ccfde00cf0ab3da91ea4686893e274f3fb5e4da460b44ce201c714f70
-SIZE (xpi/firefox-i18n-41.0.2/xh.xpi) = 450079
-SHA256 (xpi/firefox-i18n-41.0.2/zh-CN.xpi) = 8c49c52b80937a00da8953ecb1bdd1c6505efb62ac89beb879c400846b7f8c85
-SIZE (xpi/firefox-i18n-41.0.2/zh-CN.xpi) = 486222
-SHA256 (xpi/firefox-i18n-41.0.2/zh-TW.xpi) = a1b3661c004ead49b5b1adac7515de402319ae82b06121313deb51b1ec7fcb20
-SIZE (xpi/firefox-i18n-41.0.2/zh-TW.xpi) = 479033
+SHA256 (xpi/firefox-i18n-42.0/ach.xpi) = 80b7f285d462ea72b49e482519c8d6265ad4767e89b1bfdc2e2d82eabff45be8
+SIZE (xpi/firefox-i18n-42.0/ach.xpi) = 484101
+SHA256 (xpi/firefox-i18n-42.0/af.xpi) = 087fc72613b98336eefc5db701b361188d7e3950365650651c2b53ced362eea6
+SIZE (xpi/firefox-i18n-42.0/af.xpi) = 491004
+SHA256 (xpi/firefox-i18n-42.0/an.xpi) = 7b99498a270e20066f9791e92841ee61a1da88b883c36e611cfe79a4abeb7285
+SIZE (xpi/firefox-i18n-42.0/an.xpi) = 469526
+SHA256 (xpi/firefox-i18n-42.0/ar.xpi) = c4bd2e007fffa25743e8f20f70baf3abcef6aee59b82fc1360a9a2ebf120da69
+SIZE (xpi/firefox-i18n-42.0/ar.xpi) = 527045
+SHA256 (xpi/firefox-i18n-42.0/as.xpi) = 397f51b49a9a5c754079561e5245e2e61508e61b1f1386e80fb9aaa91b4424c8
+SIZE (xpi/firefox-i18n-42.0/as.xpi) = 516804
+SHA256 (xpi/firefox-i18n-42.0/ast.xpi) = a6dd8e3b2439f047c8aa929050df202b1128f54a01c7d55e86a0d582c4372096
+SIZE (xpi/firefox-i18n-42.0/ast.xpi) = 409860
+SHA256 (xpi/firefox-i18n-42.0/az.xpi) = fe56a7bd0694dd42946cfc1723c4c7d2075f2588baff2ca742afd2761df434d0
+SIZE (xpi/firefox-i18n-42.0/az.xpi) = 498264
+SHA256 (xpi/firefox-i18n-42.0/be.xpi) = 0fb8d84bbe69b6402847fe9be3392e50f867a8949b3597947287d1cb5723e40d
+SIZE (xpi/firefox-i18n-42.0/be.xpi) = 458684
+SHA256 (xpi/firefox-i18n-42.0/bg.xpi) = 68f2334cbd91976b12de4d489d46f0a1a02720a02b848d0f1ead2d1475f94b35
+SIZE (xpi/firefox-i18n-42.0/bg.xpi) = 497770
+SHA256 (xpi/firefox-i18n-42.0/bn-BD.xpi) = c49c4df26fa1396efec68ddecde3947204baf7f5040c4380e4ab0742592db27e
+SIZE (xpi/firefox-i18n-42.0/bn-BD.xpi) = 545583
+SHA256 (xpi/firefox-i18n-42.0/bn-IN.xpi) = 5b91351ccdcf064eb22f8d3077573d94ed2005e434885535a6018532ca67dfba
+SIZE (xpi/firefox-i18n-42.0/bn-IN.xpi) = 537276
+SHA256 (xpi/firefox-i18n-42.0/br.xpi) = 5372bf36dbad0f368c6e1926c8c9d6ca40136f25c7dd818d933ca5568f3a1e9f
+SIZE (xpi/firefox-i18n-42.0/br.xpi) = 449190
+SHA256 (xpi/firefox-i18n-42.0/bs.xpi) = 78784ccf40c531ebecf58bedf96db046a9eed42062ca05c80c5ecc5d5dbb6f48
+SIZE (xpi/firefox-i18n-42.0/bs.xpi) = 488131
+SHA256 (xpi/firefox-i18n-42.0/ca.xpi) = f60be77d1edc340303d0580d6da07812e5b536223859226cb26adc4b837fa5e9
+SIZE (xpi/firefox-i18n-42.0/ca.xpi) = 465823
+SHA256 (xpi/firefox-i18n-42.0/cs.xpi) = ff4f81fbc34e17b6c742a20927a8dee0dc7cdf8743d6c5219f898ffd0d750ba6
+SIZE (xpi/firefox-i18n-42.0/cs.xpi) = 455106
+SHA256 (xpi/firefox-i18n-42.0/cy.xpi) = 3d01d9210c7bd2708f99add6299c089654030a8b47e87e9a6debb9d58ab2eeeb
+SIZE (xpi/firefox-i18n-42.0/cy.xpi) = 451680
+SHA256 (xpi/firefox-i18n-42.0/da.xpi) = af056943a836fb36b8433e64e9b3003452280787ae155518559b1525d3566368
+SIZE (xpi/firefox-i18n-42.0/da.xpi) = 458413
+SHA256 (xpi/firefox-i18n-42.0/de.xpi) = 0301696932c69da60274dc19de58d50cc6a8beabb0387ad4d4526bdba1557790
+SIZE (xpi/firefox-i18n-42.0/de.xpi) = 460744
+SHA256 (xpi/firefox-i18n-42.0/dsb.xpi) = b6a5a998fad95e082b4c94b69c36680de7c5908efb85e222c4f9448f233458ee
+SIZE (xpi/firefox-i18n-42.0/dsb.xpi) = 479637
+SHA256 (xpi/firefox-i18n-42.0/el.xpi) = 93479275cc21ce09597de19b841642120100ab00916f23ed9bfd71bb67cfd9b6
+SIZE (xpi/firefox-i18n-42.0/el.xpi) = 505735
+SHA256 (xpi/firefox-i18n-42.0/en-GB.xpi) = e282b2425bbbb60a3eebfa3e16cb6d747a72da505ee2a48378ee2d08dba6ab57
+SIZE (xpi/firefox-i18n-42.0/en-GB.xpi) = 443856
+SHA256 (xpi/firefox-i18n-42.0/en-US.xpi) = 9bf74eaccbe740c513be7e406f582907c578838b6d0f14e4c346689490517167
+SIZE (xpi/firefox-i18n-42.0/en-US.xpi) = 475844
+SHA256 (xpi/firefox-i18n-42.0/en-ZA.xpi) = 0ea29117a55aca8acab2df176790c1024510ac5db23b61ccccb14223fbd12b3d
+SIZE (xpi/firefox-i18n-42.0/en-ZA.xpi) = 449903
+SHA256 (xpi/firefox-i18n-42.0/eo.xpi) = f4c24c83b2dd4ece852d4bba0ce902233408eaf45aed5185b9f462d737d6d527
+SIZE (xpi/firefox-i18n-42.0/eo.xpi) = 491605
+SHA256 (xpi/firefox-i18n-42.0/es-AR.xpi) = 92fc906a1957ca00d8bdfde61fcc59feb367338857b3f2740ac15ae6931c2127
+SIZE (xpi/firefox-i18n-42.0/es-AR.xpi) = 459408
+SHA256 (xpi/firefox-i18n-42.0/es-CL.xpi) = 776b59c03dbabda037e65902b1a87c6634beca0449cd9c35f300db64d88d5fc9
+SIZE (xpi/firefox-i18n-42.0/es-CL.xpi) = 386944
+SHA256 (xpi/firefox-i18n-42.0/es-ES.xpi) = 1abbe63ebcd37cf44ad6d60759916d81f272910b9edcda0e36ab16090ba2e629
+SIZE (xpi/firefox-i18n-42.0/es-ES.xpi) = 373753
+SHA256 (xpi/firefox-i18n-42.0/es-MX.xpi) = 041dcad0d1840f79ae1f4769796aa080c9834261ede4e55f55300411808b940b
+SIZE (xpi/firefox-i18n-42.0/es-MX.xpi) = 465414
+SHA256 (xpi/firefox-i18n-42.0/et.xpi) = af4b17647e9e88652b352aa40b3aae87c254d025e8fd488c08b0f96d82176e07
+SIZE (xpi/firefox-i18n-42.0/et.xpi) = 450258
+SHA256 (xpi/firefox-i18n-42.0/eu.xpi) = cfe32d285ffe379aa7307d4de3fb639ffb961b1ebba857406f12cc15e7f61b64
+SIZE (xpi/firefox-i18n-42.0/eu.xpi) = 474713
+SHA256 (xpi/firefox-i18n-42.0/fa.xpi) = 5c0dbc5f709145ca93e89e0ad67c688821a3080476f5202c987d9d2b035800ce
+SIZE (xpi/firefox-i18n-42.0/fa.xpi) = 526702
+SHA256 (xpi/firefox-i18n-42.0/ff.xpi) = d43f31eae539b6616f88e7dc0023eef4e4e64940ca4f625ab983fc52e7135321
+SIZE (xpi/firefox-i18n-42.0/ff.xpi) = 461016
+SHA256 (xpi/firefox-i18n-42.0/fi.xpi) = 6db03ffb84a02132ad852a9e6a223834ba00182ce34fab5e19b7c16dad6d2269
+SIZE (xpi/firefox-i18n-42.0/fi.xpi) = 452032
+SHA256 (xpi/firefox-i18n-42.0/fr.xpi) = 8eeec5d50b169f4102921941dfd43c8bb02f82e82c8f6a38a291c322914f17ce
+SIZE (xpi/firefox-i18n-42.0/fr.xpi) = 470271
+SHA256 (xpi/firefox-i18n-42.0/fy-NL.xpi) = 2471d52f5bfeb516e7569b8fd0167109d46ec4c2fc774f8c93bca2809f3dc47f
+SIZE (xpi/firefox-i18n-42.0/fy-NL.xpi) = 463484
+SHA256 (xpi/firefox-i18n-42.0/ga-IE.xpi) = fa5cda49e9284d9dae817132cdbfee504078e2140b4bfe18ead9089dce790f37
+SIZE (xpi/firefox-i18n-42.0/ga-IE.xpi) = 476090
+SHA256 (xpi/firefox-i18n-42.0/gd.xpi) = a41b6b5a51cd8dfab903a74086c26c8b6c2c05705d256b801f40530575e5d5a0
+SIZE (xpi/firefox-i18n-42.0/gd.xpi) = 462140
+SHA256 (xpi/firefox-i18n-42.0/gl.xpi) = fc16ccf790b551df573b9de347eeb36719fdb98af44f9afa4ebd2c67853e1587
+SIZE (xpi/firefox-i18n-42.0/gl.xpi) = 451687
+SHA256 (xpi/firefox-i18n-42.0/gu-IN.xpi) = 28e86b4cdbb7c1af4a00b7968a1c79005f594af9f44c4ff940686cecea8ea9cb
+SIZE (xpi/firefox-i18n-42.0/gu-IN.xpi) = 492282
+SHA256 (xpi/firefox-i18n-42.0/he.xpi) = c86ff630372f014409b8ff97ba10eed5b267cb90f74fca5958c3d988c00f96ff
+SIZE (xpi/firefox-i18n-42.0/he.xpi) = 481468
+SHA256 (xpi/firefox-i18n-42.0/hi-IN.xpi) = 4bf1ebfd071d5393b9cc8503732bbf5e6afd7534f7bf5b1e67a105cf8882a602
+SIZE (xpi/firefox-i18n-42.0/hi-IN.xpi) = 515516
+SHA256 (xpi/firefox-i18n-42.0/hr.xpi) = f60a9effb51f85d798528ef947c37dd40e9e11f4c7081371ef1a2c184d51fbd7
+SIZE (xpi/firefox-i18n-42.0/hr.xpi) = 486308
+SHA256 (xpi/firefox-i18n-42.0/hsb.xpi) = ba43533196c1de882708e3f2c5f33508bdbedbf3987a060e51891b3cbdfdb5df
+SIZE (xpi/firefox-i18n-42.0/hsb.xpi) = 477291
+SHA256 (xpi/firefox-i18n-42.0/hu.xpi) = d6e158f3b5c4fe9745feed9be76276898c4d06a34c6af41e9d6f7d9574c1cb02
+SIZE (xpi/firefox-i18n-42.0/hu.xpi) = 461934
+SHA256 (xpi/firefox-i18n-42.0/hy-AM.xpi) = 20d38d82634a0f7fac0aba10cd33def9bd07860343f50b51b977e9ba9d4298e0
+SIZE (xpi/firefox-i18n-42.0/hy-AM.xpi) = 544379
+SHA256 (xpi/firefox-i18n-42.0/id.xpi) = a9b186a33c58dc26eacfd23b77eb3fb07a4169a65043ae6454f53a3076c8f361
+SIZE (xpi/firefox-i18n-42.0/id.xpi) = 438845
+SHA256 (xpi/firefox-i18n-42.0/is.xpi) = 36d483f995a23672548076cf493bb5d74067194e45357fcdaa8ccf89f081e54e
+SIZE (xpi/firefox-i18n-42.0/is.xpi) = 493033
+SHA256 (xpi/firefox-i18n-42.0/it.xpi) = 12f52bcd404059126fd5291e185e152b65a22cc80562c736cf441088ea7e8659
+SIZE (xpi/firefox-i18n-42.0/it.xpi) = 367659
+SHA256 (xpi/firefox-i18n-42.0/ja.xpi) = 836403f5c69d4ce9304d123de794acfb297870b5dea084c8c5dc1f2d2fa88ba8
+SIZE (xpi/firefox-i18n-42.0/ja.xpi) = 488656
+SHA256 (xpi/firefox-i18n-42.0/kk.xpi) = c956039afb31cdbc87177e9da7604dea5f396971cc005ba2b2f39bcccd07f0c9
+SIZE (xpi/firefox-i18n-42.0/kk.xpi) = 513387
+SHA256 (xpi/firefox-i18n-42.0/km.xpi) = 831517e7a4526a8fe66bed319f07f3043a2b59d8f335e087468be241ee73d055
+SIZE (xpi/firefox-i18n-42.0/km.xpi) = 578547
+SHA256 (xpi/firefox-i18n-42.0/kn.xpi) = 85f1b02e7dad0eff2df2d42f0f48ac7c87ee4ae3074304a07dbf72826de3fff5
+SIZE (xpi/firefox-i18n-42.0/kn.xpi) = 544136
+SHA256 (xpi/firefox-i18n-42.0/ko.xpi) = 5ba6764e73adbd14eea69b6fdef7bed1302ae79a3fbefc84a99846f6c8424277
+SIZE (xpi/firefox-i18n-42.0/ko.xpi) = 474547
+SHA256 (xpi/firefox-i18n-42.0/lij.xpi) = 7b926543d7ba6e3ba3bcd62846715f88ba2b08ccb069174e1c93817c4ed30270
+SIZE (xpi/firefox-i18n-42.0/lij.xpi) = 456396
+SHA256 (xpi/firefox-i18n-42.0/lt.xpi) = 9cea89aec036c26dbb25ac560045ea31014bfdc799735894439ef081c84e724d
+SIZE (xpi/firefox-i18n-42.0/lt.xpi) = 495227
+SHA256 (xpi/firefox-i18n-42.0/lv.xpi) = dead267a4f72a36ce73119f9d37cd62ee8c9aca800886c744ce3a7b871d232b5
+SIZE (xpi/firefox-i18n-42.0/lv.xpi) = 475294
+SHA256 (xpi/firefox-i18n-42.0/mai.xpi) = 8fc086207679c75f6d4165d4a12333871078e60aa0476249409fcf3ac05ed284
+SIZE (xpi/firefox-i18n-42.0/mai.xpi) = 523801
+SHA256 (xpi/firefox-i18n-42.0/mk.xpi) = 5dabd571b25070ba83b7bc539a150714001339e7a986df8b364424b1312109d1
+SIZE (xpi/firefox-i18n-42.0/mk.xpi) = 535199
+SHA256 (xpi/firefox-i18n-42.0/ml.xpi) = 7345b33597ecad8e9306f5f483b872d4d62c86561b3bfd7eb514853f67f9a86a
+SIZE (xpi/firefox-i18n-42.0/ml.xpi) = 533776
+SHA256 (xpi/firefox-i18n-42.0/mr.xpi) = 734a252d6a87a468568ac8ebdf9cf2e2ddb692997b67890ba846001cbacfe1f8
+SIZE (xpi/firefox-i18n-42.0/mr.xpi) = 522304
+SHA256 (xpi/firefox-i18n-42.0/ms.xpi) = cf16f7c807915297a132ad8d71fe20012c54eb82f8153f66b954b71a143cccc7
+SIZE (xpi/firefox-i18n-42.0/ms.xpi) = 497644
+SHA256 (xpi/firefox-i18n-42.0/nb-NO.xpi) = f18376647b559b56b94dd54a92c4589dd4313e18870f7c5ccde520ab5baaaac2
+SIZE (xpi/firefox-i18n-42.0/nb-NO.xpi) = 453245
+SHA256 (xpi/firefox-i18n-42.0/nl.xpi) = a2470132d8b8a80b71471527a4c2468e7cd9e2440e1666950c591e09f78138bd
+SIZE (xpi/firefox-i18n-42.0/nl.xpi) = 451272
+SHA256 (xpi/firefox-i18n-42.0/nn-NO.xpi) = 4bff7cf5b4178a6d85da579ad1356af88d332d9b48cfbfaa067d51c8f190dd27
+SIZE (xpi/firefox-i18n-42.0/nn-NO.xpi) = 447406
+SHA256 (xpi/firefox-i18n-42.0/or.xpi) = c3f211d325a7bac64c71b239ccc95918153f5d5ae987b29031245bf7475eb329
+SIZE (xpi/firefox-i18n-42.0/or.xpi) = 533314
+SHA256 (xpi/firefox-i18n-42.0/pa-IN.xpi) = af2e3dec61be29064b9a72846fd1148f0ff02e7e2290a3ed60077e932cdb614a
+SIZE (xpi/firefox-i18n-42.0/pa-IN.xpi) = 507205
+SHA256 (xpi/firefox-i18n-42.0/pl.xpi) = 34498568481fc7d720742e2add62e0ea55c6150bf90abc3040186ca5d26881f2
+SIZE (xpi/firefox-i18n-42.0/pl.xpi) = 403227
+SHA256 (xpi/firefox-i18n-42.0/pt-BR.xpi) = b0c9a80cd76142fd9886fd70a141dc0d8e4203e8fbdb72b649c84ee3b0d373bf
+SIZE (xpi/firefox-i18n-42.0/pt-BR.xpi) = 468096
+SHA256 (xpi/firefox-i18n-42.0/pt-PT.xpi) = 63b5e59bd240b67fe683618b9be9d824ae8f77133d8345889b32ba0930d77687
+SIZE (xpi/firefox-i18n-42.0/pt-PT.xpi) = 448920
+SHA256 (xpi/firefox-i18n-42.0/rm.xpi) = d5ab15132c13db755ec05efbf255a53ae4411d2724ecc5ecc5bda08c4eef5681
+SIZE (xpi/firefox-i18n-42.0/rm.xpi) = 454529
+SHA256 (xpi/firefox-i18n-42.0/ro.xpi) = d62cff13bc6ae437f1a224ad2e11e8d4de338f8b6b3e405baa1d8c0764b7edef
+SIZE (xpi/firefox-i18n-42.0/ro.xpi) = 502634
+SHA256 (xpi/firefox-i18n-42.0/ru.xpi) = ac454a85ea58c5a3297550fe7a10eef8487f37bb0310df4a5a9fb533d7c1c712
+SIZE (xpi/firefox-i18n-42.0/ru.xpi) = 416137
+SHA256 (xpi/firefox-i18n-42.0/si.xpi) = 763543a1f7433309be01d89e30436b7bff4fcd2b50e8f496f54be26f0c730688
+SIZE (xpi/firefox-i18n-42.0/si.xpi) = 543889
+SHA256 (xpi/firefox-i18n-42.0/sk.xpi) = beb7004124240fd83f64841ff415cb692aab327b5ac925e6db27e4b9ba7f01ca
+SIZE (xpi/firefox-i18n-42.0/sk.xpi) = 477255
+SHA256 (xpi/firefox-i18n-42.0/sl.xpi) = 0079e2ca640efe4d2c7dd29a570634cc5072f632bf064149bf9b9d8f3aa518d8
+SIZE (xpi/firefox-i18n-42.0/sl.xpi) = 450532
+SHA256 (xpi/firefox-i18n-42.0/son.xpi) = 811356dfb2552f5c2d2832b7a208233e27eeab1e064d694cf36532ddcbfc458d
+SIZE (xpi/firefox-i18n-42.0/son.xpi) = 457298
+SHA256 (xpi/firefox-i18n-42.0/sq.xpi) = fabeef51543439772b6ef5643d0ac57ec196d64c6ef83e75ddcd275dc6624a81
+SIZE (xpi/firefox-i18n-42.0/sq.xpi) = 494612
+SHA256 (xpi/firefox-i18n-42.0/sr.xpi) = 692019f3542e0da8ff64589b488eab0d7e6d16906655d5a86ebcc53c00731edc
+SIZE (xpi/firefox-i18n-42.0/sr.xpi) = 486210
+SHA256 (xpi/firefox-i18n-42.0/sv-SE.xpi) = 6e7e0eff3c480a302fa0ed1a4ed720ac432f0819c55549afc6bda028ea1b23a5
+SIZE (xpi/firefox-i18n-42.0/sv-SE.xpi) = 460188
+SHA256 (xpi/firefox-i18n-42.0/ta.xpi) = 542761640fbe8dd6cf3e60be45a12735bbfe6c38c96b0073833544c85c5cf10a
+SIZE (xpi/firefox-i18n-42.0/ta.xpi) = 515601
+SHA256 (xpi/firefox-i18n-42.0/te.xpi) = 7287fc6577b0892df46ea1fc2f185fc73ad94c4d8050cdd3a4be47150f1f7a2e
+SIZE (xpi/firefox-i18n-42.0/te.xpi) = 532920
+SHA256 (xpi/firefox-i18n-42.0/th.xpi) = f254f7c40a194ae3c082d9b77f155fc290b0e6abe969d7c06788ea7abe4039ad
+SIZE (xpi/firefox-i18n-42.0/th.xpi) = 542239
+SHA256 (xpi/firefox-i18n-42.0/tr.xpi) = f343c4f3b2cb5541fc9f98d5953101f5e5d1ee1d5c30968d6564828c5701119b
+SIZE (xpi/firefox-i18n-42.0/tr.xpi) = 489512
+SHA256 (xpi/firefox-i18n-42.0/uk.xpi) = 88c881749bae293d9614a77ed9458345399573a6ab5583626ef98041ae78da32
+SIZE (xpi/firefox-i18n-42.0/uk.xpi) = 505718
+SHA256 (xpi/firefox-i18n-42.0/uz.xpi) = faeacd2ec9af20cde5032415f0bbeba487ed4d276f778672ae6a340615099725
+SIZE (xpi/firefox-i18n-42.0/uz.xpi) = 505180
+SHA256 (xpi/firefox-i18n-42.0/vi.xpi) = 1481521a62561266ea14389cdb579b1757e791a5473c981e399aa9bff14ddcdd
+SIZE (xpi/firefox-i18n-42.0/vi.xpi) = 472290
+SHA256 (xpi/firefox-i18n-42.0/xh.xpi) = 1a1776e5770dd361d0adc85ed80bb1e81dd5436a0727009b91cb89e92e4d381e
+SIZE (xpi/firefox-i18n-42.0/xh.xpi) = 455527
+SHA256 (xpi/firefox-i18n-42.0/zh-CN.xpi) = 46bb4b1b67494004441135dbf3051501e0580fb8da29548de73f2e0fe12f7834
+SIZE (xpi/firefox-i18n-42.0/zh-CN.xpi) = 491278
+SHA256 (xpi/firefox-i18n-42.0/zh-TW.xpi) = ef4e9b5e01b85564b935a5f9bc663ffac61ce0f3ca166c316b1aee648832d458
+SIZE (xpi/firefox-i18n-42.0/zh-TW.xpi) = 482387
diff --git a/www/firefox/Makefile b/www/firefox/Makefile
index 2b60960d5ad2..374a67ced66c 100644
--- a/www/firefox/Makefile
+++ b/www/firefox/Makefile
@@ -2,19 +2,18 @@
# $FreeBSD$
PORTNAME= firefox
-DISTVERSION= 41.0.2
+DISTVERSION= 42.0
DISTVERSIONSUFFIX=.source
-PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= www ipv6
MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \
- MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source
+ MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build2/source
MAINTAINER= gecko@FreeBSD.org
COMMENT= Web browser based on the browser portion of Mozilla
-BUILD_DEPENDS= nspr>=4.10.8:${PORTSDIR}/devel/nspr \
- nss>=3.19.2:${PORTSDIR}/security/nss \
+BUILD_DEPENDS= nspr>=4.10.10:${PORTSDIR}/devel/nspr \
+ nss>=3.19.4:${PORTSDIR}/security/nss \
libevent2>=2.0.21_2:${PORTSDIR}/devel/libevent2 \
soundtouch>=1.8.0:${PORTSDIR}/audio/soundtouch \
harfbuzz>=0.9.34:${PORTSDIR}/print/harfbuzz \
@@ -25,6 +24,7 @@ BUILD_DEPENDS= nspr>=4.10.8:${PORTSDIR}/devel/nspr \
${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \
v4l_compat>0:${PORTSDIR}/multimedia/v4l_compat \
autoconf-2.13:${PORTSDIR}/devel/autoconf213 \
+ yasm:${PORTSDIR}/devel/yasm \
zip:${PORTSDIR}/archivers/zip \
unzip:${PORTSDIR}/archivers/unzip
# opus>=1.1:${PORTSDIR}/audio/opus \
@@ -32,7 +32,7 @@ BUILD_DEPENDS= nspr>=4.10.8:${PORTSDIR}/devel/nspr \
LIB_DEPENDS= libv4l2.so:${PORTSDIR}/multimedia/libv4l
USE_GECKO= gecko
-CONFLICTS_INSTALL= firefox-esr-31.* firefox-esr-24.* firefox-esr-17.*
+CONFLICTS_INSTALL= firefox-esr-45.* firefox-esr-3[18].* firefox-esr-24.*
MOZ_PKGCONFIG_FILES= # empty
USE_MOZILLA= -opus
MOZILLA_NAME= Firefox
@@ -58,7 +58,7 @@ OPTIONS_SINGLE_TOOLKIT= GTK2 GTK3
.include "${.CURDIR}/../../www/firefox/Makefile.options"
.include <bsd.port.pre.mk>
-WRKSRC:= ${WRKDIR}/mozilla-release
+WRKSRC:= ${WRKDIR}/${PORTNAME}-${DISTVERSION}
.if ${PORT_OPTIONS:MALSA}
RUN_DEPENDS+= alsa-lib>=1.0.27.2_1:${PORTSDIR}/audio/alsa-lib
diff --git a/www/firefox/distinfo b/www/firefox/distinfo
index 7fa101a37c34..0915d0f857cb 100644
--- a/www/firefox/distinfo
+++ b/www/firefox/distinfo
@@ -1,2 +1,2 @@
-SHA256 (firefox-41.0.2.source.tar.xz) = ff00689f4d2ff54c5eb7b3aa367560a3645800eb0c96e73a795e461461b1970e
-SIZE (firefox-41.0.2.source.tar.xz) = 159761468
+SHA256 (firefox-42.0.source.tar.xz) = 994a346699298277b64ec0cab72660b8d3e5b879a2ac79207576f7e6c33da3ae
+SIZE (firefox-42.0.source.tar.xz) = 165766832
diff --git a/www/firefox/files/patch-bug1181382 b/www/firefox/files/patch-bug1181382
deleted file mode 100644
index 78e3c91ca068..000000000000
--- a/www/firefox/files/patch-bug1181382
+++ /dev/null
@@ -1,15 +0,0 @@
---- dom/mobilemessage/MobileMessageManager.h.orig 2015-09-17 22:13:25 UTC
-+++ dom/mobilemessage/MobileMessageManager.h
-@@ -14,11 +14,11 @@
- class nsISmsService;
- class nsIDOMMozSmsMessage;
- class nsIDOMMozMmsMessage;
--class Promise;
-
- namespace mozilla {
- namespace dom {
-
-+class Promise;
- class DOMRequest;
- class DOMCursor;
- struct MmsParameters;
diff --git a/www/firefox/files/patch-bug702179 b/www/firefox/files/patch-bug702179
index bc53944eee1b..6696271a1445 100644
--- a/www/firefox/files/patch-bug702179
+++ b/www/firefox/files/patch-bug702179
@@ -1,10 +1,10 @@
---- js/src/moz.build.orig 2015-10-03 18:05:51.136389000 +0200
-+++ js/src/moz.build 2015-10-03 18:06:12.457351000 +0200
-@@ -603,6 +603,6 @@
+--- js/src/moz.build.orig 2015-10-29 22:17:54 UTC
++++ js/src/moz.build
+@@ -613,7 +613,3 @@ CXXFLAGS += CONFIG['MOZ_ICU_CFLAGS']
+
if CONFIG['GNU_CXX']:
FAIL_ON_WARNINGS = True
-
+-
-NO_EXPAND_LIBS = True
-+NO_EXPAND_LIBS = False
-
- DIST_INSTALL = True
+-
+-DIST_INSTALL = True
diff --git a/www/firefox/files/patch-bug779713 b/www/firefox/files/patch-bug779713
index 82909e824d66..d7b8a64663bb 100644
--- a/www/firefox/files/patch-bug779713
+++ b/www/firefox/files/patch-bug779713
@@ -2,14 +2,7 @@ diff --git mfbt/Alignment.h mfbt/Alignment.h
index e0843ca..353ec36 100644
--- mfbt/Alignment.h
+++ mfbt/Alignment.h
-@@ -9,11 +9,20 @@
- #ifndef mozilla_Alignment_h
- #define mozilla_Alignment_h
-
-+#include "mozilla/Attributes.h"
-+
- #include <stddef.h>
- #include <stdint.h>
+@@ -15,6 +15,13 @@
namespace mozilla {
diff --git a/www/firefox/files/patch-bug981348 b/www/firefox/files/patch-bug981348
index 6eb877b08fa8..e4b7edfd9b03 100644
--- a/www/firefox/files/patch-bug981348
+++ b/www/firefox/files/patch-bug981348
@@ -2,13 +2,13 @@ diff --git dom/system/OSFileConstants.cpp dom/system/OSFileConstants.cpp
index 4b21361..cb3be32 100644
--- dom/system/OSFileConstants.cpp
+++ dom/system/OSFileConstants.cpp
-@@ -596,7 +596,7 @@ static const dom::ConstantSpec gLibcProperties[] =
+@@ -662,7 +662,7 @@
- { "OSFILE_SIZEOF_STATVFS", INT_TO_JSVAL(sizeof (struct statvfs)) },
+ { "OSFILE_SIZEOF_STATVFS", JS::Int32Value(sizeof (struct statvfs)) },
-- { "OSFILE_OFFSETOF_STATVFS_F_BSIZE", INT_TO_JSVAL(offsetof (struct statvfs, f_bsize)) },
-+ { "OSFILE_OFFSETOF_STATVFS_F_FRSIZE", INT_TO_JSVAL(offsetof (struct statvfs, f_frsize)) },
- { "OSFILE_OFFSETOF_STATVFS_F_BAVAIL", INT_TO_JSVAL(offsetof (struct statvfs, f_bavail)) },
+- { "OSFILE_OFFSETOF_STATVFS_F_BSIZE", JS::Int32Value(offsetof (struct statvfs, f_bsize)) },
++ { "OSFILE_OFFSETOF_STATVFS_F_FRSIZE", JS::Int32Value(offsetof (struct statvfs, f_frsize)) },
+ { "OSFILE_OFFSETOF_STATVFS_F_BAVAIL", JS::Int32Value(offsetof (struct statvfs, f_bavail)) },
#endif // defined(XP_UNIX)
diff --git toolkit/components/osfile/modules/osfile_unix_back.jsm toolkit/components/osfile/modules/osfile_unix_back.jsm
diff --git a/www/firefox/files/patch-media_libav_config__unix.h b/www/firefox/files/patch-media_libav_config__unix.h
new file mode 100644
index 000000000000..b339641baeb9
--- /dev/null
+++ b/www/firefox/files/patch-media_libav_config__unix.h
@@ -0,0 +1,11 @@
+--- media/libav/config_unix.h.orig 2015-10-29 22:17:49 UTC
++++ media/libav/config_unix.h
+@@ -144,7 +144,7 @@
+ #define HAVE_MACH_MACH_TIME_H 0
+ #define HAVE_MACHINE_IOCTL_BT848_H 0
+ #define HAVE_MACHINE_IOCTL_METEOR_H 0
+-#define HAVE_MALLOC_H 1
++#define HAVE_MALLOC_H 0
+ #define HAVE_POLL_H 1
+ #define HAVE_SNDIO_H 0
+ #define HAVE_SOUNDCARD_H 0
diff --git a/www/firefox/files/patch-memory-jemalloc-Makefile.in b/www/firefox/files/patch-memory-jemalloc-Makefile.in
deleted file mode 100644
index 8de3d2891759..000000000000
--- a/www/firefox/files/patch-memory-jemalloc-Makefile.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- memory/jemalloc/Makefile.in~
-+++ memory/jemalloc/Makefile.in
-@@ -7,3 +7,7 @@ include $(topsrcdir)/config/rules.mk
- ifdef GNU_CC
- CFLAGS += -std=gnu99
- endif
-+
-+# XXX startup crash workaround for gcc47 on amd64
-+jemalloc.$(OBJ_SUFFIX): OS_CFLAGS := $(filter-out -O3 -Ofast,$(OS_CFLAGS))
-+jemalloc.$(OBJ_SUFFIX): MOZ_OPTIMIZE_FLAGS=
diff --git a/www/firefox/files/patch-soundtouch-no-factory b/www/firefox/files/patch-soundtouch-no-factory
new file mode 100644
index 000000000000..781e0204f0be
--- /dev/null
+++ b/www/firefox/files/patch-soundtouch-no-factory
@@ -0,0 +1,84 @@
+# Partially revert bug 1176300 to unbreak build with system libsoundtouch
+
+diff --git dom/media/AudioStream.cpp dom/media/AudioStream.cpp
+--- dom/media/AudioStream.cpp
++++ dom/media/AudioStream.cpp
+@@ -129,7 +129,6 @@
+ , mOutChannels(0)
+ , mWritten(0)
+ , mAudioClock(this)
+- , mTimeStretcher(nullptr)
+ , mLatencyRequest(HighLatency)
+ , mReadPoint(0)
+ , mDumpFile(nullptr)
+@@ -152,9 +151,6 @@
+ if (mDumpFile) {
+ fclose(mDumpFile);
+ }
+- if (mTimeStretcher) {
+- soundtouch::destroySoundTouchObj(mTimeStretcher);
+- }
+ }
+
+ size_t
+@@ -177,7 +173,7 @@
+ {
+ mMonitor.AssertCurrentThreadOwns();
+ if (!mTimeStretcher) {
+- mTimeStretcher = soundtouch::createSoundTouchObj();
++ mTimeStretcher = new soundtouch::SoundTouch();
+ mTimeStretcher->setSampleRate(mInRate);
+ mTimeStretcher->setChannels(mOutChannels);
+ mTimeStretcher->setPitch(1.0);
+diff --git dom/media/AudioStream.h dom/media/AudioStream.h
+--- dom/media/AudioStream.h
++++ dom/media/AudioStream.h
+@@ -15,7 +15,7 @@
+ #include "mozilla/RefPtr.h"
+ #include "mozilla/UniquePtr.h"
+ #include "CubebUtils.h"
+-#include "soundtouch/SoundTouchFactory.h"
++#include "soundtouch/SoundTouch.h"
+
+ namespace mozilla {
+
+@@ -329,7 +329,7 @@
+ // Number of frames written to the buffers.
+ int64_t mWritten;
+ AudioClock mAudioClock;
+- soundtouch::SoundTouch* mTimeStretcher;
++ nsAutoPtr<soundtouch::SoundTouch> mTimeStretcher;
+ nsRefPtr<AsyncLatencyLogger> mLatencyLog;
+
+ // copy of Latency logger's starting time for offset calculations
+diff --git media/libsoundtouch/src/moz.build media/libsoundtouch/src/moz.build
+--- media/libsoundtouch/src/moz.build
++++ media/libsoundtouch/src/moz.build
+@@ -8,7 +8,6 @@
+ 'FIFOSamplePipe.h',
+ 'SoundTouch.h',
+ 'soundtouch_config.h',
+- 'SoundTouchFactory.h',
+ 'STTypes.h',
+ ]
+
+@@ -22,7 +21,6 @@
+ 'InterpolateShannon.cpp',
+ 'RateTransposer.cpp',
+ 'SoundTouch.cpp',
+- 'SoundTouchFactory.cpp',
+ 'TDStretch.cpp',
+ ]
+
+diff --git media/libsoundtouch/src/soundtouch_perms.h media/libsoundtouch/src/soundtouch_perms.h
+--- media/libsoundtouch/src/soundtouch_perms.h
++++ media/libsoundtouch/src/soundtouch_perms.h
+@@ -12,7 +12,6 @@
+
+ #pragma GCC visibility push(default)
+ #include "SoundTouch.h"
+-#include "SoundTouchFactory.h"
+ #pragma GCC visibility pop
+
+ #endif // MOZILLA_SOUNDTOUCH_PERMS_H
+
diff --git a/www/firefox/files/patch-toolkit_system_unixproxy_nsLibProxySettings.cpp b/www/firefox/files/patch-toolkit_system_unixproxy_nsLibProxySettings.cpp
new file mode 100644
index 000000000000..57101a3f1d2d
--- /dev/null
+++ b/www/firefox/files/patch-toolkit_system_unixproxy_nsLibProxySettings.cpp
@@ -0,0 +1,10 @@
+--- toolkit/system/unixproxy/nsLibProxySettings.cpp.orig 2015-10-29 22:18:00 UTC
++++ toolkit/system/unixproxy/nsLibProxySettings.cpp
+@@ -9,6 +9,7 @@
+ #include "nsIURI.h"
+ #include "nsString.h"
+ #include "nsCOMPtr.h"
++#include "nsNetCID.h"
+ #include "nspr.h"
+
+ extern "C" {
diff --git a/www/firefox/files/patch-z-bug517422 b/www/firefox/files/patch-z-bug517422
index 025f1cc9f75b..446ea2cd0ced 100644
--- a/www/firefox/files/patch-z-bug517422
+++ b/www/firefox/files/patch-z-bug517422
@@ -71,23 +71,27 @@ diff --git config/system-headers config/system-headers
index bef567c..9807c29 100644
--- config/system-headers
+++ config/system-headers
-@@ -1263,7 +1263,6 @@ X11/Xlocale.h
+@@ -1257,8 +1257,10 @@ X11/Xlocale.h
X11/Xos.h
X11/Xutil.h
zmouse.h
--soundtouch/SoundTouch.h
- #if MOZ_NATIVE_PNG==1
- png.h
++#if MOZ_NATIVE_SOUNDTOUCH==1
+ soundtouch/SoundTouch.h
+ soundtouch/SoundTouchFactory.h
++#endif
+ #if MOZ_LIBAV_FFT==1
+ libavcodec/avfft.h
#endif
-@@ -1325,6 +1324,7 @@ vorbis/codec.h
- theora/theoradec.h
- tremor/ivorbiscodec.h
- speex/speex_resampler.h
+@@ -1313,6 +1315,8 @@ vpx/vp8dx.h
+ vpx_mem/vpx_mem.h
+ #endif
+ #ifdef GKMEDIAS_SHARED_LIBRARY
+soundtouch/SoundTouch.h
- ogg/ogg.h
- ogg/os_types.h
- nestegg/nestegg.h
-@@ -1365,3 +1365,35 @@ graphite2/Segment.h
++soundtouch/SoundTouchFactory.h
+ vpx/vpx_codec.h
+ vpx/vpx_decoder.h
+ vpx/vpx_encoder.h
+@@ -1364,3 +1363,32 @@ graphite2/Segment.h
harfbuzz/hb-ot.h
harfbuzz/hb.h
#endif
@@ -120,9 +124,6 @@ index bef567c..9807c29 100644
+#if MOZ_NATIVE_SPEEX==1
+speex/speex_resampler.h
+#endif
-+#if MOZ_NATIVE_SOUNDTOUCH==1
-+soundtouch/SoundTouch.h
-+#endif
diff --git configure.in configure.in
index 87db361..7947626 100644
--- configure.in
@@ -285,19 +286,6 @@ index 87db361..7947626 100644
dnl = Disable VP8 decoder support
dnl ========================================================
MOZ_ARG_DISABLE_BOOL(webm,
-diff --git dom/media/AudioStream.h dom/media/AudioStream.h
-index 085676d..00c54fb 100644
---- dom/media/AudioStream.h
-+++ dom/media/AudioStream.h
-@@ -17,7 +17,7 @@
- #include "CubebUtils.h"
-
- namespace soundtouch {
--class SoundTouch;
-+class MOZ_IMPORT_API SoundTouch;
- }
-
- namespace mozilla {
diff --git dom/media/moz.build dom/media/moz.build
index 7526cff..e0a0ca0 100644
--- dom/media/moz.build
diff --git a/www/libxul/Makefile b/www/libxul/Makefile
index 6616ad4df0b6..d77c21a85ed5 100644
--- a/www/libxul/Makefile
+++ b/www/libxul/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= libxul
-DISTVERSION= 38.3.0
-PORTREVISION= 1
+DISTVERSION= 38.4.0
CATEGORIES?= www devel
MASTER_SITES= MOZILLA/firefox/releases/${DISTVERSION}esr/source \
MOZILLA/firefox/candidates/${DISTVERSION}esr-candidates/build2/source
@@ -12,8 +11,8 @@ DISTNAME= firefox-${DISTVERSION}esr.source
MAINTAINER?= gecko@FreeBSD.org
COMMENT?= Mozilla runtime package that can be used to bootstrap XUL+XPCOM apps
-BUILD_DEPENDS= nspr>=4.10.8:${PORTSDIR}/devel/nspr \
- nss>=3.19.2:${PORTSDIR}/security/nss \
+BUILD_DEPENDS= nspr>=4.10.10:${PORTSDIR}/devel/nspr \
+ nss>=3.19.2.1:${PORTSDIR}/security/nss \
libevent2>=2.0.21_2:${PORTSDIR}/devel/libevent2 \
soundtouch>=1.8.0:${PORTSDIR}/audio/soundtouch \
harfbuzz>=0.9.34:${PORTSDIR}/print/harfbuzz \
diff --git a/www/libxul/distinfo b/www/libxul/distinfo
index 0ff598db0d1b..2abd10b1a918 100644
--- a/www/libxul/distinfo
+++ b/www/libxul/distinfo
@@ -1,2 +1,2 @@
-SHA256 (firefox-38.3.0esr.source.tar.bz2) = 809f65502d256568220c52bfe09646588f21653c8c487e8018b10ff87ca67f1c
-SIZE (firefox-38.3.0esr.source.tar.bz2) = 181401628
+SHA256 (firefox-38.4.0esr.source.tar.bz2) = 028a1f7ce16b3016b0d98e5a5ef73bcb3f732b80d406e54f49e3c246e207f2c7
+SIZE (firefox-38.4.0esr.source.tar.bz2) = 181383793
diff --git a/www/linux-firefox/Makefile b/www/linux-firefox/Makefile
index bf3de0cedcdd..1887bc06d73d 100644
--- a/www/linux-firefox/Makefile
+++ b/www/linux-firefox/Makefile
@@ -2,11 +2,11 @@
# $FreeBSD$
PORTNAME= firefox
-DISTVERSION= 40.0.3
+DISTVERSION= 42.0
PORTEPOCH= 1
CATEGORIES= www ipv6
MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/linux-i686/en-US \
- MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/linux-i686/en-US
+ MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build2/linux-i686/en-US
MAINTAINER= gecko@FreeBSD.org
COMMENT= Web browser based on the browser portion of Mozilla
diff --git a/www/linux-firefox/distinfo b/www/linux-firefox/distinfo
index b51da01c559e..0a3689f8e1e4 100644
--- a/www/linux-firefox/distinfo
+++ b/www/linux-firefox/distinfo
@@ -1,5 +1,5 @@
-SHA256 (firefox-40.0.3.tar.bz2) = af3eaa3b56c8223d51079c62f00f36da0d200f28d59f6457c6794e2142b7925e
-SIZE (firefox-40.0.3.tar.bz2) = 49233137
+SHA256 (firefox-42.0.tar.bz2) = 2c44f8ef07896f3e4c4ee555e35ebe5658f2721fdbdee4c70b153387472b781e
+SIZE (firefox-42.0.tar.bz2) = 50938529
SHA256 (glib2-2.22.2-2.fc12.i686.rpm) = e3b459c245ec14e7248e9de4b506963a4773407f3e58835db5070d0ed02ecc99
SIZE (glib2-2.22.2-2.fc12.i686.rpm) = 1162908
SHA256 (gtk2-2.18.3-19.fc12.i686.rpm) = aea9cf7ffe9c8dae0faa2bf3d2aa1b2117c55dce03da72dcce8c268279ec0a4b
diff --git a/www/linux-firefox/pkg-plist b/www/linux-firefox/pkg-plist
index 866eba34a1dd..c450c40f15eb 100644
--- a/www/linux-firefox/pkg-plist
+++ b/www/linux-firefox/pkg-plist
@@ -38,6 +38,7 @@ lib/%%APP_NAME%%/libfreebl3.so
%%GTK218%%lib/%%APP_NAME%%/libgio-2.0.so.0
%%GTK218%%lib/%%APP_NAME%%/libglib-2.0.so.0
%%GTK218%%lib/%%APP_NAME%%/libgtk-x11-2.0.so.0
+lib/%%APP_NAME%%/liblgpllibs.so
lib/%%APP_NAME%%/libmozsqlite3.so
lib/%%APP_NAME%%/libnspr4.so
lib/%%APP_NAME%%/libnss3.so
diff --git a/www/linux-seamonkey/Makefile b/www/linux-seamonkey/Makefile
index dc48c4e76340..3ee945676b8b 100644
--- a/www/linux-seamonkey/Makefile
+++ b/www/linux-seamonkey/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= seamonkey
-DISTVERSION= 2.33.1
+DISTVERSION= 2.39
CATEGORIES= www mail news editors irc ipv6
MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/linux-i686/en-US \
MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/linux-i686/en-US
diff --git a/www/linux-seamonkey/distinfo b/www/linux-seamonkey/distinfo
index 4125bd2f3947..484eb9150a91 100644
--- a/www/linux-seamonkey/distinfo
+++ b/www/linux-seamonkey/distinfo
@@ -1,5 +1,5 @@
-SHA256 (seamonkey-2.33.1.tar.bz2) = f52b597a938f2980fc438a96ac38b9d23cb403a7319bb5d60d862f96efc54926
-SIZE (seamonkey-2.33.1.tar.bz2) = 41382431
+SHA256 (seamonkey-2.39.tar.bz2) = 035cef6a3839fc5e86b554070fbf111b2e33bf2ea74b565fb10c527761fc52b1
+SIZE (seamonkey-2.39.tar.bz2) = 50222506
SHA256 (glib2-2.22.2-2.fc12.i686.rpm) = e3b459c245ec14e7248e9de4b506963a4773407f3e58835db5070d0ed02ecc99
SIZE (glib2-2.22.2-2.fc12.i686.rpm) = 1162908
SHA256 (gtk2-2.18.3-19.fc12.i686.rpm) = aea9cf7ffe9c8dae0faa2bf3d2aa1b2117c55dce03da72dcce8c268279ec0a4b
diff --git a/www/linux-seamonkey/pkg-plist b/www/linux-seamonkey/pkg-plist
index 7d8021a390af..27d9c8784d6b 100644
--- a/www/linux-seamonkey/pkg-plist
+++ b/www/linux-seamonkey/pkg-plist
@@ -87,7 +87,7 @@ lib/%%APP_NAME%%/libfreebl3.so
%%GTK218%%lib/%%APP_NAME%%/libgtk-x11-2.0.so.0
lib/%%APP_NAME%%/libldap60.so
lib/%%APP_NAME%%/libldif60.so
-lib/%%APP_NAME%%/libmozalloc.so
+lib/%%APP_NAME%%/liblgpllibs.so
lib/%%APP_NAME%%/libmozsqlite3.so
lib/%%APP_NAME%%/libnspr4.so
lib/%%APP_NAME%%/libnss3.so
diff --git a/www/seamonkey-i18n/Makefile b/www/seamonkey-i18n/Makefile
index 738322db5fda..b568b70719f3 100644
--- a/www/seamonkey-i18n/Makefile
+++ b/www/seamonkey-i18n/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= seamonkey-i18n
-PORTVERSION= 2.33.1
+PORTVERSION= 2.39
CATEGORIES= www mail news editors irc
MASTER_SITES= MOZILLA/${PORTNAME:S|-i18n||}/releases/${DISTVERSION}/langpack \
MOZILLA/${PORTNAME:S|-i18n||}/candidates/${DISTVERSION}-candidates/build1/langpack
diff --git a/www/seamonkey-i18n/distinfo b/www/seamonkey-i18n/distinfo
index 5fa603f4dc20..0e1d8c1af6e7 100644
--- a/www/seamonkey-i18n/distinfo
+++ b/www/seamonkey-i18n/distinfo
@@ -1,54 +1,54 @@
-SHA256 (xpi/seamonkey-i18n-2.33.1/seamonkey-2.33.1.be.langpack.xpi) = bd6ccc1b70c8fe41d43b5f0f05137454f425e572a631ac9641bd7549375ede34
-SIZE (xpi/seamonkey-i18n-2.33.1/seamonkey-2.33.1.be.langpack.xpi) = 842837
-SHA256 (xpi/seamonkey-i18n-2.33.1/seamonkey-2.33.1.ca.langpack.xpi) = f46880e8582a63d6af332c76d988fabb5077fba92affc1881ab8e3d24bf6b331
-SIZE (xpi/seamonkey-i18n-2.33.1/seamonkey-2.33.1.ca.langpack.xpi) = 834200
-SHA256 (xpi/seamonkey-i18n-2.33.1/seamonkey-2.33.1.cs.langpack.xpi) = 38c09955551adc43dc2e6dec6aafd199b4a6fe7886a761eaafaa70938e8c3cff
-SIZE (xpi/seamonkey-i18n-2.33.1/seamonkey-2.33.1.cs.langpack.xpi) = 831811
-SHA256 (xpi/seamonkey-i18n-2.33.1/seamonkey-2.33.1.de.langpack.xpi) = 36b12d7681556ed9501ba74e0b8e0564c41d87695f8b7b8960dde0b099f83500
-SIZE (xpi/seamonkey-i18n-2.33.1/seamonkey-2.33.1.de.langpack.xpi) = 838262
-SHA256 (xpi/seamonkey-i18n-2.33.1/seamonkey-2.33.1.en-GB.langpack.xpi) = 5521941e84ba5979abf4864e5eefbdd331580e6e76f5ae46d4c43cf0a67170da
-SIZE (xpi/seamonkey-i18n-2.33.1/seamonkey-2.33.1.en-GB.langpack.xpi) = 804289
-SHA256 (xpi/seamonkey-i18n-2.33.1/seamonkey-2.33.1.en-US.langpack.xpi) = f75c5e469d6680c45bb5b863aa11bc5ed87aa32f7ea25c6129109e8c07eef3f7
-SIZE (xpi/seamonkey-i18n-2.33.1/seamonkey-2.33.1.en-US.langpack.xpi) = 803780
-SHA256 (xpi/seamonkey-i18n-2.33.1/seamonkey-2.33.1.es-AR.langpack.xpi) = 40270d0af40557516049df8922f83dc4050dee0ad22599896fee226236115906
-SIZE (xpi/seamonkey-i18n-2.33.1/seamonkey-2.33.1.es-AR.langpack.xpi) = 852874
-SHA256 (xpi/seamonkey-i18n-2.33.1/seamonkey-2.33.1.es-ES.langpack.xpi) = 75b754919326c4ee9c114abadb02a387f91b7b65821b081eb820aaf50050621e
-SIZE (xpi/seamonkey-i18n-2.33.1/seamonkey-2.33.1.es-ES.langpack.xpi) = 830037
-SHA256 (xpi/seamonkey-i18n-2.33.1/seamonkey-2.33.1.fi.langpack.xpi) = 42f3a3001dcbd9f6ff8f77ef5094363231282b1e05959ed07469adce9e841efc
-SIZE (xpi/seamonkey-i18n-2.33.1/seamonkey-2.33.1.fi.langpack.xpi) = 801209
-SHA256 (xpi/seamonkey-i18n-2.33.1/seamonkey-2.33.1.fr.langpack.xpi) = 864455ed8186096d90daaf35368d22825e4c3f2bcc3829efe60c4345b532718b
-SIZE (xpi/seamonkey-i18n-2.33.1/seamonkey-2.33.1.fr.langpack.xpi) = 812075
-SHA256 (xpi/seamonkey-i18n-2.33.1/seamonkey-2.33.1.gl.langpack.xpi) = 74eac6af6cce412bd9a320696e78fd22e6e4a285b0873e21bc861df837a27d6a
-SIZE (xpi/seamonkey-i18n-2.33.1/seamonkey-2.33.1.gl.langpack.xpi) = 815203
-SHA256 (xpi/seamonkey-i18n-2.33.1/seamonkey-2.33.1.hu.langpack.xpi) = 3451b3b0604842a23dab9aadb91ed51bbf60431bc5b456d337dbb5c22aba1c93
-SIZE (xpi/seamonkey-i18n-2.33.1/seamonkey-2.33.1.hu.langpack.xpi) = 844136
-SHA256 (xpi/seamonkey-i18n-2.33.1/seamonkey-2.33.1.it.langpack.xpi) = e6975df4e7680199d133df63875e5eb8aa5b7ff4dcfa0ddadf4867e8b4f3b68d
-SIZE (xpi/seamonkey-i18n-2.33.1/seamonkey-2.33.1.it.langpack.xpi) = 742287
-SHA256 (xpi/seamonkey-i18n-2.33.1/seamonkey-2.33.1.ja-JP-mac.langpack.xpi) = 7b66f5eadc13b1f3758d82b0382b2e6693f6dbd5926c3916df62760dfd2c2f34
-SIZE (xpi/seamonkey-i18n-2.33.1/seamonkey-2.33.1.ja-JP-mac.langpack.xpi) = 901811
-SHA256 (xpi/seamonkey-i18n-2.33.1/seamonkey-2.33.1.ja.langpack.xpi) = e14120fbdece134b8716b47c28d7e7c823b3424cc238bd65980d91cc00ee9695
-SIZE (xpi/seamonkey-i18n-2.33.1/seamonkey-2.33.1.ja.langpack.xpi) = 886326
-SHA256 (xpi/seamonkey-i18n-2.33.1/seamonkey-2.33.1.lt.langpack.xpi) = 19f699e40637e9f4dd06561bcc99cc8adc54c2e5b4c9d19cdce05eefbfcb2e55
-SIZE (xpi/seamonkey-i18n-2.33.1/seamonkey-2.33.1.lt.langpack.xpi) = 853980
-SHA256 (xpi/seamonkey-i18n-2.33.1/seamonkey-2.33.1.nb-NO.langpack.xpi) = adafdef75d19013e0ae6aaf60986680a56cbb0f69b5c4332bd7202becb343699
-SIZE (xpi/seamonkey-i18n-2.33.1/seamonkey-2.33.1.nb-NO.langpack.xpi) = 824264
-SHA256 (xpi/seamonkey-i18n-2.33.1/seamonkey-2.33.1.nl.langpack.xpi) = 44cb967d184ac079ce8ece66a8875f7f338f464f7c10189c7241512dc766492e
-SIZE (xpi/seamonkey-i18n-2.33.1/seamonkey-2.33.1.nl.langpack.xpi) = 796770
-SHA256 (xpi/seamonkey-i18n-2.33.1/seamonkey-2.33.1.pl.langpack.xpi) = 48a0ee96e322f8c5da269744dc8a0fdde4395cc801a01d6aa2279696e81011a5
-SIZE (xpi/seamonkey-i18n-2.33.1/seamonkey-2.33.1.pl.langpack.xpi) = 867982
-SHA256 (xpi/seamonkey-i18n-2.33.1/seamonkey-2.33.1.pt-PT.langpack.xpi) = 6b109aaa7fb7402fbb383a0479a7010430d227df18c57010f78b3c80cd437f99
-SIZE (xpi/seamonkey-i18n-2.33.1/seamonkey-2.33.1.pt-PT.langpack.xpi) = 834974
-SHA256 (xpi/seamonkey-i18n-2.33.1/seamonkey-2.33.1.ru.langpack.xpi) = 3f7fa18e6da04e75b4e9a161e65aa45c16495bf78234eb1168573f3e0715ff9c
-SIZE (xpi/seamonkey-i18n-2.33.1/seamonkey-2.33.1.ru.langpack.xpi) = 899955
-SHA256 (xpi/seamonkey-i18n-2.33.1/seamonkey-2.33.1.sk.langpack.xpi) = c80460e380b74047149fe8885a4befc4efb762eb28c98a2df6d61d06fbd709f4
-SIZE (xpi/seamonkey-i18n-2.33.1/seamonkey-2.33.1.sk.langpack.xpi) = 857564
-SHA256 (xpi/seamonkey-i18n-2.33.1/seamonkey-2.33.1.sv-SE.langpack.xpi) = f42d0dc239e124488b57b0b96b1f9cc3cae2118525d5d2bf5e2ac699211c00fb
-SIZE (xpi/seamonkey-i18n-2.33.1/seamonkey-2.33.1.sv-SE.langpack.xpi) = 826424
-SHA256 (xpi/seamonkey-i18n-2.33.1/seamonkey-2.33.1.tr.langpack.xpi) = db1d8392f2d8c298d8b8a9a0da835cfcf14679a52dd96a8fad2c8dc7b29ea5dd
-SIZE (xpi/seamonkey-i18n-2.33.1/seamonkey-2.33.1.tr.langpack.xpi) = 812398
-SHA256 (xpi/seamonkey-i18n-2.33.1/seamonkey-2.33.1.uk.langpack.xpi) = 5f40259490b909023b318fa633fb8f549071c0bb23f2a1f3037c21c6792570da
-SIZE (xpi/seamonkey-i18n-2.33.1/seamonkey-2.33.1.uk.langpack.xpi) = 874106
-SHA256 (xpi/seamonkey-i18n-2.33.1/seamonkey-2.33.1.zh-CN.langpack.xpi) = 1e07dbcfc5739a5e76b13b07327ce81a753e7bfe503a3abd9d5f656d12f918aa
-SIZE (xpi/seamonkey-i18n-2.33.1/seamonkey-2.33.1.zh-CN.langpack.xpi) = 834422
-SHA256 (xpi/seamonkey-i18n-2.33.1/seamonkey-2.33.1.zh-TW.langpack.xpi) = b0c382d9fc410b7a2c4219511c461ca0cd9df14f5a8ac799cfa46d236af5d636
-SIZE (xpi/seamonkey-i18n-2.33.1/seamonkey-2.33.1.zh-TW.langpack.xpi) = 860687
+SHA256 (xpi/seamonkey-i18n-2.39/seamonkey-2.39.be.langpack.xpi) = 289803bc8d1669aa8dc116e55ffbef60a611002c39dbe9e461ad3546d82043d5
+SIZE (xpi/seamonkey-i18n-2.39/seamonkey-2.39.be.langpack.xpi) = 845960
+SHA256 (xpi/seamonkey-i18n-2.39/seamonkey-2.39.ca.langpack.xpi) = 7cd996abf7027189f6c3fd09501331b1bcf06a61f596cd7042d2a2a66b58e0e2
+SIZE (xpi/seamonkey-i18n-2.39/seamonkey-2.39.ca.langpack.xpi) = 837800
+SHA256 (xpi/seamonkey-i18n-2.39/seamonkey-2.39.cs.langpack.xpi) = 6204072196d5ef65cfd5a380d7a985f225f17b8bf5c945e7828ca33cdb09b2da
+SIZE (xpi/seamonkey-i18n-2.39/seamonkey-2.39.cs.langpack.xpi) = 830007
+SHA256 (xpi/seamonkey-i18n-2.39/seamonkey-2.39.de.langpack.xpi) = a12a02029fef8caa33a99c7bd254bcacf3825b1edbbbc7a2775a8f5a1756425f
+SIZE (xpi/seamonkey-i18n-2.39/seamonkey-2.39.de.langpack.xpi) = 838258
+SHA256 (xpi/seamonkey-i18n-2.39/seamonkey-2.39.en-GB.langpack.xpi) = 6b7d78e35df5609cdbc944cc4a36fade59d9d29ba761d31969b20be13eebff0e
+SIZE (xpi/seamonkey-i18n-2.39/seamonkey-2.39.en-GB.langpack.xpi) = 800622
+SHA256 (xpi/seamonkey-i18n-2.39/seamonkey-2.39.en-US.langpack.xpi) = 96c81e0e331f9691d151fb32748e48dea57c0a2c5e7d2bfb69e619c931e7446b
+SIZE (xpi/seamonkey-i18n-2.39/seamonkey-2.39.en-US.langpack.xpi) = 800201
+SHA256 (xpi/seamonkey-i18n-2.39/seamonkey-2.39.es-AR.langpack.xpi) = f9c92da4f70391413c4be4255332add2fa60a54d8e42c3205badffc4579717da
+SIZE (xpi/seamonkey-i18n-2.39/seamonkey-2.39.es-AR.langpack.xpi) = 849345
+SHA256 (xpi/seamonkey-i18n-2.39/seamonkey-2.39.es-ES.langpack.xpi) = fe0d89ba946aff3ff90e6751491a64acf381d2fb176ed10270d113bc572e22f2
+SIZE (xpi/seamonkey-i18n-2.39/seamonkey-2.39.es-ES.langpack.xpi) = 817622
+SHA256 (xpi/seamonkey-i18n-2.39/seamonkey-2.39.fi.langpack.xpi) = c1732389c3d532ca50152fda28495387e66c6ab9cfcda0b607936e9601549310
+SIZE (xpi/seamonkey-i18n-2.39/seamonkey-2.39.fi.langpack.xpi) = 804879
+SHA256 (xpi/seamonkey-i18n-2.39/seamonkey-2.39.fr.langpack.xpi) = fa90086e2d3cc968010c222e58d5e4b465c2c374e07223191483b574db772999
+SIZE (xpi/seamonkey-i18n-2.39/seamonkey-2.39.fr.langpack.xpi) = 810559
+SHA256 (xpi/seamonkey-i18n-2.39/seamonkey-2.39.gl.langpack.xpi) = 20b888b8f9c2c2115e8a3a2157d6f8da353c484d573da0d347ffffd41f99bc76
+SIZE (xpi/seamonkey-i18n-2.39/seamonkey-2.39.gl.langpack.xpi) = 816387
+SHA256 (xpi/seamonkey-i18n-2.39/seamonkey-2.39.hu.langpack.xpi) = a13b872cf8ecc3cfaf1d8fc5e9a136ba4abd8ae07f4fff15e6dbe9fdd9e5ad7c
+SIZE (xpi/seamonkey-i18n-2.39/seamonkey-2.39.hu.langpack.xpi) = 848211
+SHA256 (xpi/seamonkey-i18n-2.39/seamonkey-2.39.it.langpack.xpi) = 65fd240cdad3bc4808f0eb35ccf7cfeb9c5c69ba28d446fce91f225b0161ce97
+SIZE (xpi/seamonkey-i18n-2.39/seamonkey-2.39.it.langpack.xpi) = 728624
+SHA256 (xpi/seamonkey-i18n-2.39/seamonkey-2.39.ja-JP-mac.langpack.xpi) = 843e6de0158c52fb3eda6e2dd02b92b45e2dbf7a7b10f7b43aff5672a0ffd295
+SIZE (xpi/seamonkey-i18n-2.39/seamonkey-2.39.ja-JP-mac.langpack.xpi) = 902319
+SHA256 (xpi/seamonkey-i18n-2.39/seamonkey-2.39.ja.langpack.xpi) = 859ee3e4733f944af91d06051cd99fb78f1bb7d60f012e8cf433cf65fb0d17a3
+SIZE (xpi/seamonkey-i18n-2.39/seamonkey-2.39.ja.langpack.xpi) = 886715
+SHA256 (xpi/seamonkey-i18n-2.39/seamonkey-2.39.lt.langpack.xpi) = bcd3b61379bbd1c28974f4609aefa25ece6b5f64715c4cb52b6eafffb60f23e6
+SIZE (xpi/seamonkey-i18n-2.39/seamonkey-2.39.lt.langpack.xpi) = 857561
+SHA256 (xpi/seamonkey-i18n-2.39/seamonkey-2.39.nb-NO.langpack.xpi) = 9a7280be0ae9bdf0f21ad89749cbd050dcac588989c33b016bf79496ad3660df
+SIZE (xpi/seamonkey-i18n-2.39/seamonkey-2.39.nb-NO.langpack.xpi) = 827941
+SHA256 (xpi/seamonkey-i18n-2.39/seamonkey-2.39.nl.langpack.xpi) = 6e880ed775dbf46eb62e3ac9b8a55091790a451f86776aa5ba0de1945d8a23aa
+SIZE (xpi/seamonkey-i18n-2.39/seamonkey-2.39.nl.langpack.xpi) = 795152
+SHA256 (xpi/seamonkey-i18n-2.39/seamonkey-2.39.pl.langpack.xpi) = 00cc6c894fc6dab4a22e9d38fb6037850f8e57a13f8150d64e8faf3878f204c8
+SIZE (xpi/seamonkey-i18n-2.39/seamonkey-2.39.pl.langpack.xpi) = 860260
+SHA256 (xpi/seamonkey-i18n-2.39/seamonkey-2.39.pt-PT.langpack.xpi) = 7be70081c211aed53e98228ed9f9d20741f227bbafb696acf44a5eae20a286f1
+SIZE (xpi/seamonkey-i18n-2.39/seamonkey-2.39.pt-PT.langpack.xpi) = 830427
+SHA256 (xpi/seamonkey-i18n-2.39/seamonkey-2.39.ru.langpack.xpi) = 9ad1066cb6cc07a49bbd0b2e8295db65e490a07af7c36485ae607d788817ec5e
+SIZE (xpi/seamonkey-i18n-2.39/seamonkey-2.39.ru.langpack.xpi) = 889891
+SHA256 (xpi/seamonkey-i18n-2.39/seamonkey-2.39.sk.langpack.xpi) = f70af092108244bc70d3daa53fd41bd3a47c1af518afeca2b6f431952643c6e7
+SIZE (xpi/seamonkey-i18n-2.39/seamonkey-2.39.sk.langpack.xpi) = 856745
+SHA256 (xpi/seamonkey-i18n-2.39/seamonkey-2.39.sv-SE.langpack.xpi) = 4ee82e2d89fd9846b4fc9465797c2f04facea76b10bf00d82ade5a581b6c5c59
+SIZE (xpi/seamonkey-i18n-2.39/seamonkey-2.39.sv-SE.langpack.xpi) = 823333
+SHA256 (xpi/seamonkey-i18n-2.39/seamonkey-2.39.tr.langpack.xpi) = 9d5e12b135b8157ab0febe7d2253466cc90ee410322234ebe23a3b4de83461b3
+SIZE (xpi/seamonkey-i18n-2.39/seamonkey-2.39.tr.langpack.xpi) = 813628
+SHA256 (xpi/seamonkey-i18n-2.39/seamonkey-2.39.uk.langpack.xpi) = 6b4bed5fd385b1666579cf69cf094f7f81e4533be62915b02a9154ed9bbed6fe
+SIZE (xpi/seamonkey-i18n-2.39/seamonkey-2.39.uk.langpack.xpi) = 875396
+SHA256 (xpi/seamonkey-i18n-2.39/seamonkey-2.39.zh-CN.langpack.xpi) = 7cdb2dc31da908a506fca78c93008cf1b6ce9ef3dddb0fcb38b383bf9e5be556
+SIZE (xpi/seamonkey-i18n-2.39/seamonkey-2.39.zh-CN.langpack.xpi) = 838756
+SHA256 (xpi/seamonkey-i18n-2.39/seamonkey-2.39.zh-TW.langpack.xpi) = a3ae379666ff757e0424918491ae1aa710d08aa586d0fd4526bf4dd838c1461c
+SIZE (xpi/seamonkey-i18n-2.39/seamonkey-2.39.zh-TW.langpack.xpi) = 860307
diff --git a/www/seamonkey/Makefile b/www/seamonkey/Makefile
index 6edb87792302..02e5f0efc77e 100644
--- a/www/seamonkey/Makefile
+++ b/www/seamonkey/Makefile
@@ -2,8 +2,8 @@
# $FreeBSD$
PORTNAME= seamonkey
-DISTVERSION= 2.33.1
-PORTREVISION= 9
+DISTVERSION= 2.39
+MOZILLA_VER= 42 # above + 3
CATEGORIES?= www mail news editors irc ipv6
MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \
MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source
@@ -13,33 +13,34 @@ EXTRACT_ONLY= ${PORTNAME}-${DISTVERSION}.source${EXTRACT_SUFX}
MAINTAINER= gecko@FreeBSD.org
COMMENT= The open source, standards compliant web browser
-BUILD_DEPENDS= nspr>=4.10.6:${PORTSDIR}/devel/nspr \
- nss>=3.17.4:${PORTSDIR}/security/nss \
+BUILD_DEPENDS= nspr>=4.10.10:${PORTSDIR}/devel/nspr \
+ nss>=3.19.4:${PORTSDIR}/security/nss \
libevent2>=2.0.21_2:${PORTSDIR}/devel/libevent2 \
soundtouch>=1.8.0:${PORTSDIR}/audio/soundtouch \
harfbuzz>=0.9.34:${PORTSDIR}/print/harfbuzz \
graphite2>=1.2.4:${PORTSDIR}/graphics/graphite2 \
libvorbis>=1.3.5:${PORTSDIR}/audio/libvorbis \
- opus>=1.1:${PORTSDIR}/audio/opus \
libvpx>=1.3.0:${PORTSDIR}/multimedia/libvpx \
- sqlite3>=3.8.7.4:${PORTSDIR}/databases/sqlite3 \
+ sqlite3>=3.8.9:${PORTSDIR}/databases/sqlite3 \
${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \
v4l_compat>0:${PORTSDIR}/multimedia/v4l_compat \
autoconf-2.13:${PORTSDIR}/devel/autoconf213 \
+ yasm:${PORTSDIR}/devel/yasm \
zip:${PORTSDIR}/archivers/zip \
unzip:${PORTSDIR}/archivers/unzip
+# opus>=1.1:${PORTSDIR}/audio/opus \
LIB_DEPENDS= libv4l2.so:${PORTSDIR}/multimedia/libv4l
EM_VERSION= 1.8.2
-L_VERSION= 3.8
+L_VERSION= 4.4
SSP_UNSAFE= yes
USE_GECKO= gecko
USE_QT5= # empty
QT_NONSTANDARD= yes
USE_GL= gl
-USES= dos2unix tar:bzip2
+USES= dos2unix tar:xz
DOS2UNIX_FILES= mozilla/media/webrtc/trunk/webrtc/system_wrappers/source/spreadsortlib/spreadsort.hpp
MOZ_PIS_SCRIPTS= moz_pis_S50cleanhome
@@ -47,11 +48,12 @@ MOZ_EXTENSIONS= default
MOZ_OPTIONS+= --program-transform-name='s/seamonkey/${MOZILLA}/' \
--enable-application=suite
-USE_MOZILLA= # empty
+USE_MOZILLA= -opus
MOZ_PKGCONFIG_FILES=
NOT_FOR_ARCHS= ia64
+OPTIONS_EXCLUDE=LOGGING
OPTIONS_DEFINE= CHATZILLA COMPOSER ENIGMAIL LDAP LIGHTNING MAILNEWS
OPTIONS_DEFAULT=CANBERRA CHATZILLA COMPOSER ENIGMAIL LDAP LIGHTNING MAILNEWS
@@ -69,7 +71,7 @@ MOZ_EXTENSIONS:= ${MOZ_EXTENSIONS},irc
.include <bsd.port.pre.mk>
-WRKSRC= ${WRKDIR}/comm-release
+WRKSRC:= ${WRKDIR}/${PORTNAME}-${DISTVERSION}
MOZSRC:= ${WRKSRC}/mozilla
XPI_LIBDIR= ${PREFIX}/lib/xpi
diff --git a/www/seamonkey/distinfo b/www/seamonkey/distinfo
index 8659d17476dd..056d9ebe1ad0 100644
--- a/www/seamonkey/distinfo
+++ b/www/seamonkey/distinfo
@@ -1,4 +1,4 @@
-SHA256 (seamonkey-2.33.1.source.tar.bz2) = b29779cfd4b334ed21a8265ec13327aa7f35ef2895c38a971e41f3e63c85af08
-SIZE (seamonkey-2.33.1.source.tar.bz2) = 203015246
+SHA256 (seamonkey-2.39.source.tar.xz) = c871de0a64cb60acf785df0ea3859b729353e5d1e3274947840386766859930e
+SIZE (seamonkey-2.39.source.tar.xz) = 182627632
SHA256 (enigmail-1.8.2.tar.gz) = 1d2700799bc52aaa8e8c9f7a0f5111281ff9fbdffc093cdff070657d574eb2a6
SIZE (enigmail-1.8.2.tar.gz) = 1604159
diff --git a/www/seamonkey/files/extra-patch-bug1125514 b/www/seamonkey/files/extra-patch-bug1125514
index 86f7884b20d6..4d31cf5ebada 100644
--- a/www/seamonkey/files/extra-patch-bug1125514
+++ b/www/seamonkey/files/extra-patch-bug1125514
@@ -5,7 +5,7 @@ summary: Bug 1125514 - Use jemalloc's metadata statistics to compute bookkee
--- mozilla/memory/build/mozjemalloc_compat.c~
+++ mozilla/memory/build/mozjemalloc_compat.c
-@@ -66,6 +66,7 @@ jemalloc_stats_impl(jemalloc_stats_t *st
+@@ -136,6 +136,7 @@ jemalloc_stats_impl(jemalloc_stats_t *st
{
unsigned narenas;
size_t active, allocated, mapped, page, pdirty;
@@ -13,27 +13,24 @@ summary: Bug 1125514 - Use jemalloc's metadata statistics to compute bookkee
size_t lg_chunk;
// Refresh jemalloc's stats by updating its epoch, see ctl_refresh in
-@@ -79,20 +80,19 @@ jemalloc_stats_impl(jemalloc_stats_t *st
+@@ -149,17 +150,19 @@ jemalloc_stats_impl(jemalloc_stats_t *st
CTL_GET("stats.active", active);
CTL_GET("stats.allocated", allocated);
CTL_GET("stats.mapped", mapped);
+ CTL_GET("stats.metadata", meta);
CTL_GET("opt.lg_chunk", lg_chunk);
+- CTL_GET("stats.bookkeeping", stats->bookkeeping);
/* get the summation for all arenas, i == narenas */
CTL_I_GET("stats.arenas.0.pdirty", pdirty, narenas);
+ CTL_I_GET("stats.arenas.0.metadata.allocated", ameta, narenas);
- stats->chunksize = 1 << lg_chunk;
+ stats->chunksize = (size_t) 1 << lg_chunk;
stats->mapped = mapped;
stats->allocated = allocated;
stats->waste = active - allocated;
stats->page_cache = pdirty * page;
--
-- // We could get this value out of base.c::base_pages, but that really should
-- // be an upstream change, so don't worry about it for now.
-- stats->bookkeeping = 0;
+ stats->bookkeeping = meta - ameta;
- stats->bin_unused = 0;
+ stats->bin_unused = compute_bin_unused(narenas);
+ stats->waste -= stats->bin_unused;
}
-
diff --git a/www/seamonkey/files/patch-bug1021761 b/www/seamonkey/files/patch-bug1021761
index 15c899907dd9..e211a7087f69 100644
--- a/www/seamonkey/files/patch-bug1021761
+++ b/www/seamonkey/files/patch-bug1021761
@@ -542,42 +542,42 @@ index a962553..1f780f4 100644
}
alsa_locked_pcm_close(stm->pcm);
stm->pcm = NULL;
-@@ -937,12 +1043,12 @@ alsa_get_max_channel_count(cubeb * ctx, uint32_t * max_channels)
+@@ -938,12 +1044,12 @@ alsa_get_max_channel_count(cubeb * ctx, uint32_t * max_channels)
return CUBEB_ERROR;
}
-- rv = snd_pcm_hw_params_any(stm->pcm, hw_params);
-+ rv = WRAP(snd_pcm_hw_params_any)(stm->pcm, hw_params);
- if (rv < 0) {
+- r = snd_pcm_hw_params_any(stm->pcm, hw_params);
++ r = WRAP(snd_pcm_hw_params_any)(stm->pcm, hw_params);
+ if (r < 0) {
return CUBEB_ERROR;
}
-- rv = snd_pcm_hw_params_get_channels_max(hw_params, max_channels);
-+ rv = WRAP(snd_pcm_hw_params_get_channels_max)(hw_params, max_channels);
- if (rv < 0) {
+- r = snd_pcm_hw_params_get_channels_max(hw_params, max_channels);
++ r = WRAP(snd_pcm_hw_params_get_channels_max)(hw_params, max_channels);
+ if (r < 0) {
return CUBEB_ERROR;
}
-@@ -962,34 +1068,34 @@ alsa_get_preferred_sample_rate(cubeb * ctx, uint32_t * rate) {
+@@ -963,34 +1069,34 @@ alsa_get_preferred_sample_rate(cubeb * ctx, uint32_t * rate) {
/* get a pcm, disabling resampling, so we get a rate the
* hardware/dmix/pulse/etc. supports. */
-- rv = snd_pcm_open(&pcm, "", SND_PCM_STREAM_PLAYBACK | SND_PCM_NO_AUTO_RESAMPLE, 0);
-+ rv = WRAP(snd_pcm_open)(&pcm, "", SND_PCM_STREAM_PLAYBACK | SND_PCM_NO_AUTO_RESAMPLE, 0);
- if (rv < 0) {
+- r = snd_pcm_open(&pcm, "default", SND_PCM_STREAM_PLAYBACK | SND_PCM_NO_AUTO_RESAMPLE, 0);
++ r = WRAP(snd_pcm_open)(&pcm, "default", SND_PCM_STREAM_PLAYBACK | SND_PCM_NO_AUTO_RESAMPLE, 0);
+ if (r < 0) {
return CUBEB_ERROR;
}
-- rv = snd_pcm_hw_params_any(pcm, hw_params);
-+ rv = WRAP(snd_pcm_hw_params_any)(pcm, hw_params);
- if (rv < 0) {
+- r = snd_pcm_hw_params_any(pcm, hw_params);
++ r = WRAP(snd_pcm_hw_params_any)(pcm, hw_params);
+ if (r < 0) {
- snd_pcm_close(pcm);
+ WRAP(snd_pcm_close)(pcm);
return CUBEB_ERROR;
}
-- rv = snd_pcm_hw_params_get_rate(hw_params, rate, &dir);
-+ rv = WRAP(snd_pcm_hw_params_get_rate)(hw_params, rate, &dir);
- if (rv >= 0) {
+- r = snd_pcm_hw_params_get_rate(hw_params, rate, &dir);
++ r = WRAP(snd_pcm_hw_params_get_rate)(hw_params, rate, &dir);
+ if (r >= 0) {
/* There is a default rate: use it. */
- snd_pcm_close(pcm);
+ WRAP(snd_pcm_close)(pcm);
@@ -587,9 +587,9 @@ index a962553..1f780f4 100644
/* Use a common rate, alsa may adjust it based on hw/etc. capabilities. */
*rate = 44100;
-- rv = snd_pcm_hw_params_set_rate_near(pcm, hw_params, rate, NULL);
-+ rv = WRAP(snd_pcm_hw_params_set_rate_near)(pcm, hw_params, rate, NULL);
- if (rv < 0) {
+- r = snd_pcm_hw_params_set_rate_near(pcm, hw_params, rate, NULL);
++ r = WRAP(snd_pcm_hw_params_set_rate_near)(pcm, hw_params, rate, NULL);
+ if (r < 0) {
- snd_pcm_close(pcm);
+ WRAP(snd_pcm_close)(pcm);
return CUBEB_ERROR;
@@ -1070,11 +1070,11 @@ index 8b7a0dd..31212ce 100644
+CFLAGS += CONFIG['MOZ_OSS_CFLAGS']
CFLAGS += CONFIG['MOZ_ALSA_CFLAGS']
CFLAGS += CONFIG['MOZ_PULSEAUDIO_CFLAGS']
-diff --git media/webrtc/signaling/test/moz.build media/webrtc/signaling/test/moz.build
+diff --git media/webrtc/signaling/test/common.build media/webrtc/signaling/test/common.build
index 991f03f..3d99eb5 100644
---- mozilla/media/webrtc/signaling/test/moz.build
-+++ mozilla/media/webrtc/signaling/test/moz.build
-@@ -112,8 +112,8 @@ if CONFIG['JS_SHARED_LIBRARY']:
+--- mozilla/media/webrtc/signaling/test/common.build
++++ mozilla/media/webrtc/signaling/test/common.build
+@@ -102,8 +102,8 @@ USE_LIBS += ['mozglue']
OS_LIBS += CONFIG['MOZ_WEBRTC_X11_LIBS']
OS_LIBS += CONFIG['REALTIME_LIBS']
diff --git a/www/seamonkey/files/patch-bug1103858 b/www/seamonkey/files/patch-bug1103858
deleted file mode 100644
index 71ce13eb116e..000000000000
--- a/www/seamonkey/files/patch-bug1103858
+++ /dev/null
@@ -1,42 +0,0 @@
-diff --git configure.in configure.in
-index b2b45e7..dcfdfb7 100644
---- mozilla/configure.in
-+++ mozilla/configure.in
-@@ -8346,7 +8346,7 @@ case "$OS_TARGET" in
- NECKO_WIFI=1
- fi
- ;;
-- Darwin|FreeBSD|SunOS|WINNT)
-+ Darwin|DragonFly|FreeBSD|SunOS|WINNT)
- NECKO_WIFI=1
- ;;
- Linux)
-diff --git netwerk/wifi/moz.build netwerk/wifi/moz.build
-index d4de063..3949380 100644
---- mozilla/netwerk/wifi/moz.build
-+++ mozilla/netwerk/wifi/moz.build
-@@ -35,7 +35,7 @@ if CONFIG['OS_ARCH'] == 'Darwin':
- UNIFIED_SOURCES += [
- 'osx_corewlan.mm',
- ]
--elif CONFIG['OS_ARCH'] == 'FreeBSD':
-+elif CONFIG['OS_ARCH'] in ('DragonFly', 'FreeBSD'):
- UNIFIED_SOURCES += [
- 'nsWifiScannerFreeBSD.cpp',
- ]
-diff --git netwerk/wifi/nsWifiScannerFreeBSD.cpp netwerk/wifi/nsWifiScannerFreeBSD.cpp
-index bdf171e..4185d69 100644
---- mozilla/netwerk/wifi/nsWifiScannerFreeBSD.cpp
-+++ mozilla/netwerk/wifi/nsWifiScannerFreeBSD.cpp
-@@ -13,7 +13,11 @@
- #include <sys/socket.h>
- #include <net/if.h>
- #include <net/if_media.h>
-+#ifdef __DragonFly__
-+#include <netproto/802_11/ieee80211_ioctl.h>
-+#else
- #include <net80211/ieee80211_ioctl.h>
-+#endif
-
- #include <ifaddrs.h>
- #include <string.h>
diff --git a/www/seamonkey/files/patch-bug1112904 b/www/seamonkey/files/patch-bug1112904
deleted file mode 100644
index 96fa3a4a1c74..000000000000
--- a/www/seamonkey/files/patch-bug1112904
+++ /dev/null
@@ -1,161 +0,0 @@
-diff --git a/c-sdk/config/FreeBSD.mk b/c-sdk/config/FreeBSD.mk
---- ldap/sdks/c-sdk/config/FreeBSD.mk
-+++ ldap/sdks/c-sdk/config/FreeBSD.mk
-@@ -79,8 +79,8 @@ DLL_SUFFIX = so.1.0
- endif
-
- DSO_CFLAGS = -fPIC
--DSO_LDOPTS = -Bshareable
-+DSO_LDOPTS = -shared -Wl,-soname,$(notdir $@)
-
--MKSHLIB = $(LD) $(DSO_LDOPTS)
-+MKSHLIB = $(CC) $(DSO_LDOPTS)
-
- G++INCLUDES = -I/usr/include/g++
-diff --git a/c-sdk/configure b/c-sdk/configure
---- ldap/sdks/c-sdk/configure
-+++ ldap/sdks/c-sdk/configure
-@@ -4241,8 +4241,10 @@ EOF
- #define DRAGONFLY 1
- EOF
-
-+ LD='$(CC)'
-+ MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
- DSO_CFLAGS=-fPIC
-- DSO_LDOPTS='-shared'
-+ DSO_LDOPTS='-shared -Wl,-soname,$(notdir $@)'
- ;;
-
- *-freebsd*)
-@@ -4261,6 +4263,7 @@ EOF
- #define HAVE_BSD_FLOCK 1
- EOF
-
-+ LD='$(CC)'
- CFLAGS="$CFLAGS $(DSO_CFLAGS) -ansi -Wall"
- MOZ_OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
- if test "$MOZ_OBJFORMAT" = "elf"; then
-@@ -4268,8 +4271,9 @@ EOF
- else
- DLL_SUFFIX=so.1.0
- fi
-+ MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
- DSO_CFLAGS=-fPIC
-- DSO_LDOPTS=-Bshareable
-+ DSO_LDOPTS='-shared -Wl,-soname,$(notdir $@)'
- ;;
-
- *-hpux*)
-@@ -6512,8 +6516,15 @@ echo "configure:6510: checking whether $
- if test $? -eq 0; then
- if test -z "`egrep -i '(unrecognize|unknown)' conftest.out | grep pthread`" && test -z "`egrep -i '(error|incorrect)' conftest.out`" ; then
- ac_cv_have_dash_pthread=yes
-- CFLAGS="$CFLAGS -pthread"
-- CXXFLAGS="$CXXFLAGS -pthread"
-+ case "$target_os" in
-+ dragonfly*|freebsd*)
-+# Freebsd doesn't use -pthread for compiles, it uses them for linking
-+ ;;
-+ *)
-+ CFLAGS="$CFLAGS -pthread"
-+ CXXFLAGS="$CXXFLAGS -pthread"
-+ ;;
-+ esac
- fi
- fi
- rm -f conftest*
-@@ -6542,7 +6553,22 @@ echo "configure:6526: checking whether $
- _PTHREAD_LDFLAGS=
- fi
- ;;
-- *-freebsd*|*-openbsd*|*-bsdi*|*-netbsd*)
-+ *-dragonfly*|*-freebsd*)
-+ cat >> confdefs.h <<\EOF
-+#define _REENTRANT 1
-+EOF
-+
-+ cat >> confdefs.h <<\EOF
-+#define _THREAD_SAFE 1
-+EOF
-+
-+ if test "$ac_cv_have_dash_pthread" = "yes"; then
-+ _PTHREAD_LDFLAGS="-pthread"
-+ else
-+ _PTHREAD_LDFLAGS="-lc_r"
-+ fi
-+ ;;
-+ *-openbsd*|*-bsdi*|*-netbsd*)
- cat >> confdefs.h <<\EOF
- #define _THREAD_SAFE 1
- EOF
-diff --git a/c-sdk/configure.in b/c-sdk/configure.in
---- ldap/sdks/c-sdk/configure.in
-+++ ldap/sdks/c-sdk/configure.in
-@@ -1225,8 +1225,10 @@ tools are selected during the Xcode/Deve
- fi
- AC_DEFINE(XP_UNIX)
- AC_DEFINE(DRAGONFLY)
-+ LD='$(CC)'
-+ MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
- DSO_CFLAGS=-fPIC
-- DSO_LDOPTS='-shared'
-+ DSO_LDOPTS='-shared -Wl,-soname,$(notdir $@)'
- ;;
-
- *-freebsd*)
-@@ -1236,6 +1238,7 @@ tools are selected during the Xcode/Deve
- AC_DEFINE(XP_UNIX)
- AC_DEFINE(FREEBSD)
- AC_DEFINE(HAVE_BSD_FLOCK)
-+ LD='$(CC)'
- CFLAGS="$CFLAGS $(DSO_CFLAGS) -ansi -Wall"
- MOZ_OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
- if test "$MOZ_OBJFORMAT" = "elf"; then
-@@ -1243,8 +1246,9 @@ tools are selected during the Xcode/Deve
- else
- DLL_SUFFIX=so.1.0
- fi
-+ MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
- DSO_CFLAGS=-fPIC
-- DSO_LDOPTS=-Bshareable
-+ DSO_LDOPTS='-shared -Wl,-soname,$(notdir $@)'
- ;;
-
- *-hpux*)
-@@ -2329,8 +2333,15 @@ if test -n "$USE_PTHREADS"; then
- if test $? -eq 0; then
- if test -z "`egrep -i '(unrecognize|unknown)' conftest.out | grep pthread`" && test -z "`egrep -i '(error|incorrect)' conftest.out`" ; then
- ac_cv_have_dash_pthread=yes
-- CFLAGS="$CFLAGS -pthread"
-- CXXFLAGS="$CXXFLAGS -pthread"
-+ case "$target_os" in
-+ dragonfly*|freebsd*)
-+# Freebsd doesn't use -pthread for compiles, it uses them for linking
-+ ;;
-+ *)
-+ CFLAGS="$CFLAGS -pthread"
-+ CXXFLAGS="$CXXFLAGS -pthread"
-+ ;;
-+ esac
- fi
- fi
- rm -f conftest*
-@@ -2361,7 +2372,17 @@ if test -n "$USE_PTHREADS"; then
- _PTHREAD_LDFLAGS=
- fi
- ;;
-- *-freebsd*|*-openbsd*|*-bsdi*|*-netbsd*)
-+ *-dragonfly*|*-freebsd*)
-+ AC_DEFINE(_REENTRANT)
-+ AC_DEFINE(_THREAD_SAFE)
-+ dnl -pthread links in -lc_r, so don't specify it explicitly.
-+ if test "$ac_cv_have_dash_pthread" = "yes"; then
-+ _PTHREAD_LDFLAGS="-pthread"
-+ else
-+ _PTHREAD_LDFLAGS="-lc_r"
-+ fi
-+ ;;
-+ *-openbsd*|*-bsdi*|*-netbsd*)
- AC_DEFINE(_THREAD_SAFE)
- dnl -pthread links in -lc_r, so don't specify it explicitly.
- if test "$ac_cv_have_dash_pthread" = "yes"; then
diff --git a/www/seamonkey/files/patch-bug1122547 b/www/seamonkey/files/patch-bug1122547
deleted file mode 100644
index 1ccacf9ce842..000000000000
--- a/www/seamonkey/files/patch-bug1122547
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git media/webrtc/trunk/webrtc/modules/video_coding/main/source/receiver.cc media/webrtc/trunk/webrtc/modules/video_coding/main/source/receiver.cc
-index e68a104..a090241 100644
---- mozilla/media/webrtc/trunk/webrtc/modules/video_coding/main/source/receiver.cc
-+++ mozilla/media/webrtc/trunk/webrtc/modules/video_coding/main/source/receiver.cc
-@@ -159,12 +159,13 @@ VCMEncodedFrame* VCMReceiver::FrameForDecoding(
- // Assume that render timing errors are due to changes in the video stream.
- if (next_render_time_ms < 0) {
- timing_error = true;
-- } else if (std::abs(next_render_time_ms - now_ms) > max_video_delay_ms_) {
-+ } else if (std::abs(static_cast<int>(next_render_time_ms - now_ms)) >
-+ max_video_delay_ms_) {
- WEBRTC_TRACE(webrtc::kTraceWarning, webrtc::kTraceVideoCoding,
- VCMId(vcm_id_, receiver_id_),
- "This frame is out of our delay bounds, resetting jitter "
- "buffer: %d > %d",
-- static_cast<int>(std::abs(next_render_time_ms - now_ms)),
-+ std::abs(static_cast<int>(next_render_time_ms - now_ms)),
- max_video_delay_ms_);
- timing_error = true;
- } else if (static_cast<int>(timing_->TargetVideoDelay()) >
diff --git a/www/seamonkey/files/patch-bug1125579 b/www/seamonkey/files/patch-bug1125579
deleted file mode 100644
index ce26c0c40e56..000000000000
--- a/www/seamonkey/files/patch-bug1125579
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git js/src/jit/ExecutableAllocator.h js/src/jit/ExecutableAllocator.h
-index d55c8ed..ab6188f 100644
---- mozilla/js/src/jit/ExecutableAllocator.h
-+++ mozilla/js/src/jit/ExecutableAllocator.h
-@@ -405,6 +405,11 @@ public:
- _flush_cache(reinterpret_cast<char*>(code), size, BCACHE);
- #endif
- }
-+#elif defined(JS_CODEGEN_ARM) && (defined(__FreeBSD__) || defined(__NetBSD__))
-+ static void cacheFlush(void* code, size_t size)
-+ {
-+ __clear_cache(code, reinterpret_cast<char*>(code) + size);
-+ }
- #elif defined(JS_CODEGEN_ARM) && (defined(__linux__) || defined(ANDROID)) && defined(__GNUC__)
- static void cacheFlush(void* code, size_t size)
- {
diff --git a/www/seamonkey/files/patch-bug1125580 b/www/seamonkey/files/patch-bug1125580
deleted file mode 100644
index c8b820eeb1d4..000000000000
--- a/www/seamonkey/files/patch-bug1125580
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git js/src/jit/arm/Architecture-arm.cpp js/src/jit/arm/Architecture-arm.cpp
-index fe1373b..76641aa 100644
---- mozilla/js/src/jit/arm/Architecture-arm.cpp
-+++ mozilla/js/src/jit/arm/Architecture-arm.cpp
-@@ -16,7 +16,7 @@
- #include "jit/arm/Assembler-arm.h"
- #include "jit/RegisterSets.h"
-
--#if defined(ANDROID) || defined(JS_ARM_SIMULATOR)
-+#if !defined(__linux__) || defined(ANDROID) || defined(JS_ARM_SIMULATOR)
- // The Android NDK and B2G do not include the hwcap.h kernel header, and it is not
- // defined when building the simulator, so inline the header defines we need.
- # define HWCAP_VFP (1 << 6)
diff --git a/www/seamonkey/files/patch-bug1128161 b/www/seamonkey/files/patch-bug1128161
deleted file mode 100644
index 56349a2ea252..000000000000
--- a/www/seamonkey/files/patch-bug1128161
+++ /dev/null
@@ -1,28 +0,0 @@
-commit 6af7f0e6
-Author: Chris Double <chris.double@double.co.nz>
-Date: Tue Feb 3 11:20:17 2015 +1300
-
- Bug 1128161 - Fix build error when logging is disabled - r=ajones
----
- dom/media/mediasource/MediaSourceUtils.cpp | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git dom/media/mediasource/MediaSourceUtils.cpp dom/media/mediasource/MediaSourceUtils.cpp
-index 44a40f5..83bba60 100644
---- mozilla/dom/media/mediasource/MediaSourceUtils.cpp
-+++ mozilla/dom/media/mediasource/MediaSourceUtils.cpp
-@@ -11,7 +11,6 @@
-
- namespace mozilla {
-
--#if defined(PR_LOGGING)
- nsCString
- DumpTimeRanges(dom::TimeRanges* aRanges)
- {
-@@ -31,6 +30,5 @@ DumpTimeRanges(dom::TimeRanges* aRanges)
-
- return dump;
- }
--#endif
-
- } // namespace mozilla
diff --git a/www/seamonkey/files/patch-bug1143411 b/www/seamonkey/files/patch-bug1143411
deleted file mode 100644
index f0b27daa4e5d..000000000000
--- a/www/seamonkey/files/patch-bug1143411
+++ /dev/null
@@ -1,27 +0,0 @@
-https://bugzilla.mozilla.org/show_bug.cgi?id=1143411
-
-diff --git a/config/system-headers b/config/system-headers
---- mozilla/config/system-headers
-+++ mozilla/config/system-headers
-@@ -465,16 +465,17 @@ freetype/tttables.h
- freetype/t1tables.h
- freetype/ftlcdfil.h
- freetype/ftsizes.h
- freetype/ftadvanc.h
- freetype/ftbitmap.h
- freetype/ftxf86.h
- freetype.h
- ftcache.h
-+ftfntfmt.h
- ftglyph.h
- ftsynth.h
- ftoutln.h
- ttnameid.h
- tttables.h
- t1tables.h
- ftlcdfil.h
- ftsizes.h
-
-
-
-
diff --git a/www/seamonkey/files/patch-bug292127 b/www/seamonkey/files/patch-bug292127
index c20ff1d564a3..1c734a93ebdd 100644
--- a/www/seamonkey/files/patch-bug292127
+++ b/www/seamonkey/files/patch-bug292127
@@ -1,5 +1,5 @@
---- ldap/sdks/c-sdk/ldap/include/ldap.h~
-+++ ldap/sdks/c-sdk/ldap/include/ldap.h
+--- ldap/c-sdk/include/ldap.h~
++++ ldap/c-sdk/include/ldap.h
@@ -40,6 +40,229 @@
#ifndef _LDAP_H
#define _LDAP_H
diff --git a/www/seamonkey/files/patch-bug702179 b/www/seamonkey/files/patch-bug702179
index c447cddef219..8a9e5bf311e5 100644
--- a/www/seamonkey/files/patch-bug702179
+++ b/www/seamonkey/files/patch-bug702179
@@ -1,24 +1,10 @@
-commit 6ddaacd
-Author: Ginn Chen <ginn.chen@oracle.com>
-Date: Wed Nov 30 07:23:46 2011 +0800
-
- Bug 702179 dtrace probes are not installed on Solaris with static js lib r=glandium
----
- js/src/Makefile.in | 3 ---
- toolkit/library/moz.build | 5 -----
- 2 files changed, 8 deletions(-)
-
-diff --git js/src/Makefile.in js/src/Makefile.in
-index 62bbfa0..90400cb 100644
---- mozilla/js/src/Makefile.in
-+++ mozilla/js/src/Makefile.in
-@@ -17,9 +17,6 @@ TOPLEVEL_BUILD := 1
- run_for_side_effects := $(shell echo 'MAKE: $(MAKE)')
- EXTRA_LIBS += $(NSPR_LIBS)
+--- mozilla/js/src/moz.build.orig 2015-10-29 22:17:54 UTC
++++ mozilla/js/src/moz.build
+@@ -613,7 +613,3 @@ CXXFLAGS += CONFIG['MOZ_ICU_CFLAGS']
--DIST_INSTALL = 1
--NO_EXPAND_LIBS = 1
+ if CONFIG['GNU_CXX']:
+ FAIL_ON_WARNINGS = True
-
- ifdef JS_HAS_CTYPES
- ifdef MOZ_NATIVE_FFI
- LOCAL_INCLUDES = $(MOZ_FFI_CFLAGS)
+-NO_EXPAND_LIBS = True
+-
+-DIST_INSTALL = True
diff --git a/www/seamonkey/files/patch-bug779713 b/www/seamonkey/files/patch-bug779713
index 0291c554a056..351aa91f8a7a 100644
--- a/www/seamonkey/files/patch-bug779713
+++ b/www/seamonkey/files/patch-bug779713
@@ -2,14 +2,7 @@ diff --git mfbt/Alignment.h mfbt/Alignment.h
index e0843ca..353ec36 100644
--- mozilla/mfbt/Alignment.h
+++ mozilla/mfbt/Alignment.h
-@@ -9,11 +9,20 @@
- #ifndef mozilla_Alignment_h
- #define mozilla_Alignment_h
-
-+#include "mozilla/Attributes.h"
-+
- #include <stddef.h>
- #include <stdint.h>
+@@ -15,6 +15,13 @@
namespace mozilla {
@@ -47,15 +40,15 @@ diff --git mfbt/Attributes.h mfbt/Attributes.h
index d317766..ddb13da 100644
--- mozilla/mfbt/Attributes.h
+++ mozilla/mfbt/Attributes.h
-@@ -51,6 +51,7 @@
+@@ -50,6 +50,7 @@
+ * don't indicate support for them here, due to
* http://stackoverflow.com/questions/20498142/visual-studio-2013-explicit-keyword-bug
*/
- # if _MSC_VER >= 1800
-+# define MOZ_HAVE_CXX11_ALIGNAS
- # define MOZ_HAVE_CXX11_DELETE
- # endif
- # if _MSC_VER >= 1700
-@@ -74,6 +75,9 @@
++# define MOZ_HAVE_CXX11_ALIGNAS
+ # define MOZ_HAVE_NEVER_INLINE __declspec(noinline)
+ # define MOZ_HAVE_NORETURN __declspec(noreturn)
+ # ifdef __clang__
+@@ -70,6 +71,9 @@
# ifndef __has_extension
# define __has_extension __has_feature /* compatibility, for older versions of clang */
# endif
@@ -65,13 +58,11 @@ index d317766..ddb13da 100644
# if __has_extension(cxx_constexpr)
# define MOZ_HAVE_CXX11_CONSTEXPR
# endif
-@@ -95,6 +99,9 @@
- # endif
- #elif defined(__GNUC__)
+@@ -86,6 +90,7 @@
# if defined(__GXX_EXPERIMENTAL_CXX0X__) || __cplusplus >= 201103L
-+# if MOZ_GCC_VERSION_AT_LEAST(4, 8, 0)
+ # define MOZ_HAVE_CXX11_CONSTEXPR
+ # if MOZ_GCC_VERSION_AT_LEAST(4, 8, 0)
+# define MOZ_HAVE_CXX11_ALIGNAS
-+# endif
- # if MOZ_GCC_VERSION_AT_LEAST(4, 7, 0)
- # define MOZ_HAVE_CXX11_OVERRIDE
- # define MOZ_HAVE_CXX11_FINAL final
+ # define MOZ_HAVE_CXX11_CONSTEXPR_IN_TEMPLATES
+ # endif
+ # define MOZ_HAVE_EXPLICIT_CONVERSION
diff --git a/www/seamonkey/files/patch-bug826985 b/www/seamonkey/files/patch-bug826985
index 6890ab4fe852..bcb14e344493 100644
--- a/www/seamonkey/files/patch-bug826985
+++ b/www/seamonkey/files/patch-bug826985
@@ -17,10 +17,10 @@ diff --git config/system-headers config/system-headers
index 55e4cd1..76567b3 100644
--- mozilla/config/system-headers
+++ mozilla/config/system-headers
-@@ -635,6 +635,7 @@ libgnomevfs/gnome-vfs-mime-handlers.h
- libgnomevfs/gnome-vfs-mime-utils.h
- libgnomevfs/gnome-vfs-ops.h
- libgnomevfs/gnome-vfs-standard-callbacks.h
+@@ -627,6 +627,7 @@ libgnome/libgnome.h
+ libgnomeui/gnome-icon-lookup.h
+ libgnomeui/gnome-icon-theme.h
+ libgnomeui/gnome-ui-init.h
+libv4l2.h
lib$routines.h
limits
@@ -51,13 +51,13 @@ index b483cd1..f1dd1f0 100644
# basic stuff for everything
'include_internal_video_render': 0,
'clang_use_chrome_plugins': 0,
-diff --git media/webrtc/signaling/test/moz.build media/webrtc/signaling/test/moz.build
+diff --git media/webrtc/signaling/test/common.build media/webrtc/signaling/test/common.build
index b483cd1..f1dd1f0 100644
---- mozilla/media/webrtc/signaling/test/moz.build
-+++ mozilla/media/webrtc/signaling/test/moz.build
-@@ -122,6 +122,7 @@ if CONFIG['JS_SHARED_LIBRARY']:
- 'js',
- ]
+--- mozilla/media/webrtc/signaling/test/common.build
++++ mozilla/media/webrtc/signaling/test/common.build
+@@ -99,6 +99,7 @@ if CONFIG['JS_SHARED_LIBRARY']:
+
+ USE_LIBS += ['mozglue']
+OS_LIBS += CONFIG['MOZ_LIBV4L2_LIBS']
OS_LIBS += CONFIG['MOZ_WEBRTC_X11_LIBS']
@@ -145,26 +145,26 @@ index d46b5aa..e452223 100644
'targets': [
{
'target_name': 'video_capture_module',
-@@ -46,6 +49,19 @@
- 'linux/video_capture_linux.cc',
- 'linux/video_capture_linux.h',
- ],
-+ 'conditions': [
-+ ['use_libv4l2==1', {
-+ 'defines': [
-+ 'HAVE_LIBV4L2',
-+ ],
-+ 'cflags_mozilla': [
-+ '$(MOZ_LIBV4L2_CFLAGS)',
-+ ],
-+ 'libraries': [
-+ '-lv4l2',
-+ ],
-+ }],
+@@ -69,6 +72,19 @@
+ 'linux/video_capture_linux.cc',
+ 'linux/video_capture_linux.h',
+ ],
++ 'conditions': [
++ ['use_libv4l2==1', {
++ 'defines': [
++ 'HAVE_LIBV4L2',
++ ],
++ 'cflags_mozilla': [
++ '$(MOZ_LIBV4L2_CFLAGS)',
++ ],
++ 'libraries': [
++ '-lv4l2',
+ ],
- }], # linux
- ['OS=="mac"', {
- 'sources': [
++ }],
++ ],
+ }], # linux
+ ['OS=="mac"', {
+ 'sources': [
diff --git toolkit/library/moz.build toolkit/library/moz.build
index 9c16ffa..1db3794 100644
--- mozilla/toolkit/library/moz.build
diff --git a/www/seamonkey/files/patch-bug847568 b/www/seamonkey/files/patch-bug847568
index 568cf87b2ee6..0164cea9a32d 100644
--- a/www/seamonkey/files/patch-bug847568
+++ b/www/seamonkey/files/patch-bug847568
@@ -17,7 +17,7 @@ diff --git config/system-headers config/system-headers
index 18e8703..bdc5f82 100644
--- mozilla/config/system-headers
+++ mozilla/config/system-headers
-@@ -1357,3 +1357,11 @@ unicode/utypes.h
+@@ -1350,3 +1350,11 @@ unicode/utypes.h
#endif
libutil.h
unwind.h
@@ -87,16 +87,16 @@ diff --git dom/base/moz.build dom/base/moz.build
index a660ba4..6b2f602 100644
--- mozilla/dom/base/moz.build
+++ mozilla/dom/base/moz.build
-@@ -196,6 +196,9 @@ SOURCES += [
- 'nsObjectLoadingContent.cpp',
- ]
+@@ -375,6 +375,9 @@ if CONFIG['INTEL_ARCHITECTURE']:
+ SOURCES += ['nsTextFragmentSSE2.cpp']
+ SOURCES['nsTextFragmentSSE2.cpp'].flags += CONFIG['SSE2_FLAGS']
+if CONFIG['MOZ_NATIVE_HARFBUZZ']:
+ SOURCES['nsContentUtils.cpp'].flags += CONFIG['MOZ_HARFBUZZ_CFLAGS']
+
EXTRA_COMPONENTS += [
- 'contentAreaDropListener.js',
- 'contentAreaDropListener.manifest',
+ 'ConsoleAPI.manifest',
+ 'ConsoleAPIStorage.js',
diff --git gfx/graphite2/moz-gr-update.sh gfx/graphite2/moz-gr-update.sh
index f3d76ea..a9e7fb6 100644
--- mozilla/gfx/graphite2/moz-gr-update.sh
@@ -121,10 +121,10 @@ diff --git gfx/harfbuzz/README-mozilla gfx/harfbuzz/README-mozilla
index ca57d16..1ce21fe 100644
--- mozilla/gfx/harfbuzz/README-mozilla
+++ mozilla/gfx/harfbuzz/README-mozilla
-@@ -21,3 +21,8 @@ In addition, the src/Makefile.in file here is NOT from upstream, nor is it
+@@ -18,3 +18,8 @@ the mozilla tree.
+ In addition, the src/Makefile.in file here is NOT from upstream, nor is it
generated from src/Makefile.am (the original harfbuzz version); it is a mozilla-
- specific makefile that is maintained by hand. It should only need updating when
- new source files or exported headers are added in harfbuzz.
+ specific makefile that is maintained by hand.
+
+The in-tree copy may be omitted during build by --with-system-harfbuzz.
+Make sure to keep pkg-config version check within configure.in in sync
@@ -160,9 +160,9 @@ diff --git gfx/skia/generate_mozbuild.py gfx/skia/generate_mozbuild.py
index 28fa6b5..240dced 100755
--- mozilla/gfx/skia/generate_mozbuild.py
+++ mozilla/gfx/skia/generate_mozbuild.py
-@@ -140,6 +140,9 @@ if CONFIG['GNU_CXX']:
- if not CONFIG['CLANG_CXX']:
- CXXFLAGS += ['-Wno-logical-op']
+@@ -142,6 +142,9 @@ if CONFIG['GNU_CXX']:
+ if CONFIG['CPU_ARCH'] == 'arm':
+ SOURCES['trunk/src/opts/SkBlitRow_opts_arm.cpp'].flags += ['-fomit-frame-pointer']
+if CONFIG['MOZ_NATIVE_HARFBUZZ']:
+ CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS']
@@ -174,9 +174,9 @@ diff --git gfx/skia/moz.build gfx/skia/moz.build
index 1d0c2f9..adb8941 100644
--- mozilla/gfx/skia/moz.build
+++ mozilla/gfx/skia/moz.build
-@@ -968,6 +968,9 @@ if CONFIG['GNU_CXX']:
- if not CONFIG['CLANG_CXX']:
- CXXFLAGS += ['-Wno-logical-op']
+@@ -970,6 +970,9 @@ if CONFIG['GNU_CXX']:
+ if CONFIG['CPU_ARCH'] == 'arm':
+ SOURCES['trunk/src/opts/SkBlitRow_opts_arm.cpp'].flags += ['-fomit-frame-pointer']
+if CONFIG['MOZ_NATIVE_HARFBUZZ']:
+ CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS']
@@ -207,24 +207,29 @@ diff --git intl/unicharutil/util/moz.build intl/unicharutil/util/moz.build
index d736943..41a931f 100644
--- mozilla/intl/unicharutil/util/moz.build
+++ mozilla/intl/unicharutil/util/moz.build
-@@ -37,3 +37,6 @@ if CONFIG['_MSC_VER']:
-
+@@ -42,6 +42,9 @@ if CONFIG['_MSC_VER']:
if CONFIG['ENABLE_INTL_API']:
CXXFLAGS += CONFIG['MOZ_ICU_CFLAGS']
-+
+
+if CONFIG['MOZ_NATIVE_HARFBUZZ']:
+ CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS']
++
+ if CONFIG['GNU_CXX']:
+ FAIL_ON_WARNINGS = True
+
diff --git netwerk/dns/moz.build netwerk/dns/moz.build
index 0b0717a..2e665c9 100644
--- mozilla/netwerk/dns/moz.build
+++ mozilla/netwerk/dns/moz.build
-@@ -63,3 +63,6 @@ GENERATED_FILES = [
- LOCAL_INCLUDES += [
- '../base/src',
+@@ -66,5 +66,8 @@ LOCAL_INCLUDES += [
+ '/netwerk/base',
]
-+
+
+if CONFIG['MOZ_NATIVE_HARFBUZZ']:
+ CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS']
++
+ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk' and CONFIG['ANDROID_VERSION'] > '19':
+ CXXFLAGS += ['-I%s/bionic/libc/dns/include' % CONFIG['ANDROID_SOURCE']]
diff --git toolkit/library/moz.build toolkit/library/moz.build
index 67f0db9..d42137a 100644
--- mozilla/toolkit/library/moz.build
diff --git a/www/seamonkey/files/patch-bug899126 b/www/seamonkey/files/patch-bug899126
deleted file mode 100644
index d53ac352c7a4..000000000000
--- a/www/seamonkey/files/patch-bug899126
+++ /dev/null
@@ -1,95 +0,0 @@
-commit 0f63381
-Author: Guilherme Goncalves <guilherme.p.gonc@gmail.com>
-Date: Tue Nov 18 14:03:00 2014 -0800
-
- Bug 899126 - Part 1 - Implement bin_unused for jemalloc3. r=glandium
----
- memory/build/mozjemalloc_compat.c | 57 ++++++++++++++++++++++++++++++++++++++-
- 1 file changed, 56 insertions(+), 1 deletion(-)
-
-diff --git memory/build/mozjemalloc_compat.c memory/build/mozjemalloc_compat.c
-index 70265a7..0a9b21a 100644
---- mozilla/memory/build/mozjemalloc_compat.c
-+++ mozilla/memory/build/mozjemalloc_compat.c
-@@ -12,6 +12,8 @@
- #include "jemalloc_types.h"
- #include "mozilla/Types.h"
-
-+#include <stdbool.h>
-+
- #if defined(MOZ_NATIVE_JEMALLOC)
-
- MOZ_IMPORT_API int
-@@ -47,6 +49,16 @@ je_(nallocm)(size_t *rsize, size_t size, int flags);
- je_(mallctlbymib)(mib, miblen, &v, &sz, NULL, 0); \
- } while (0)
-
-+#define CTL_IJ_GET(n, v, i, j) do { \
-+ size_t mib[6]; \
-+ size_t miblen = sizeof(mib) / sizeof(mib[0]); \
-+ size_t sz = sizeof(v); \
-+ je_(mallctlnametomib)(n, mib, &miblen); \
-+ mib[2] = i; \
-+ mib[4] = j; \
-+ je_(mallctlbymib)(mib, miblen, &v, &sz, NULL, 0); \
-+} while (0)
-+
- MOZ_MEMORY_API size_t
- malloc_good_size_impl(size_t size)
- {
-@@ -61,6 +73,48 @@ malloc_good_size_impl(size_t size)
- return size;
- }
-
-+static size_t
-+compute_bin_unused(unsigned int narenas)
-+{
-+ size_t bin_unused = 0;
-+
-+ uint32_t nregs; // number of regions per run in the j-th bin
-+ size_t reg_size; // size of regions served by the j-th bin
-+ size_t curruns; // number of runs belonging to a bin
-+ size_t curregs; // number of allocated regions in a bin
-+
-+ unsigned int nbins; // number of bins per arena
-+ unsigned int i, j;
-+
-+ // curruns and curregs are not defined for uninitialized arenas,
-+ // so we skip them when computing bin_unused. However, initialized
-+ // arenas are not guaranteed to be sequential, so we must test each
-+ // one when iterating below.
-+ bool initialized[100]; // should be narenas, but MSVC doesn't have VLAs
-+ size_t isz = sizeof(initialized) / sizeof(initialized[0]);
-+
-+ je_(mallctl)("arenas.initialized", initialized, &isz, NULL, 0);
-+ CTL_GET("arenas.nbins", nbins);
-+
-+ for (j = 0; j < nbins; j++) {
-+ CTL_I_GET("arenas.bin.0.nregs", nregs, j);
-+ CTL_I_GET("arenas.bin.0.size", reg_size, j);
-+
-+ for (i = 0; i < narenas; i++) {
-+ if (!initialized[i]) {
-+ continue;
-+ }
-+
-+ CTL_IJ_GET("stats.arenas.0.bins.0.curruns", curruns, i, j);
-+ CTL_IJ_GET("stats.arenas.0.bins.0.curregs", curregs, i, j);
-+
-+ bin_unused += (nregs * curruns - curregs) * reg_size;
-+ }
-+ }
-+
-+ return bin_unused;
-+}
-+
- MOZ_JEMALLOC_API void
- jemalloc_stats_impl(jemalloc_stats_t *stats)
- {
-@@ -96,4 +150,5 @@ jemalloc_stats_impl(jemalloc_stats_t *stats)
-- stats->bin_unused = 0;
-+
-+ stats->bin_unused = compute_bin_unused(narenas);
- }
-
- MOZ_JEMALLOC_API void
diff --git a/www/seamonkey/files/patch-bug981348 b/www/seamonkey/files/patch-bug981348
index d24dec68d05a..99143321c9c4 100644
--- a/www/seamonkey/files/patch-bug981348
+++ b/www/seamonkey/files/patch-bug981348
@@ -2,13 +2,13 @@ diff --git dom/system/OSFileConstants.cpp dom/system/OSFileConstants.cpp
index 4b21361..cb3be32 100644
--- mozilla/dom/system/OSFileConstants.cpp
+++ mozilla/dom/system/OSFileConstants.cpp
-@@ -596,7 +596,7 @@ static const dom::ConstantSpec gLibcProperties[] =
+@@ -662,7 +662,7 @@
- { "OSFILE_SIZEOF_STATVFS", INT_TO_JSVAL(sizeof (struct statvfs)) },
+ { "OSFILE_SIZEOF_STATVFS", JS::Int32Value(sizeof (struct statvfs)) },
-- { "OSFILE_OFFSETOF_STATVFS_F_BSIZE", INT_TO_JSVAL(offsetof (struct statvfs, f_bsize)) },
-+ { "OSFILE_OFFSETOF_STATVFS_F_FRSIZE", INT_TO_JSVAL(offsetof (struct statvfs, f_frsize)) },
- { "OSFILE_OFFSETOF_STATVFS_F_BAVAIL", INT_TO_JSVAL(offsetof (struct statvfs, f_bavail)) },
+- { "OSFILE_OFFSETOF_STATVFS_F_BSIZE", JS::Int32Value(offsetof (struct statvfs, f_bsize)) },
++ { "OSFILE_OFFSETOF_STATVFS_F_FRSIZE", JS::Int32Value(offsetof (struct statvfs, f_frsize)) },
+ { "OSFILE_OFFSETOF_STATVFS_F_BAVAIL", JS::Int32Value(offsetof (struct statvfs, f_bavail)) },
#endif // defined(XP_UNIX)
diff --git toolkit/components/osfile/modules/osfile_unix_back.jsm toolkit/components/osfile/modules/osfile_unix_back.jsm
diff --git a/www/seamonkey/files/patch-build-pgo-profileserver.py b/www/seamonkey/files/patch-build-pgo-profileserver.py
new file mode 100644
index 000000000000..6d40398b3e9c
--- /dev/null
+++ b/www/seamonkey/files/patch-build-pgo-profileserver.py
@@ -0,0 +1,11 @@
+--- mozilla/build/pgo/profileserver.py.orig 2011-02-24 21:49:47.000000000 +0100
++++ mozilla/build/pgo/profileserver.py 2011-02-24 21:50:30.000000000 +0100
+@@ -59,7 +59,7 @@ if __name__ == '__main__':
+ env["MOZ_JAR_LOG_FILE"] = os.path.abspath(jarlog)
+ print "jarlog: %s" % env["MOZ_JAR_LOG_FILE"]
+
+- cmdargs = ["http://localhost:%d/index.html" % PORT]
++ cmdargs = ["http://127.0.0.1:%d/index.html" % PORT]
+ runner = FirefoxRunner(profile=profile,
+ binary=build.get_binary_path(where="staged-package"),
+ cmdargs=cmdargs,
diff --git a/www/seamonkey/files/patch-mozilla-config-baseconfig.mk b/www/seamonkey/files/patch-config-baseconfig.mk
index 21c5eb9a1a20..21c5eb9a1a20 100644
--- a/www/seamonkey/files/patch-mozilla-config-baseconfig.mk
+++ b/www/seamonkey/files/patch-config-baseconfig.mk
diff --git a/www/seamonkey/files/patch-ijg-libjpeg b/www/seamonkey/files/patch-ijg-libjpeg
index 714576fd56ff..1743c02c0d34 100644
--- a/www/seamonkey/files/patch-ijg-libjpeg
+++ b/www/seamonkey/files/patch-ijg-libjpeg
@@ -17,7 +17,7 @@ index f0aeb5d..1c01010 100644
MOZ_NATIVE_JPEG=1,
AC_MSG_ERROR([Insufficient JPEG library version for --with-system-jpeg]))
fi
-diff --git mozilla/image/decoders/nsJPEGDecoder.cpp mozilla/image/decoders/nsJPEGDecoder.cpp
+diff --git image/decoders/nsJPEGDecoder.cpp image/decoders/nsJPEGDecoder.cpp
index 8fa8200..1d2a259 100644
--- mozilla/image/decoders/nsJPEGDecoder.cpp
+++ mozilla/image/decoders/nsJPEGDecoder.cpp
@@ -28,7 +28,7 @@ index 8fa8200..1d2a259 100644
-}
+#ifdef JCS_EXTENSIONS
- #if defined(IS_BIG_ENDIAN)
+ #if MOZ_BIG_ENDIAN
#define MOZ_JCS_EXT_NATIVE_ENDIAN_XRGB JCS_EXT_XRGB
#else
#define MOZ_JCS_EXT_NATIVE_ENDIAN_XRGB JCS_EXT_BGRX
@@ -69,7 +69,7 @@ index 8fa8200..1d2a259 100644
break;
case JCS_CMYK:
case JCS_YCCK:
-@@ -433,6 +452,15 @@ nsJPEGDecoder::WriteInternal(const char*
+@@ -448,6 +467,16 @@ nsJPEGDecoder::WriteInternal(const char*
return; // I/O suspension
}
@@ -82,9 +82,10 @@ index 8fa8200..1d2a259 100644
+ mInfo.cconvert->color_convert = ycc_rgb_convert_argb;
+ }
+#endif
-
++
// If this is a progressive JPEG ...
mState = mInfo.buffered_image ?
+ JPEG_DECOMPRESS_PROGRESSIVE : JPEG_DECOMPRESS_SEQUENTIAL;
@@ -605,7 +633,11 @@ nsJPEGDecoder::OutputScanlines(bool* sus
uint32_t* imageRow = ((uint32_t*)mImageData) +
(mInfo.output_scanline * mInfo.output_width);
diff --git a/www/seamonkey/files/patch-ldap_ldap-sdk.mozbuild b/www/seamonkey/files/patch-ldap_ldap-sdk.mozbuild
new file mode 100644
index 000000000000..1bb16f2f33d6
--- /dev/null
+++ b/www/seamonkey/files/patch-ldap_ldap-sdk.mozbuild
@@ -0,0 +1,22 @@
+--- ldap/ldap-sdk.mozbuild.orig 2015-11-04 01:43:24 UTC
++++ ldap/ldap-sdk.mozbuild
+@@ -7,15 +7,13 @@ NO_VISIBILITY_FLAGS = True
+ DISABLE_STL_WRAPPING = True
+
+ if CONFIG['OS_TARGET'] == 'Linux':
+- DEFINES['LINUX'] = 1
+ DEFINES['LINUX2_0'] = True
+ DEFINES['linux'] = 1
+-elif CONFIG['OS_TARGET'] == 'Darwin':
+- DEFINES["DARWIN"] = 1
+-elif CONFIG['OS_TARGET'] in ('OpenBSD', 'FreeBSD', 'NetBSD'):
+- DEFINES[CONFIG['OS_TARGET'].upper()] = True
+-elif CONFIG['OS_ARCH'] == 'WINNT':
++
++if CONFIG['OS_ARCH'] == 'WINNT':
+ DEFINES['_WINDOWS'] = True
++else:
++ DEFINES[CONFIG['OS_TARGET'].upper()] = True
+
+ DEFINES['_PR_PTHREADS'] = True
+ DEFINES['NET_SSL'] = True
diff --git a/www/seamonkey/files/patch-mozilla-media-libstagefright-foundation-AString.cpp b/www/seamonkey/files/patch-media-libstagefright-foundation-AString.cpp
index 063cc52226d3..063cc52226d3 100644
--- a/www/seamonkey/files/patch-mozilla-media-libstagefright-foundation-AString.cpp
+++ b/www/seamonkey/files/patch-media-libstagefright-foundation-AString.cpp
diff --git a/www/seamonkey/files/patch-mozilla-media-mtransport-third_party-nICEr-src-util-mbslen.c b/www/seamonkey/files/patch-media-mtransport-third_party-nICEr-src-util-mbslen.c
index 149bf0b40182..149bf0b40182 100644
--- a/www/seamonkey/files/patch-mozilla-media-mtransport-third_party-nICEr-src-util-mbslen.c
+++ b/www/seamonkey/files/patch-media-mtransport-third_party-nICEr-src-util-mbslen.c
diff --git a/www/seamonkey/files/patch-mozilla-media-webrtc-trunk-src-system_wrappers-source-spreadsortlib-spreadsort.hpp b/www/seamonkey/files/patch-media-webrtc-trunk-src-system_wrappers-source-spreadsortlib-spreadsort.hpp
index 31f7a8cff08a..65a568c22ddf 100644
--- a/www/seamonkey/files/patch-mozilla-media-webrtc-trunk-src-system_wrappers-source-spreadsortlib-spreadsort.hpp
+++ b/www/seamonkey/files/patch-media-webrtc-trunk-src-system_wrappers-source-spreadsortlib-spreadsort.hpp
@@ -3,7 +3,7 @@
@@ -21,6 +21,13 @@ Scott McMurray
#include "constants.hpp"
#include <cstring>
-
+
+#ifdef __FreeBSD__
+# include <osreldate.h>
+# if __FreeBSD_version < 900506
@@ -13,4 +13,4 @@
+
namespace boost {
namespace detail {
- //This only works on unsigned data types
+ //This only works on unsigned data types
diff --git a/www/seamonkey/files/patch-media_libav_config__unix.h b/www/seamonkey/files/patch-media_libav_config__unix.h
new file mode 100644
index 000000000000..c0c09c5b2d73
--- /dev/null
+++ b/www/seamonkey/files/patch-media_libav_config__unix.h
@@ -0,0 +1,11 @@
+--- mozilla/media/libav/config_unix.h.orig 2015-10-29 22:17:49 UTC
++++ mozilla/media/libav/config_unix.h
+@@ -144,7 +144,7 @@
+ #define HAVE_MACH_MACH_TIME_H 0
+ #define HAVE_MACHINE_IOCTL_BT848_H 0
+ #define HAVE_MACHINE_IOCTL_METEOR_H 0
+-#define HAVE_MALLOC_H 1
++#define HAVE_MALLOC_H 0
+ #define HAVE_POLL_H 1
+ #define HAVE_SNDIO_H 0
+ #define HAVE_SOUNDCARD_H 0
diff --git a/www/seamonkey/files/patch-modules-libpref-init-all.js b/www/seamonkey/files/patch-modules-libpref-init-all.js
new file mode 100644
index 000000000000..63ed0f46a29a
--- /dev/null
+++ b/www/seamonkey/files/patch-modules-libpref-init-all.js
@@ -0,0 +1,15 @@
+--- mozilla/modules/libpref/init/all.js.orig 2015-08-06 22:39:34 UTC
++++ mozilla/modules/libpref/init/all.js
+@@ -4052,7 +4052,12 @@ pref("layers.max-active", -1);
+ pref("layers.tiles.adjust", true);
+
+ // Set the default values, and then override per-platform as needed
++#ifdef MOZ_TREE_CAIRO
+ pref("layers.offmainthreadcomposition.enabled", true);
++#else
++// Disable for system cairo on suspicion of causing random crashes
++pref("layers.offmainthreadcomposition.enabled", false);
++#endif
+ // Compositor target frame rate. NOTE: If vsync is enabled the compositor
+ // frame rate will still be capped.
+ // -1 -> default (match layout.frame_rate or 60 FPS)
diff --git a/www/seamonkey/files/patch-mozilla-memory-jemalloc-Makefile.in b/www/seamonkey/files/patch-mozilla-memory-jemalloc-Makefile.in
deleted file mode 100644
index eb7ba7283a2e..000000000000
--- a/www/seamonkey/files/patch-mozilla-memory-jemalloc-Makefile.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- mozilla/memory/jemalloc/Makefile.in~
-+++ mozilla/memory/jemalloc/Makefile.in
-@@ -12,3 +12,7 @@ include $(topsrcdir)/config/rules.mk
- ifdef GNU_CC
- CFLAGS += -std=gnu99
- endif
-+
-+# XXX startup crash workaround for gcc47 on amd64
-+jemalloc.$(OBJ_SUFFIX): OS_CFLAGS := $(filter-out -O3 -Ofast,$(OS_CFLAGS))
-+jemalloc.$(OBJ_SUFFIX): MOZ_OPTIMIZE_FLAGS=
diff --git a/www/seamonkey/files/patch-mozilla-memory-jemalloc-configure.ac b/www/seamonkey/files/patch-mozilla-memory-jemalloc-configure.ac
deleted file mode 100644
index db668d89f872..000000000000
--- a/www/seamonkey/files/patch-mozilla-memory-jemalloc-configure.ac
+++ /dev/null
@@ -1,28 +0,0 @@
-commit 1aa25a3
-Author: Michael Neumann <mneumann@ntecs.de>
-Date: Tue Aug 5 03:06:02 2014 +0200
-
- Support DragonFlyBSD
-
- Note that in contrast to FreeBSD, DragonFly does not work
- with force_lazy_lock enabled.
----
- configure.ac | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git mozilla/memory/jemalloc/src/configure.ac mozilla/memory/jemalloc/src/configure.ac
-index 645bd46..83c60ec 100644
---- mozilla/memory/jemalloc/src/configure.ac
-+++ mozilla/memory/jemalloc/src/configure.ac
-@@ -283,6 +283,11 @@ case "${host}" in
- AC_DEFINE([JEMALLOC_PURGE_MADVISE_FREE], [ ])
- force_lazy_lock="1"
- ;;
-+ *-*-dragonfly*)
-+ CFLAGS="$CFLAGS"
-+ abi="elf"
-+ AC_DEFINE([JEMALLOC_PURGE_MADVISE_FREE], [ ])
-+ ;;
- *-*-linux*)
- CFLAGS="$CFLAGS"
- CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
diff --git a/www/seamonkey/files/patch-soundtouch-no-factory b/www/seamonkey/files/patch-soundtouch-no-factory
new file mode 100644
index 000000000000..8f26185be639
--- /dev/null
+++ b/www/seamonkey/files/patch-soundtouch-no-factory
@@ -0,0 +1,84 @@
+# Partially revert bug 1176300 to unbreak build with system libsoundtouch
+
+diff --git dom/media/AudioStream.cpp dom/media/AudioStream.cpp
+--- mozilla/dom/media/AudioStream.cpp
++++ mozilla/dom/media/AudioStream.cpp
+@@ -129,7 +129,6 @@
+ , mOutChannels(0)
+ , mWritten(0)
+ , mAudioClock(this)
+- , mTimeStretcher(nullptr)
+ , mLatencyRequest(HighLatency)
+ , mReadPoint(0)
+ , mDumpFile(nullptr)
+@@ -152,9 +151,6 @@
+ if (mDumpFile) {
+ fclose(mDumpFile);
+ }
+- if (mTimeStretcher) {
+- soundtouch::destroySoundTouchObj(mTimeStretcher);
+- }
+ }
+
+ size_t
+@@ -177,7 +173,7 @@
+ {
+ mMonitor.AssertCurrentThreadOwns();
+ if (!mTimeStretcher) {
+- mTimeStretcher = soundtouch::createSoundTouchObj();
++ mTimeStretcher = new soundtouch::SoundTouch();
+ mTimeStretcher->setSampleRate(mInRate);
+ mTimeStretcher->setChannels(mOutChannels);
+ mTimeStretcher->setPitch(1.0);
+diff --git dom/media/AudioStream.h dom/media/AudioStream.h
+--- mozilla/dom/media/AudioStream.h
++++ mozilla/dom/media/AudioStream.h
+@@ -15,7 +15,7 @@
+ #include "mozilla/RefPtr.h"
+ #include "mozilla/UniquePtr.h"
+ #include "CubebUtils.h"
+-#include "soundtouch/SoundTouchFactory.h"
++#include "soundtouch/SoundTouch.h"
+
+ namespace mozilla {
+
+@@ -329,7 +329,7 @@
+ // Number of frames written to the buffers.
+ int64_t mWritten;
+ AudioClock mAudioClock;
+- soundtouch::SoundTouch* mTimeStretcher;
++ nsAutoPtr<soundtouch::SoundTouch> mTimeStretcher;
+ nsRefPtr<AsyncLatencyLogger> mLatencyLog;
+
+ // copy of Latency logger's starting time for offset calculations
+diff --git media/libsoundtouch/src/moz.build media/libsoundtouch/src/moz.build
+--- mozilla/media/libsoundtouch/src/moz.build
++++ mozilla/media/libsoundtouch/src/moz.build
+@@ -8,7 +8,6 @@
+ 'FIFOSamplePipe.h',
+ 'SoundTouch.h',
+ 'soundtouch_config.h',
+- 'SoundTouchFactory.h',
+ 'STTypes.h',
+ ]
+
+@@ -22,7 +21,6 @@
+ 'InterpolateShannon.cpp',
+ 'RateTransposer.cpp',
+ 'SoundTouch.cpp',
+- 'SoundTouchFactory.cpp',
+ 'TDStretch.cpp',
+ ]
+
+diff --git media/libsoundtouch/src/soundtouch_perms.h media/libsoundtouch/src/soundtouch_perms.h
+--- mozilla/media/libsoundtouch/src/soundtouch_perms.h
++++ mozilla/media/libsoundtouch/src/soundtouch_perms.h
+@@ -12,7 +12,6 @@
+
+ #pragma GCC visibility push(default)
+ #include "SoundTouch.h"
+-#include "SoundTouchFactory.h"
+ #pragma GCC visibility pop
+
+ #endif // MOZILLA_SOUNDTOUCH_PERMS_H
+
diff --git a/www/seamonkey/files/patch-suite-app-nsSuiteApp.cpp b/www/seamonkey/files/patch-suite-app-nsSuiteApp.cpp
index 00dd483a95fb..52a88a792fd5 100644
--- a/www/seamonkey/files/patch-suite-app-nsSuiteApp.cpp
+++ b/www/seamonkey/files/patch-suite-app-nsSuiteApp.cpp
@@ -4,18 +4,9 @@
TriggerQuirks();
#endif
-+ setenv("MOZ_PLUGIN_PATH", "%%LOCALBASE%%/lib/browser_plugins/symlinks/gecko", 0);
++ setenv("MOZ_GMP_PATH", "%%LOCALBASE%%/lib/browser_plugins/symlinks/gecko", 0);
+ setenv("MOZ_PLUGIN_PATH", "%%LOCALBASE%%/lib/browser_plugins/symlinks/gecko", 0);
+
int gotCounters;
#if defined(XP_UNIX)
struct rusage initialRUsage;
-@@ -339,7 +342,7 @@ int main(int argc, char* argv[])
- IO_COUNTERS ioCounters;
- gotCounters = GetProcessIoCounters(GetCurrentProcess(), &ioCounters);
- #endif
--
-+
- nsIFile *xreDirectory;
-
- #ifdef HAS_DLL_BLOCKLIST
diff --git a/www/seamonkey/files/patch-mozilla_toolkit_mozapps_installer_packager_mk b/www/seamonkey/files/patch-toolkit_mozapps_installer_packager_mk
index 9a2a4ea99070..e04c8757cfb2 100644
--- a/www/seamonkey/files/patch-mozilla_toolkit_mozapps_installer_packager_mk
+++ b/www/seamonkey/files/patch-toolkit_mozapps_installer_packager_mk
@@ -2,7 +2,7 @@ $OpenBSD: patch-toolkit_mozapps_installer_packager_mk,v 1.11 2012/06/11 15:29:56
install headers/idl/sdk libs only if xulrunner
--- mozilla/toolkit/mozapps/installer/packager.mk.orig Fri Jun 1 14:04:20 2012
+++ mozilla/toolkit/mozapps/installer/packager.mk Tue Jun 5 07:55:51 2012
-@@ -886,7 +886,7 @@ endif
+@@ -127,7 +127,7 @@ endif
$(NSINSTALL) -D $(DESTDIR)$(bindir)
$(RM) -f $(DESTDIR)$(bindir)/$(MOZ_APP_NAME)
ln -s $(installdir)/$(MOZ_APP_NAME) $(DESTDIR)$(bindir)
diff --git a/www/seamonkey/files/patch-toolkit_system_unixproxy_nsLibProxySettings.cpp b/www/seamonkey/files/patch-toolkit_system_unixproxy_nsLibProxySettings.cpp
new file mode 100644
index 000000000000..740f49fa3da0
--- /dev/null
+++ b/www/seamonkey/files/patch-toolkit_system_unixproxy_nsLibProxySettings.cpp
@@ -0,0 +1,10 @@
+--- mozilla/toolkit/system/unixproxy/nsLibProxySettings.cpp.orig 2015-10-29 22:18:00 UTC
++++ mozilla/toolkit/system/unixproxy/nsLibProxySettings.cpp
+@@ -9,6 +9,7 @@
+ #include "nsIURI.h"
+ #include "nsString.h"
+ #include "nsCOMPtr.h"
++#include "nsNetCID.h"
+ #include "nspr.h"
+
+ extern "C" {
diff --git a/www/seamonkey/files/patch-z-bug517422 b/www/seamonkey/files/patch-z-bug517422
index 6c7b6647ee9e..32daf96019a6 100644
--- a/www/seamonkey/files/patch-z-bug517422
+++ b/www/seamonkey/files/patch-z-bug517422
@@ -4,7 +4,7 @@ diff --git config/Makefile.in config/Makefile.in
index 5383399..0410004 100644
--- mozilla/config/Makefile.in
+++ mozilla/config/Makefile.in
-@@ -77,6 +77,13 @@ export:: $(export-preqs)
+@@ -77,6 +77,14 @@ export:: $(export-preqs)
-DMOZ_NATIVE_ICU=$(MOZ_NATIVE_ICU) \
-DMOZ_NATIVE_GRAPHITE2=$(MOZ_NATIVE_GRAPHITE2) \
-DMOZ_NATIVE_HARFBUZZ=$(MOZ_NATIVE_HARFBUZZ) \
@@ -12,6 +12,7 @@ index 5383399..0410004 100644
+ -DMOZ_NATIVE_THEORA=$(MOZ_NATIVE_THEORA) \
+ -DMOZ_NATIVE_VORBIS=$(MOZ_NATIVE_VORBIS) \
+ -DMOZ_NATIVE_TREMOR=$(MOZ_NATIVE_TREMOR) \
++ -DMOZ_NATIVE_CELT=$(MOZ_NATIVE_CELT) \
+ -DMOZ_NATIVE_OPUS=$(MOZ_NATIVE_OPUS) \
+ -DMOZ_NATIVE_SPEEX=$(MOZ_NATIVE_SPEEX) \
+ -DMOZ_NATIVE_SOUNDTOUCH=$(MOZ_NATIVE_SOUNDTOUCH) \
@@ -22,14 +23,17 @@ diff --git config/external/moz.build config/external/moz.build
index f67c5c7..eb909ce 100644
--- mozilla/config/external/moz.build
+++ mozilla/config/external/moz.build
-@@ -16,13 +16,19 @@ if CONFIG['MOZ_UPDATER']:
- if not CONFIG['MOZ_NATIVE_BZ2']:
- external_dirs += ['modules/libbz2']
+@@ -19,10 +19,19 @@ if CONFIG['MOZ_UPDATER']:
+ # There's no "native brotli" yet, but probably in the future...
+ external_dirs += ['modules/brotli']
-if CONFIG['MOZ_VORBIS']:
+if not CONFIG['MOZ_NATIVE_OGG']:
+ external_dirs += ['media/libogg']
+
++if not CONFIG['MOZ_NATIVE_CELT'] or not CONFIG['MOZ_NATIVE_OPUS']:
++ external_dirs += ['media/libopus']
++
+if not CONFIG['MOZ_NATIVE_THEORA']:
+ external_dirs += ['media/libtheora']
+
@@ -40,12 +44,8 @@ index f67c5c7..eb909ce 100644
+if CONFIG['MOZ_TREMOR'] and not CONFIG['MOZ_NATIVE_TREMOR']:
external_dirs += ['media/libtremor']
--if CONFIG['MOZ_OPUS']:
-+if CONFIG['MOZ_OPUS'] and not CONFIG['MOZ_NATIVE_OPUS']:
- external_dirs += ['media/libopus']
-
if CONFIG['MOZ_WEBM']:
-@@ -37,14 +43,16 @@ if CONFIG['MOZ_VPX'] and not CONFIG['MOZ_NATIVE_LIBVPX']:
+@@ -37,15 +46,16 @@ if CONFIG['MOZ_VPX'] and not CONFIG['MOZ
if not CONFIG['MOZ_NATIVE_PNG']:
external_dirs += ['media/libpng']
@@ -59,6 +59,7 @@ index f67c5c7..eb909ce 100644
'media/kiss_fft',
'media/libcubeb',
- 'media/libogg',
+- 'media/libopus',
- 'media/libtheora',
- 'media/libspeex_resampler',
'media/libstagefright',
@@ -70,23 +71,27 @@ diff --git config/system-headers config/system-headers
index bef567c..9807c29 100644
--- mozilla/config/system-headers
+++ mozilla/config/system-headers
-@@ -1263,7 +1263,6 @@ X11/Xlocale.h
+@@ -1257,8 +1257,10 @@ X11/Xlocale.h
X11/Xos.h
X11/Xutil.h
zmouse.h
--soundtouch/SoundTouch.h
- #if MOZ_NATIVE_PNG==1
- png.h
++#if MOZ_NATIVE_SOUNDTOUCH==1
+ soundtouch/SoundTouch.h
+ soundtouch/SoundTouchFactory.h
++#endif
+ #if MOZ_LIBAV_FFT==1
+ libavcodec/avfft.h
#endif
-@@ -1325,6 +1324,7 @@ vorbis/codec.h
- theora/theoradec.h
- tremor/ivorbiscodec.h
- speex/speex_resampler.h
+@@ -1313,6 +1315,8 @@ vpx/vp8dx.h
+ vpx_mem/vpx_mem.h
+ #endif
+ #ifdef GKMEDIAS_SHARED_LIBRARY
+soundtouch/SoundTouch.h
- ogg/ogg.h
- ogg/os_types.h
- nestegg/nestegg.h
-@@ -1365,3 +1365,29 @@ graphite2/Segment.h
++soundtouch/SoundTouchFactory.h
+ vpx/vpx_codec.h
+ vpx/vpx_decoder.h
+ vpx/vpx_encoder.h
+@@ -1364,3 +1363,32 @@ graphite2/Segment.h
harfbuzz/hb-ot.h
harfbuzz/hb.h
#endif
@@ -104,6 +109,12 @@ index bef567c..9807c29 100644
+#if MOZ_NATIVE_TREMOR==1
+tremor/ivorbiscodec.h
+#endif
++#if MOZ_NATIVE_CELT==1
++celt.h
++celt_header.h
++celt/celt.h
++celt/celt_header.h
++#endif
+#if MOZ_NATIVE_OPUS==1
+opus.h
+opus_multistream.h
@@ -113,14 +124,11 @@ index bef567c..9807c29 100644
+#if MOZ_NATIVE_SPEEX==1
+speex/speex_resampler.h
+#endif
-+#if MOZ_NATIVE_SOUNDTOUCH==1
-+soundtouch/SoundTouch.h
-+#endif
diff --git configure.in configure.in
index 87db361..7947626 100644
--- mozilla/configure.in
+++ mozilla/configure.in
-@@ -5056,6 +5056,57 @@ if test "${ac_cv_c_attribute_aligned}" != "0"; then
+@@ -5223,6 +5223,157 @@ if test "${ac_cv_c_attribute_aligned}" !
fi
dnl ========================================================
@@ -175,13 +183,23 @@ index 87db361..7947626 100644
+AC_SUBST(MOZ_NATIVE_TREMOR)
+
+dnl ========================================================
- dnl = Disable Opus audio codec support
- dnl ========================================================
- MOZ_ARG_DISABLE_BOOL(opus,
-@@ -5064,6 +5115,89 @@ MOZ_ARG_DISABLE_BOOL(opus,
- MOZ_OPUS=1)
-
- dnl ========================================================
++dnl Check for libcelt
++dnl ========================================================
++
++MOZ_ARG_WITH_BOOL(system-celt,
++[ --with-system-celt Use system libcelt (located with pkgconfig)],
++MOZ_NATIVE_CELT=1,
++MOZ_NATIVE_CELT=)
++
++if test -n "$MOZ_NATIVE_CELT"; then
++ PKG_CHECK_MODULES(MOZ_CELT, celt)
++else
++ MOZ_CELT_CFLAGS='-I$(topsrcdir)/media/libopus'
++fi
++
++AC_SUBST(MOZ_NATIVE_CELT)
++
++dnl ========================================================
+dnl Check for libopus
+dnl ========================================================
+
@@ -268,19 +286,6 @@ index 87db361..7947626 100644
dnl = Disable VP8 decoder support
dnl ========================================================
MOZ_ARG_DISABLE_BOOL(webm,
-diff --git dom/media/AudioStream.h dom/media/AudioStream.h
-index 085676d..00c54fb 100644
---- mozilla/dom/media/AudioStream.h
-+++ mozilla/dom/media/AudioStream.h
-@@ -17,7 +17,7 @@
- #include "CubebUtils.h"
-
- namespace soundtouch {
--class SoundTouch;
-+class MOZ_IMPORT_API SoundTouch;
- }
-
- namespace mozilla {
diff --git dom/media/moz.build dom/media/moz.build
index 7526cff..e0a0ca0 100644
--- mozilla/dom/media/moz.build
@@ -382,12 +387,16 @@ diff --git media/libtheora/moz.build media/libtheora/moz.build
index 14265b1..3069e99 100644
--- mozilla/media/libtheora/moz.build
+++ mozilla/media/libtheora/moz.build
-@@ -93,3 +93,5 @@ if CONFIG['GNU_AS']:
- if CONFIG['OS_TARGET'] == 'Android':
- DEFINES['__linux__'] = True
+@@ -21,6 +21,9 @@ if CONFIG['GKMEDIAS_SHARED_LIBRARY']:
+ # The encoder is currently not included.
+ DEFINES['THEORA_DISABLE_ENCODE'] = True
+if CONFIG['MOZ_NATIVE_OGG']:
+ CFLAGS += CONFIG['MOZ_OGG_CFLAGS']
++
+ # Suppress warnings in third-party code.
+ if CONFIG['GNU_CC']:
+ CFLAGS += ['-Wno-type-limits']
diff --git media/libtremor/README_MOZILLA media/libtremor/README_MOZILLA
index ee67b53..3f34a09 100644
--- mozilla/media/libtremor/README_MOZILLA
@@ -431,11 +440,11 @@ index 919b99e..cc776f7 100644
+
+if CONFIG['MOZ_NATIVE_OGG']:
+ CFLAGS += CONFIG['MOZ_OGG_CFLAGS']
-diff --git media/webrtc/signaling/test/moz.build media/webrtc/signaling/test/moz.build
+diff --git media/webrtc/signaling/test/common.build media/webrtc/signaling/test/common.build
index bbc971c..6ed7e41 100644
---- mozilla/media/webrtc/signaling/test/moz.build
-+++ mozilla/media/webrtc/signaling/test/moz.build
-@@ -127,6 +127,9 @@ if CONFIG['MOZ_ALSA']:
+--- mozilla/media/webrtc/signaling/test/common.build
++++ mozilla/media/webrtc/signaling/test/common.build
+@@ -108,6 +109,9 @@ if CONFIG['MOZ_OSS']:
if CONFIG['MOZ_NATIVE_JPEG']:
OS_LIBS += CONFIG['MOZ_JPEG_LIBS']
@@ -449,24 +458,62 @@ diff --git media/webrtc/trunk/webrtc/modules/audio_coding/codecs/opus/opus.gypi
index 00e77e7..55f48ab 100644
--- mozilla/media/webrtc/trunk/webrtc/modules/audio_coding/codecs/opus/opus.gypi
+++ mozilla/media/webrtc/trunk/webrtc/modules/audio_coding/codecs/opus/opus.gypi
-@@ -17,9 +17,9 @@
+@@ -17,18 +17,11 @@
'conditions': [
['build_with_mozilla==1', {
# Mozilla provides its own build of the opus library.
- 'include_dirs': [
- '/media/libopus/include',
-- ]
+- '/media/libopus/src',
+- '/media/libopus/celt',
+ 'cflags_mozilla': [
++ '$(filter -I%, $(MOZ_CELT_CFLAGS))/celt',
+ '$(MOZ_OPUS_CFLAGS)',
-+ ],
++ '$(filter -I%, $(MOZ_OPUS_CFLAGS))/../src',
+ ],
+- 'direct_dependent_settings': {
+- 'include_dirs': [
+- '/media/libopus/include',
+- '/media/libopus/src',
+- '/media/libopus/celt',
+- ],
+- },
}, {
'dependencies': [
'<(DEPTH)/third_party/opus/opus.gyp:opus'
+diff --git media/webrtc/trunk/webrtc/modules/audio_coding/neteq/neteq.gypi media/webrtc/trunk/webrtc/modules/audio_coding/neteq/neteq.gypi
+index 00e77e7..55f48ab 100644
+--- mozilla/media/webrtc/trunk/webrtc/modules/audio_coding/neteq/neteq.gypi
++++ mozilla/media/webrtc/trunk/webrtc/modules/audio_coding/neteq/neteq.gypi
+@@ -84,19 +84,11 @@
+ ],
+ }],
+ ['build_with_mozilla==1', {
+- 'include_dirs': [
+- # Need Opus header files for the audio classifier.
+- '<(DEPTH)/../../../media/opus/celt',
+-# '<(DEPTH)/third_party/opus/src/src',
++ 'cflags_mozilla': [
++ '$(filter -I%, $(MOZ_CELT_CFLAGS))/celt',
++ '$(MOZ_OPUS_CFLAGS)',
++ '$(filter -I%, $(MOZ_OPUS_CFLAGS))/../src',
+ ],
+- 'direct_dependent_settings': {
+- 'include_dirs': [
+- '../../../../../../media/opus/celt',
+- # Need Opus header files for the audio classifier.
+- '<(DEPTH)/../../../media/opus/celt',
+-# '<(DEPTH)/third_party/opus/src/src',
+- ],
+- },
+ }],
+ ],
+ 'sources': [
diff --git toolkit/library/moz.build toolkit/library/moz.build
index d42137a..695e75a8 100644
--- mozilla/toolkit/library/moz.build
+++ mozilla/toolkit/library/moz.build
-@@ -178,6 +178,27 @@ if CONFIG['MOZ_NATIVE_PNG']:
+@@ -178,6 +178,30 @@ if CONFIG['MOZ_NATIVE_PNG']:
if CONFIG['MOZ_NATIVE_HUNSPELL']:
OS_LIBS += CONFIG['MOZ_HUNSPELL_LIBS']
@@ -482,6 +529,9 @@ index d42137a..695e75a8 100644
+if CONFIG['MOZ_NATIVE_TREMOR']:
+ OS_LIBS += CONFIG['MOZ_TREMOR_LIBS']
+
++if CONFIG['MOZ_NATIVE_CELT']:
++ OS_LIBS += CONFIG['MOZ_CELT_LIBS']
++
+if CONFIG['MOZ_NATIVE_OPUS']:
+ OS_LIBS += CONFIG['MOZ_OPUS_LIBS']
+