www/seamonkey: update to 2.40

SeaMonkey now uses FFmpeg directly rather than via GStreamer for H.264
and MP3 playback as part of HTML5. Note, FFmpeg 3.x is unsupported[1].

Changes:	http://www.seamonkey-project.org/news#2016-03-14
PR:		210931
Submitted by:	net@arrishq.net (based on)
Security:	2c2d1c39-1396-459a-91f5-ca03ee7c64c6
MFH:		2016Q3

[1] SeaMonkey 2.40 is based on Firefox 43 codebase but Firefox 45
    is the earliest to have the fix. Backporting maybe tricky:
    https://bugzilla.mozilla.org/show_bug.cgi?id=1232268

17 files changed, 288 insertions, 262 deletions

diff --git a/www/seamonkey/Makefile b/www/seamonkey/Makefile
index ae2f03c9e5ee..bb9c265db49d 100644
--- a/www/seamonkey/Makefile
+++ b/www/seamonkey/Makefile
@@ -2,9 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	seamonkey
-DISTVERSION=	2.39
-MOZILLA_VER=	42 # above + 3
-PORTREVISION=	15
+DISTVERSION=	2.40
+MOZILLA_VER=	43 # above + 3
 CATEGORIES?=	www mail news editors irc ipv6
 MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \
 		MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source
@@ -32,8 +31,8 @@ BUILD_DEPENDS=	nspr>=4.10.10:devel/nspr \
 
 LIB_DEPENDS=	libv4l2.so:multimedia/libv4l
 
-EM_VERSION=	1.9.1
-L_VERSION=	4.4
+EM_VERSION=	1.9.5
+L_VERSION=	4.5
 
 SSP_UNSAFE=	yes
 USE_GECKO=	gecko
@@ -50,9 +49,11 @@ 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
+OPTIONS_EXCLUDE=GSTREAMER LOGGING
+OPTIONS_DEFINE=	CHATZILLA COMPOSER ENIGMAIL LDAP LIGHTNING MAILNEWS RUST
+OPTIONS_SINGLE=	TOOLKIT
+OPTIONS_SINGLE_TOOLKIT=	GTK2 GTK3
+OPTIONS_DEFAULT=CANBERRA CHATZILLA COMPOSER ENIGMAIL GTK2 LDAP LIGHTNING MAILNEWS
 
 CHATZILLA_DESC?=Chatzilla IRC module
 COMPOSER_DESC?=	HTML Composer module
@@ -119,8 +120,6 @@ post-extract:
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e '/MOZPNG/s/=[0-9]*/=10511/' \
-		${MOZSRC}/configure.in ${WRKSRC}/configure.in
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 		${WRKSRC}/suite/app/nsSuiteApp.cpp
 	@${REINPLACE_CMD} -e '/accessibility.typeaheadfind.enablesound/s/true/false/' \
