author: Jan Beich <jbeich@FreeBSD.org> 2015-11-20 00:38:40 +0000
committer: Jan Beich <jbeich@FreeBSD.org> 2015-11-20 00:38:40 +0000
commit: a356bf5bac1a8f3d0f96813fd6e7ca1dc8351b9a (patch)
tree: a75bb4ab57ec92aec4898037e6f0f059dbb9df21 /www/seamonkey
parent: cf4f066d236e899ff14ae826ecde0ac15d8388d1 (diff)
download: ports-a356bf5bac1a8f3d0f96813fd6e7ca1dc8351b9a.tar.gz
ports-a356bf5bac1a8f3d0f96813fd6e7ca1dc8351b9a.zip
34 files changed, 397 insertions, 661 deletions
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']
 +
author	Jan Beich <jbeich@FreeBSD.org>	2015-11-20 00:38:40 +0000
committer	Jan Beich <jbeich@FreeBSD.org>	2015-11-20 00:38:40 +0000
commit	a356bf5bac1a8f3d0f96813fd6e7ca1dc8351b9a (patch)
tree	a75bb4ab57ec92aec4898037e6f0f059dbb9df21 /www/seamonkey
parent	cf4f066d236e899ff14ae826ecde0ac15d8388d1 (diff)
download	ports-a356bf5bac1a8f3d0f96813fd6e7ca1dc8351b9a.tar.gz ports-a356bf5bac1a8f3d0f96813fd6e7ca1dc8351b9a.zip