diff --git a/www/seamonkey/distinfo b/www/seamonkey/distinfo
index e295d42b3a27..36f90b97147a 100644
--- a/www/seamonkey/distinfo
+++ b/www/seamonkey/distinfo
@@ -1,4 +1,5 @@
-SHA256 (seamonkey-2.39.source.tar.xz) = c871de0a64cb60acf785df0ea3859b729353e5d1e3274947840386766859930e
-SIZE (seamonkey-2.39.source.tar.xz) = 182627632
-SHA256 (enigmail-1.9.1.tar.gz) = 0393119725fa5931d9888a2a1c9796d440ee7975ca3d005eb63142768b10f993
-SIZE (enigmail-1.9.1.tar.gz) = 1736876
+TIMESTAMP = 1475123784
+SHA256 (seamonkey-2.40.source.tar.xz) = 7ecccc039d03f38d197b123b59ea42eac4c0c10e4bdec779b3665d79b435fa01
+SIZE (seamonkey-2.40.source.tar.xz) = 193702432
+SHA256 (enigmail-1.9.5.tar.gz) = 831e53a4add0f465241f075be9475103367aa1452675adae054d8fb272e5d3ad
+SIZE (enigmail-1.9.5.tar.gz) = 1744278
diff --git a/www/seamonkey/files/extra-patch-bug1125514 b/www/seamonkey/files/extra-patch-bug1125514
deleted file mode 100644
index 4d31cf5ebada..000000000000
--- a/www/seamonkey/files/extra-patch-bug1125514
+++ /dev/null
@@ -1,36 +0,0 @@
-changeset:   258513:ffbd5f5f46f1
-user:        Guilherme Goncalves <guilherme.p.gonc@gmail.com>
-date:        Thu Aug 20 10:05:29 2015 +0900
-summary:     Bug 1125514 - Use jemalloc's metadata statistics to compute bookkeeping. r=glandium
-
---- mozilla/memory/build/mozjemalloc_compat.c~
-+++ mozilla/memory/build/mozjemalloc_compat.c
-@@ -136,6 +136,7 @@ jemalloc_stats_impl(jemalloc_stats_t *st
- {
-   unsigned narenas;
-   size_t active, allocated, mapped, page, pdirty;
-+  size_t meta, ameta;
-   size_t lg_chunk;
- 
-   // Refresh jemalloc's stats by updating its epoch, see ctl_refresh in
-@@ -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 = (size_t) 1 << lg_chunk;
-   stats->mapped = mapped;
-   stats->allocated = allocated;
-   stats->waste = active - allocated;
-   stats->page_cache = pdirty * page;
-+  stats->bookkeeping = meta - ameta;
-   stats->bin_unused = compute_bin_unused(narenas);
-   stats->waste -= stats->bin_unused;
- }
diff --git a/www/seamonkey/files/patch-1194520 b/www/seamonkey/files/patch-1194520
deleted file mode 100644
index 403d08a3379e..000000000000
--- a/www/seamonkey/files/patch-1194520
+++ /dev/null
@@ -1,35 +0,0 @@
-From bb146548c7846ba5d14f070f4be985797d83d5ca Mon Sep 17 00:00:00 2001
-From: Mike Hommey <mh+mozilla@glandium.org>
-Date: Fri, 14 Aug 2015 08:50:38 +0900
-Subject: [PATCH] Bug 1194520 - Add a system header wrapper for
- <freetype/ftfntfmt.h>
-
----
- config/system-headers | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/config/system-headers b/config/system-headers
-index bee35da..ad1f88d 100644
---- mozilla/config/system-headers
-+++ mozilla/config/system-headers
-@@ -450,16 +450,17 @@ foundation/base64.h
- foundation/hexdump.h
- #endif
- fp.h
- fpieee.h
- frame/log.h
- frame/req.h
- freetype/freetype.h
- freetype/ftcache.h
-+freetype/ftfntfmt.h
- freetype/ftglyph.h
- freetype/ftsynth.h
- freetype/ftoutln.h
- freetype/ttnameid.h
- freetype/tttables.h
- freetype/t1tables.h
- freetype/ftlcdfil.h
- freetype/ftsizes.h
--- 
-2.5.0.3.ge81d485
-
diff --git a/www/seamonkey/files/patch-bug1026499 b/www/seamonkey/files/patch-bug1026499
deleted file mode 100644
index 729f91a5d8d4..000000000000
--- a/www/seamonkey/files/patch-bug1026499
+++ /dev/null
@@ -1,68 +0,0 @@
-commit 8d0efe4
-Author: Martin Husemann <martin@NetBSD.org>
-Date:   Wed Jun 18 18:12:22 2014 +0200
-
-    Bug 1026499 - Use MOZ_ALIGNED_DECL to declare union members in ipdl value declarations. r=bsmedberg
----
- ipc/ipdl/ipdl/cxx/ast.py  | 7 ++++---
- ipc/ipdl/ipdl/cxx/cgen.py | 5 ++++-
- ipc/ipdl/ipdl/lower.py    | 2 +-
- 4 files changed, 10 insertions(+), 5 deletions(-)
-
-diff --git ipc/ipdl/ipdl/cxx/ast.py ipc/ipdl/ipdl/cxx/ast.py
-index 3180a65..c2d945b 100644
---- mozilla/ipc/ipdl/ipdl/cxx/ast.py
-+++ mozilla/ipc/ipdl/ipdl/cxx/ast.py
-@@ -336,12 +336,13 @@ Type.VOID = Type('void')
- Type.VOIDPTR = Type('void', ptr=1)
- 
- class TypeArray(Node):
--    def __init__(self, basetype, nmemb):
--        '''the type |basetype DECLNAME[nmemb]|.  |nmemb| is an Expr'''
-+    def __init__(self, basetype, nmemb, alignType):
-+        '''the type |basetype DECLNAME[nmemb]|.  |nmemb| is an Expr, |alignType| is a type'''
-         self.basetype = basetype
-         self.nmemb = nmemb
-+        self.alignType = alignType
-     def __deepcopy__(self, memo):
--        return TypeArray(deepcopy(self.basetype, memo), nmemb)
-+        return TypeArray(deepcopy(self.basetype, memo), nmemb, alignType)
- 
- class TypeEnum(Node):
-     def __init__(self, name=None):
-diff --git ipc/ipdl/ipdl/cxx/cgen.py ipc/ipdl/ipdl/cxx/cgen.py
-index 48b0988..bc914cf 100644
---- mozilla/ipc/ipdl/ipdl/cxx/cgen.py
-+++ mozilla/ipc/ipdl/ipdl/cxx/cgen.py
-@@ -101,6 +101,7 @@ class CxxCodeGen(CodePrinter, Visitor):
-     def visitDecl(self, d):
-         # C-syntax arrays make code generation much more annoying
-         if isinstance(d.type, TypeArray):
-+            self.write('MOZ_ALIGNED_DECL(')
-             d.type.basetype.accept(self)
-         else:
-             d.type.accept(self)
-@@ -111,7 +112,9 @@ class CxxCodeGen(CodePrinter, Visitor):
-         if isinstance(d.type, TypeArray):
-             self.write('[')
-             d.type.nmemb.accept(self)
--            self.write(']')
-+            self.write('], MOZ_ALIGNOF(')
-+            d.type.alignType.accept(self)
-+            self.write('))')
- 
-     def visitParam(self, p):
-         self.visitDecl(p)
-diff --git ipc/ipdl/ipdl/lower.py ipc/ipdl/ipdl/lower.py
-index e97a34c..9360f3c 100644
---- mozilla/ipc/ipdl/ipdl/lower.py
-+++ mozilla/ipc/ipdl/ipdl/lower.py
-@@ -768,7 +768,7 @@ IPDL union type."""
-         if self.recursive:
-             return self.ptrToType()
-         else:
--            return TypeArray(Type('char'), ExprSizeof(self.internalType()))
-+            return TypeArray(Type('char'), ExprSizeof(self.internalType()), self.internalType())
- 
-     def unionValue(self):
-         # NB: knows that Union's storage C union is named |mValue|
diff --git a/www/seamonkey/files/patch-bug1209410 b/www/seamonkey/files/patch-bug1209410
new file mode 100644
index 000000000000..c20dda7fcac7
--- /dev/null
+++ b/www/seamonkey/files/patch-bug1209410
@@ -0,0 +1,169 @@
+# Use MP3Demuxer/MediaFormatReader by default when available
+
+diff --git a/dom/media/DecoderTraits.cpp b/dom/media/DecoderTraits.cpp
+--- mozilla/dom/media/DecoderTraits.cpp
++++ mozilla/dom/media/DecoderTraits.cpp
+@@ -200,10 +200,10 @@ DecoderTraits::IsWebMTypeAndEnabled(cons
+ static bool
+ IsGStreamerSupportedType(const nsACString& aMimeType)
+ {
+-  if (!MediaDecoder::IsGStreamerEnabled())
++  if (DecoderTraits::IsWebMTypeAndEnabled(aMimeType))
+     return false;
+ 
+-  if (DecoderTraits::IsWebMTypeAndEnabled(aMimeType) && !Preferences::GetBool("media.prefer-gstreamer", false))
++  if (!MediaDecoder::IsGStreamerEnabled())
+     return false;
+ 
+   if (IsOggType(aMimeType) && !Preferences::GetBool("media.prefer-gstreamer", false))
+@@ -366,7 +366,7 @@ static bool
+ IsMP3SupportedType(const nsACString& aType,
+                    const nsAString& aCodecs = EmptyString())
+ {
+-  return aType.EqualsASCII("audio/mpeg") && MP3Decoder::IsEnabled();
++  return MP3Decoder::CanHandleMediaType(aType, aCodecs);
+ }
+ 
+ #ifdef MOZ_APPLEMEDIA
+diff --git a/dom/media/MP3Decoder.cpp b/dom/media/MP3Decoder.cpp
+--- mozilla/dom/media/MP3Decoder.cpp
++++ mozilla/dom/media/MP3Decoder.cpp
+@@ -10,10 +10,7 @@
+ #include "MediaFormatReader.h"
+ #include "MP3Demuxer.h"
+ #include "mozilla/Preferences.h"
+-
+-#ifdef MOZ_WIDGET_ANDROID
+-#include "AndroidBridge.h"
+-#endif
++#include "PlatformDecoderModule.h"
+ 
+ namespace mozilla {
+ 
+@@ -32,14 +29,61 @@ MP3Decoder::CreateStateMachine() {
+   return new MediaDecoderStateMachine(this, reader);
+ }
+ 
++static already_AddRefed<MediaDataDecoder>
++CreateTestMP3Decoder(AudioInfo& aConfig)
++{
++  PlatformDecoderModule::Init();
++
++  nsRefPtr<PlatformDecoderModule> platform = PlatformDecoderModule::Create();
++  if (!platform || !platform->SupportsMimeType(aConfig.mMimeType)) {
++    return nullptr;
++  }
++
++  nsRefPtr<MediaDataDecoder> decoder(
++    platform->CreateDecoder(aConfig, nullptr, nullptr));
++  if (!decoder) {
++    return nullptr;
++  }
++
++  return decoder.forget();
++}
++
++static bool
++CanCreateMP3Decoder()
++{
++  static bool haveCachedResult = false;
++  static bool result = false;
++  if (haveCachedResult) {
++    return result;
++  }
++  AudioInfo config;
++  config.mMimeType = "audio/mpeg";
++  config.mRate = 48000;
++  config.mChannels = 2;
++  config.mBitDepth = 16;
++  nsRefPtr<MediaDataDecoder> decoder(CreateTestMP3Decoder(config));
++  if (decoder) {
++    result = true;
++  }
++  haveCachedResult = true;
++  return result;
++}
++
++/* static */
+ bool
+ MP3Decoder::IsEnabled() {
+-#ifdef MOZ_WIDGET_ANDROID
+-  // We need android.media.MediaCodec which exists in API level 16 and higher.
+-  return AndroidBridge::Bridge()->GetAPIVersion() >= 16;
+-#else
+-  return Preferences::GetBool("media.mp3.enabled");
+-#endif
++  return CanCreateMP3Decoder();
++}
++
++/* static */
++bool MP3Decoder::CanHandleMediaType(const nsACString& aType,
++                                    const nsAString& aCodecs)
++{
++  if (aType.EqualsASCII("audio/mp3") || aType.EqualsASCII("audio/mpeg")) {
++    return CanCreateMP3Decoder() &&
++      (aCodecs.IsEmpty() || aCodecs.EqualsASCII("mp3"));
++  }
++  return false;
+ }
+ 
+ } // namespace mozilla
+diff --git a/dom/media/MP3Decoder.h b/dom/media/MP3Decoder.h
+--- mozilla/dom/media/MP3Decoder.h
++++ mozilla/dom/media/MP3Decoder.h
+@@ -19,6 +19,8 @@ public:
+   // Returns true if the MP3 backend is preffed on, and we're running on a
+   // platform that is likely to have decoders for the format.
+   static bool IsEnabled();
++  static bool CanHandleMediaType(const nsACString& aType,
++                                 const nsAString& aCodecs);
+ };
+ 
+ } // namespace mozilla
+diff --git a/dom/media/test/manifest.js b/dom/media/test/manifest.js
+--- mozilla/dom/media/test/manifest.js
++++ mozilla/dom/media/test/manifest.js
+@@ -76,7 +76,7 @@ var gPlayedTests = [
+   { name:"seek.ogv", type:"video/ogg", duration:3.966 },
+   { name:"seek.webm", type:"video/webm", duration:3.966 },
+   { name:"gizmo.mp4", type:"video/mp4", duration:5.56 },
+-  { name:"owl.mp3", type:"audio/mpeg", duration:3.29 },
++  { name:"owl.mp3", type:"audio/mpeg", duration:3.343 },
+   // Disable vbr.mp3 to see if it reduces the error of AUDCLNT_E_CPUUSAGE_EXCEEDED.
+   // See bug 1110922 comment 26.
+   //{ name:"vbr.mp3", type:"audio/mpeg", duration:10.0 },
+@@ -237,13 +237,13 @@ var gPlayTests = [
+ 
+   { name:"small-shot.m4a", type:"audio/mp4", duration:0.29 },
+   { name:"small-shot.mp3", type:"audio/mpeg", duration:0.27 },
+-  { name:"owl.mp3", type:"audio/mpeg", duration:3.29 },
++  { name:"owl.mp3", type:"audio/mpeg", duration:3.343 },
+   // owl.mp3 as above, but with something funny going on in the ID3v2 tag
+   // that causes DirectShow to fail.
+-  { name:"owl-funny-id3.mp3", type:"audio/mpeg", duration:3.29 },
++  { name:"owl-funny-id3.mp3", type:"audio/mpeg", duration:3.343 },
+   // owl.mp3 as above, but with something even funnier going on in the ID3v2 tag
+   // that causes DirectShow to fail.
+-  { name:"owl-funnier-id3.mp3", type:"audio/mpeg", duration:3.29 },
++  { name:"owl-funnier-id3.mp3", type:"audio/mpeg", duration:3.343 },
+   // One second of silence with ~140KB of ID3 tags. Usually when the first MP3
+   // frame is at such a high offset into the file, MP3FrameParser will give up
+   // and report that the stream is not MP3. However, it does not count ID3 tags
+@@ -469,7 +469,7 @@ var gSeekTests = [
+   { name:"split.webm", type:"video/webm", duration:1.967 },
+   { name:"detodos.opus", type:"audio/ogg; codecs=opus", duration:2.9135 },
+   { name:"gizmo.mp4", type:"video/mp4", duration:5.56 },
+-  { name:"owl.mp3", type:"audio/mpeg", duration:3.29 },
++  { name:"owl.mp3", type:"audio/mpeg", duration:3.343 },
+   { name:"bogus.duh", type:"bogus/duh", duration:123 }
+ ];
+ 
+@@ -523,7 +523,7 @@ if (getAndroidVersion() >= 18) {
+ var gAudioTests = [
+   { name:"r11025_s16_c1.wav", type:"audio/x-wav", duration:1.0 },
+   { name:"sound.ogg", type:"audio/ogg" },
+-  { name:"owl.mp3", type:"audio/mpeg", duration:3.29 },
++  { name:"owl.mp3", type:"audio/mpeg", duration:3.343 },
+   { name:"small-shot.m4a", type:"audio/mp4", duration:0.29 },
+   { name:"bogus.duh", type:"bogus/duh", duration:123 }
+ ];
diff --git a/www/seamonkey/files/patch-bug1228255 b/www/seamonkey/files/patch-bug1228255
new file mode 100644
index 000000000000..6c76ef937aee
--- /dev/null
+++ b/www/seamonkey/files/patch-bug1228255
@@ -0,0 +1,39 @@
+diff --git a/test/test_audio.cpp b/test/test_audio.cpp
+index 0158fb7..6a6ebf5 100644
+--- mozilla/media/libcubeb/tests/test_audio.cpp
++++ mozilla/media/libcubeb/tests/test_audio.cpp
+@@ -10,7 +10,7 @@
+ #ifdef NDEBUG
+ #undef NDEBUG
+ #endif
+-#define _XOPEN_SOURCE 500
++#define _XOPEN_SOURCE 600
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <math.h>
+diff --git a/test/test_sanity.cpp b/test/test_sanity.cpp
+index 8c80f80..ff31a96 100644
+--- mozilla/media/libcubeb/tests/test_sanity.cpp
++++ mozilla/media/libcubeb/tests/test_sanity.cpp
+@@ -7,7 +7,7 @@
+ #ifdef NDEBUG
+ #undef NDEBUG
+ #endif
+-#define _XOPEN_SOURCE 500
++#define _XOPEN_SOURCE 600
+ #include "cubeb/cubeb.h"
+ #include <assert.h>
+ #include <stdio.h>
+diff --git a/test/test_tone.cpp b/test/test_tone.cpp
+index 023c46f..a0bb287 100644
+--- mozilla/media/libcubeb/tests/test_tone.cpp
++++ mozilla/media/libcubeb/tests/test_tone.cpp
+@@ -9,7 +9,7 @@
+ #ifdef NDEBUG
+ #undef NDEBUG
+ #endif
+-#define _XOPEN_SOURCE 500
++#define _XOPEN_SOURCE 600
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <math.h>
diff --git a/www/seamonkey/files/patch-bug1228742 b/www/seamonkey/files/patch-bug1228742
new file mode 100644
index 000000000000..a8f69e30331e
--- /dev/null
+++ b/www/seamonkey/files/patch-bug1228742
@@ -0,0 +1,13 @@
+--- mozilla/toolkit/crashreporter/test/moz.build.orig	2015-12-16 16:15:25.278076000 +0100
++++ mozilla/toolkit/crashreporter/test/moz.build	2015-12-16 16:15:35.254959000 +0100
+@@ -19,10 +19,6 @@
+ 
+ GeckoSharedLibrary('testcrasher')
+ 
+-EXTRA_JS_MODULES += [
+-    'CrashTestUtils.jsm',
+-]
+-
+ DEFINES['SHARED_LIBRARY'] = '%s%s%s' % (
+     CONFIG['DLL_PREFIX'],
+     LIBRARY_NAME,
diff --git a/www/seamonkey/files/patch-bug1268816 b/www/seamonkey/files/patch-bug1268816
index 9a816d15e509..ff3a879cbdf8 100644
--- a/www/seamonkey/files/patch-bug1268816
+++ b/www/seamonkey/files/patch-bug1268816
@@ -23,10 +23,10 @@ diff --git config/stl-headers config/stl-headers
  vector
  cassert
  climits
+ cmath
  cstdarg
  cstdio
  cstdlib
- cstring
 diff --git config/system-headers config/system-headers
 --- mozilla/config/system-headers
 +++ mozilla/config/system-headers
diff --git a/www/seamonkey/files/patch-bug1269171 b/www/seamonkey/files/patch-bug1269171
index 7c7955c01c97..3f0d1bba6d24 100644
--- a/www/seamonkey/files/patch-bug1269171
+++ b/www/seamonkey/files/patch-bug1269171
@@ -149,11 +149,18 @@ diff --git config/make-stl-wrappers.py config/make-stl-wrappers.py
 diff --git config/msvc-stl-wrapper.template.h config/msvc-stl-wrapper.template.h
 --- mozilla/config/msvc-stl-wrapper.template.h
 +++ mozilla/config/msvc-stl-wrapper.template.h
-@@ -7,16 +7,23 @@
+@@ -3,45 +3,33 @@
+  */
+ /* This Source Code Form is subject to the terms of the Mozilla Public
+  * License, v. 2.0. If a copy of the MPL was not distributed with this
+  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
  
  #ifndef mozilla_${HEADER}_h
  #define mozilla_${HEADER}_h
  
+-#ifndef MOZ_HAVE_INCLUDED_ALLOC
+-#define MOZ_HAVE_INCLUDED_ALLOC
+-
  #if _HAS_EXCEPTIONS
  #  error "STL code can only be used with -fno-exceptions"
  #endif
@@ -171,9 +178,31 @@ diff --git config/msvc-stl-wrapper.template.h config/msvc-stl-wrapper.template.h
  #  include "mozilla/throw_msvc.h"
  #endif
  
- // Code might include <new> before other wrapped headers, but <new>
- // includes <exception> and so we want to wrap it.  But mozalloc.h
-@@ -66,9 +73,20 @@
+-// Code might include <new> before other wrapped headers, but <new>
+-// includes <exception> and so we want to wrap it.  But mozalloc.h
+-// wants <new> also, so we break the cycle by always explicitly
+-// including <new> here.
+-#include <${NEW_HEADER_PATH}>
+-
+-// See if we're in code that can use mozalloc.  NB: this duplicates
+-// code in nscore.h because nscore.h pulls in prtypes.h, and chromium
+-// can't build with that being included before base/basictypes.h.
+-#if !defined(XPCOM_GLUE) && !defined(NS_NO_XPCOM) && !defined(MOZ_NO_MOZALLOC)
+-#  include "mozilla/mozalloc.h"
+-#else
+-#  error "STL code can only be used with infallible ::operator new()"
+-#endif
+-#endif /* MOZ_HAVE_INCLUDED_ALLOC */
+-
+ #ifdef _DEBUG
+ // From
+ //   http://msdn.microsoft.com/en-us/library/aa985982%28VS.80%29.aspx
+ // and
+ //   http://msdn.microsoft.com/en-us/library/aa985965%28VS.80%29.aspx
+ // there appear to be two types of STL container checking.  The
+ // former is enabled by -D_DEBUG (which is implied by -MDd or -MTd), and
+ // looks to be full generation/mutation checked iterators as done by
+@@ -70,9 +58,20 @@
  //        but that's OK because we're not throwing them.
  #pragma warning( push )
  #pragma warning( disable : 4275 4530 )
diff --git a/www/seamonkey/files/patch-bug702179 b/www/seamonkey/files/patch-bug702179
index 8a9e5bf311e5..1a2ca9195f0e 100644
--- a/www/seamonkey/files/patch-bug702179
+++ b/www/seamonkey/files/patch-bug702179
@@ -1,9 +1,9 @@
 --- 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']
+@@ -637,7 +637,3 @@
  
- if CONFIG['GNU_CXX']:
-     FAIL_ON_WARNINGS = True
+ if not CONFIG['GNU_CXX']:
+     ALLOW_COMPILER_WARNINGS = True
 -
 -NO_EXPAND_LIBS = True
 -
diff --git a/www/seamonkey/files/patch-bug779713 b/www/seamonkey/files/patch-bug779713
deleted file mode 100644
index 351aa91f8a7a..000000000000
--- a/www/seamonkey/files/patch-bug779713
+++ /dev/null
@@ -1,68 +0,0 @@
-diff --git mfbt/Alignment.h mfbt/Alignment.h
-index e0843ca..353ec36 100644
---- mozilla/mfbt/Alignment.h
-+++ mozilla/mfbt/Alignment.h
-@@ -15,6 +15,13 @@
- 
- namespace mozilla {
- 
-+#if defined(MOZ_HAVE_CXX11_ALIGNAS)
-+#define MOZ_ALIGNOF(T) alignof(T)
-+#elif defined(__GNUC__)
-+#define MOZ_ALIGNOF(T) __alignof__(T)
-+#elif defined(_MSC_VER)
-+#define MOZ_ALIGNOF(T) __alignof(T)
-+#else
- /*
-  * This class, and the corresponding macro MOZ_ALIGNOF, figures out how many
-  * bytes of alignment a given type needs.
-@@ -32,6 +41,7 @@ public:
- };
- 
- #define MOZ_ALIGNOF(T) mozilla::AlignmentFinder<T>::alignment
-+#endif
- 
- /*
-  * Declare the MOZ_ALIGNED_DECL macro for declaring aligned types.
-@@ -43,7 +53,10 @@ public:
-  * will declare a two-character array |arr| aligned to 8 bytes.
-  */
- 
--#if defined(__GNUC__)
-+#if defined(MOZ_HAVE_CXX11_ALIGNAS)
-+#  define MOZ_ALIGNED_DECL(_type, _align) \
-+     alignas(_align) _type
-+#elif defined(__GNUC__)
- #  define MOZ_ALIGNED_DECL(_type, _align) \
-      _type __attribute__((aligned(_align)))
- #elif defined(_MSC_VER)
-diff --git mfbt/Attributes.h mfbt/Attributes.h
-index d317766..ddb13da 100644
---- mozilla/mfbt/Attributes.h
-+++ mozilla/mfbt/Attributes.h
-@@ -50,6 +50,7 @@
-  * don't indicate support for them here, due to
-  * http://stackoverflow.com/questions/20498142/visual-studio-2013-explicit-keyword-bug
-  */
-+#  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
-+#  if __has_extension(cxx_alignas)
-+#    define MOZ_HAVE_CXX11_ALIGNAS
-+#  endif
- #  if __has_extension(cxx_constexpr)
- #    define MOZ_HAVE_CXX11_CONSTEXPR
- #  endif
-@@ -86,6 +90,7 @@
- #  if defined(__GXX_EXPERIMENTAL_CXX0X__) || __cplusplus >= 201103L
- #    define MOZ_HAVE_CXX11_CONSTEXPR
- #    if MOZ_GCC_VERSION_AT_LEAST(4, 8, 0)
-+#      define MOZ_HAVE_CXX11_ALIGNAS
- #      define MOZ_HAVE_CXX11_CONSTEXPR_IN_TEMPLATES
- #    endif
- #    define MOZ_HAVE_EXPLICIT_CONVERSION
diff --git a/www/seamonkey/files/patch-bug847568 b/www/seamonkey/files/patch-bug847568
index f7671f47cfa0..2a18b9191ca8 100644
--- a/www/seamonkey/files/patch-bug847568
+++ b/www/seamonkey/files/patch-bug847568
@@ -101,9 +101,9 @@ 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
 +++ mozilla/gfx/graphite2/moz-gr-update.sh
-@@ -23,8 +23,14 @@ echo "\nSee" $0 "for update procedure.\n" >> gfx/graphite2/README.mozilla
- find gfx/graphite2/ -name "*.cpp" -exec perl -p -i -e "s/<cstdio>/<stdio.h>/;s/Windows.h/windows.h/;" {} \;
- find gfx/graphite2/ -name "*.h" -exec perl -p -i -e "s/<cstdio>/<stdio.h>/;s/Windows.h/windows.h/;" {} \;
+@@ -37,6 +37,12 @@
+ #find gfx/graphite2/ -name "*.cpp" -exec perl -p -i -e "s/<cstdio>/<stdio.h>/;s/Windows.h/windows.h/;" {} \;
+ #find gfx/graphite2/ -name "*.h" -exec perl -p -i -e "s/<cstdio>/<stdio.h>/;s/Windows.h/windows.h/;" {} \;
  
 +# closest tag/release to require for system version
 +TAG=$(cd ../graphitedev/ && hg parents --template {latesttag})
@@ -112,11 +112,8 @@ index f3d76ea..a9e7fb6 100644
 +  if /GR2_VERSION_REQUIRE/" configure.in
 +
  # summarize what's been touched
--echo Updated to $CHANGESET.
-+echo Updated to $CHANGESET \($TAG for --with-system-graphite2\)
+ echo Updated to $RELEASE.
  echo Here is what changed in the gfx/graphite2 directory:
- echo
- 
 diff --git gfx/harfbuzz/README-mozilla gfx/harfbuzz/README-mozilla
 index ca57d16..1ce21fe 100644
 --- mozilla/gfx/harfbuzz/README-mozilla
@@ -207,16 +204,14 @@ 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
-@@ -42,6 +42,9 @@ if CONFIG['_MSC_VER']:
- if CONFIG['ENABLE_INTL_API']:
+@@ -43,4 +43,7 @@
      CXXFLAGS += CONFIG['MOZ_ICU_CFLAGS']
+     USE_LIBS += ['icu']
  
 +if CONFIG['MOZ_NATIVE_HARFBUZZ']:
 +    CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS']
 +
- if CONFIG['GNU_CXX']:
-     FAIL_ON_WARNINGS = True
- 
+ DIST_INSTALL = True
 diff --git netwerk/dns/moz.build netwerk/dns/moz.build
 index 0b0717a..2e665c9 100644
 --- mozilla/netwerk/dns/moz.build
diff --git a/www/seamonkey/files/patch-bug991253 b/www/seamonkey/files/patch-bug991253
index 06adabf4e833..bf507f925250 100644
--- a/www/seamonkey/files/patch-bug991253
+++ b/www/seamonkey/files/patch-bug991253
@@ -1,6 +1,6 @@
---- mozilla/extensions/spellcheck/hunspell/src/mozHunspell.cpp~
-+++ mozilla/extensions/spellcheck/hunspell/src/mozHunspell.cpp
-@@ -400,6 +400,14 @@ mozHunspell::LoadDictionaryList(bool aNo
+--- mozilla/extensions/spellcheck/hunspell/glue/mozHunspell.cpp~
++++ mozilla/extensions/spellcheck/hunspell/glue/mozHunspell.cpp
+@@ -392,6 +392,14 @@ mozHunspell::LoadDictionaryList(bool aNo
      }
    }
  
diff --git a/www/seamonkey/files/patch-media_libav_config__unix.h b/www/seamonkey/files/patch-media_libav_config__unix.h
deleted file mode 100644
index c0c09c5b2d73..000000000000
--- a/www/seamonkey/files/patch-media_libav_config__unix.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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-mozilla-dom-events-MessageEvent.h b/www/seamonkey/files/patch-mozilla-dom-events-MessageEvent.h
index abc36e9228a8..0d3fe474865a 100644
--- a/www/seamonkey/files/patch-mozilla-dom-events-MessageEvent.h
+++ b/www/seamonkey/files/patch-mozilla-dom-events-MessageEvent.h
@@ -1,11 +1,10 @@
 --- mozilla/dom/events/MessageEvent.h.orig	2015-11-04 02:56:28.000000000 +0100
 +++ mozilla/dom/events/MessageEvent.h	2016-01-24 16:47:37.869781000 +0100
-@@ -16,9 +16,6 @@ namespace mozilla {
+@@ -16,8 +16,6 @@
  namespace dom {
  
  struct MessageEventInit;
 -class MessagePort;
--class MessagePortBase;
 -class MessagePortList;
  class OwningWindowProxyOrMessagePortOrClient;
  
diff --git a/www/seamonkey/files/patch-z-bug517422 b/www/seamonkey/files/patch-z-bug517422
index 362ecff557e8..ef303ac0ca4c 100644
--- a/www/seamonkey/files/patch-z-bug517422
+++ b/www/seamonkey/files/patch-z-bug517422
@@ -300,9 +300,9 @@ index 2127256..1ec09fe 100644
 +#ifndef MOZ_NATIVE_SOUNDTOUCH
    , mTimeStretcher(nullptr)
 +#endif
-   , mLatencyRequest(HighLatency)
-   , mReadPoint(0)
    , mDumpFile(nullptr)
+   , mBytesPerFrame(0)
+   , mState(INITIALIZED)
 @@ -152,9 +154,11 @@ AudioStream::~AudioStream()
    if (mDumpFile) {
      fclose(mDumpFile);
@@ -343,7 +343,7 @@ index a552e3e..02b80b1 100644
  
  namespace mozilla {
  
-@@ -329,7 +333,11 @@ private:
+@@ -277,7 +277,11 @@ private:
    // Number of frames written to the buffers.
    int64_t mWritten;
    AudioClock mAudioClock;
@@ -352,9 +352,9 @@ index a552e3e..02b80b1 100644
 +#else
    soundtouch::SoundTouch* mTimeStretcher;
 +#endif
-   nsRefPtr<AsyncLatencyLogger> mLatencyLog;
  
-   // copy of Latency logger's starting time for offset calculations
+   // Stream start time for stream open delay telemetry.
+   TimeStamp mStartTime;
 diff --git dom/media/moz.build dom/media/moz.build
 index 7526cff..e0a0ca0 100644
 --- mozilla/dom/media/moz.build