Site Navigation

Date:      Mon, 14 Jan 2013 01:55:18 GMT
From:      svn-freebsd-gecko@chruetertee.ch
To:        freebsd-gecko@freebsd.org
Subject:   [SVN-Commit] r1141 - in trunk: . mail/thunderbird mail/thunderbird/files www/firefox www/firefox-nightly www/firefox-nightly/files www/firefox/files www/seamonkey www/seamonkey/files
Message-ID:  <201301140155.r0E1tI6i079235@trillian.chruetertee.ch>

---

next in thread | raw e-mail | index | archive | help

---

Author: jbeich
Date: Mon Jan 14 01:55:17 2013
New Revision: 1141

Log:
update (gcc42 build is broken)

Added:
   trunk/mail/thunderbird/files/patch-bug817267
   trunk/mail/thunderbird/files/patch-mozilla-gfx-ots-include-opentype-sanitiser.h
   trunk/www/firefox-nightly/files/patch-content-media-AudioStream.cpp
      - copied, changed from r1140, trunk/www/firefox-nightly/files/patch-content-media-nsAudioStream.cpp
   trunk/www/firefox/files/patch-bug817267
   trunk/www/firefox/files/patch-content-media-AudioStream.cpp
      - copied, changed from r1140, trunk/www/firefox-nightly/files/patch-content-media-nsAudioStream.cpp
   trunk/www/firefox/files/patch-gfx-ots-include-opentype-sanitiser.h
   trunk/www/seamonkey/files/patch-bug817267
   trunk/www/seamonkey/files/patch-mozilla-gfx-ots-include-opentype-sanitiser.h
Deleted:
   trunk/mail/thunderbird/files/patch-bug778078
   trunk/mail/thunderbird/files/patch-bug788955
   trunk/mail/thunderbird/files/patch-bug798354
   trunk/mail/thunderbird/files/patch-bug800401
   trunk/mail/thunderbird/files/patch-bug806139
   trunk/mail/thunderbird/files/patch-mozilla-xpcom-base-AvailableMemoryTracker.cpp
   trunk/mail/thunderbird/files/patch-z-bug762445
   trunk/www/firefox-nightly/files/patch-content-media-nsAudioStream.cpp
   trunk/www/firefox/files/patch-bug778078
   trunk/www/firefox/files/patch-bug788955
   trunk/www/firefox/files/patch-bug798354
   trunk/www/firefox/files/patch-bug800401
   trunk/www/firefox/files/patch-bug806139
   trunk/www/firefox/files/patch-content-media-nsAudioStream.cpp
   trunk/www/firefox/files/patch-xpcom-base-AvailableMemoryTracker.cpp
   trunk/www/firefox/files/patch-z-bug762445
   trunk/www/seamonkey/files/patch-bug778078
   trunk/www/seamonkey/files/patch-bug788955
   trunk/www/seamonkey/files/patch-bug798354
   trunk/www/seamonkey/files/patch-bug800401
   trunk/www/seamonkey/files/patch-bug806139
   trunk/www/seamonkey/files/patch-mozilla-xpcom-base-AvailableMemoryTracker.cpp
   trunk/www/seamonkey/files/patch-z-bug762445
Modified:
   trunk/Gecko_ChangeLog
   trunk/mail/thunderbird/Makefile
   trunk/mail/thunderbird/distinfo
   trunk/mail/thunderbird/files/patch-bug685258
   trunk/mail/thunderbird/files/patch-bug791305
   trunk/mail/thunderbird/files/patch-bug807492
   trunk/mail/thunderbird/files/patch-bug815025
   trunk/mail/thunderbird/files/patch-mozilla-content-media-nsAudioStream.cpp
   trunk/mail/thunderbird/files/patch-mozilla-ipc-chromium-src-base-message_pump_libevent.cc
   trunk/www/firefox-nightly/Makefile
   trunk/www/firefox-nightly/Makefile.hgrev
   trunk/www/firefox-nightly/distinfo
   trunk/www/firefox/Makefile
   trunk/www/firefox/distinfo
   trunk/www/firefox/files/patch-bug685258
   trunk/www/firefox/files/patch-bug807492
   trunk/www/firefox/files/patch-bug815025
   trunk/www/firefox/files/patch-ipc-chromium-src-base-message_pump_libevent.cc
   trunk/www/seamonkey/Makefile
   trunk/www/seamonkey/distinfo
   trunk/www/seamonkey/files/patch-bug685258
   trunk/www/seamonkey/files/patch-bug791305
   trunk/www/seamonkey/files/patch-bug807492
   trunk/www/seamonkey/files/patch-bug815025
   trunk/www/seamonkey/files/patch-mozilla-content-media-nsAudioStream.cpp
   trunk/www/seamonkey/files/patch-mozilla-ipc-chromium-src-base-message_pump_libevent.cc

Modified: trunk/Gecko_ChangeLog
==============================================================================
--- trunk/Gecko_ChangeLog	Mon Jan 14 01:55:01 2013	(r1140)
+++ trunk/Gecko_ChangeLog	Mon Jan 14 01:55:17 2013	(r1141)
@@ -1,3 +1 @@
-18.0:
-- remove QT4 option to avoid confusion
-- add WEBRTC option, untested with cameras
+19.0:

Modified: trunk/mail/thunderbird/Makefile
==============================================================================
--- trunk/mail/thunderbird/Makefile	Mon Jan 14 01:55:01 2013	(r1140)
+++ trunk/mail/thunderbird/Makefile	Mon Jan 14 01:55:17 2013	(r1141)
@@ -2,17 +2,21 @@
 # $FreeBSD: head/mail/thunderbird/Makefile 310165 2013-01-09 23:28:19Z flo $
 
 PORTNAME=	thunderbird
-DISTVERSION=	18.0b1
+PORTVERSION=	19.0.b1
+DISTVERSION=	2.16b1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
-MASTER_SITE_SUBDIR=	${PORTNAME}/releases/${DISTVERSION}/source
-DISTFILES=	${PORTNAME}-${DISTVERSION}.source${EXTRACT_SUFX}
-EXTRACT_ONLY=	${PORTNAME}-${DISTVERSION}.source${EXTRACT_SUFX}
+MASTER_SITE_SUBDIR=	seamonkey/releases/${DISTVERSION}/source
+DISTFILES=	seamonkey-${DISTVERSION}.source${EXTRACT_SUFX}
+EXTRACT_ONLY=	seamonkey-${DISTVERSION}.source${EXTRACT_SUFX}
+#MASTER_SITE_SUBDIR=	${PORTNAME}/releases/${DISTVERSION}/source
+#DISTFILES=	${PORTNAME}-${DISTVERSION}.source${EXTRACT_SUFX}
+#EXTRACT_ONLY=	${PORTNAME}-${DISTVERSION}.source${EXTRACT_SUFX}
 
 MAINTAINER=	gecko@FreeBSD.org
 COMMENT=	Mozilla Thunderbird is standalone mail and news that stands above
 
-BUILD_DEPENDS=	nspr>=4.9.3:${PORTSDIR}/devel/nspr \
+BUILD_DEPENDS=	nspr>=4.9.4:${PORTSDIR}/devel/nspr \
 		nss>=3.14:${PORTSDIR}/security/nss \
 		sqlite3>=3.7.14.1:${PORTSDIR}/databases/sqlite3 \
 		${PYTHON_SITELIBDIR}/_sqlite3.so:${PORTSDIR}/databases/py-sqlite3 \
@@ -20,6 +24,7 @@
 		unzip:${PORTSDIR}/archivers/unzip
 
 EM_VERSION=	1.5.0
+L_VERSION=	2.1b1
 
 USE_AUTOTOOLS=	autoconf213:env
 USE_PYTHON_BUILD=-2.7
@@ -93,7 +98,7 @@
 MOZ_OPTIONS+=	--enable-calendar
 MOZ_MK_OPTIONS+=	MOZ_CO_PROJECT=calendar
 LIGHTNING_DIR=	share/lightning
-XPI_FILE=	${MOZ_OBJDIR}/mozilla/dist/xpi-stage/lightning.xpi
+XPI_FILE=	${MOZ_OBJDIR}/mozilla/dist/xpi-stage/lightning-${L_VERSION}.en-US.freebsd${OSREL}-${ARCH:S/amd64/x86_64/}.xpi
 XPI_ORIG_ID=	{e2fda1a4-762b-4020-b5ad-a41df1933103}
 XPI_ID=		lightning@thunderbird.mozilla.org
 .else

Modified: trunk/mail/thunderbird/distinfo
==============================================================================
--- trunk/mail/thunderbird/distinfo	Mon Jan 14 01:55:01 2013	(r1140)
+++ trunk/mail/thunderbird/distinfo	Mon Jan 14 01:55:17 2013	(r1141)
@@ -1,4 +1,4 @@
-SHA256 (thunderbird-18.0b1.source.tar.bz2) = 60a31745fc0ee4fc5597de6663a757f55c0bd61494f67607e3b914c73e236c72
-SIZE (thunderbird-18.0b1.source.tar.bz2) = 119356332
+SHA256 (seamonkey-2.16b1.source.tar.bz2) = 4feabd38674595c839e689142106bb1428dcdc1d5575e02ad5375039e1d047e7
+SIZE (seamonkey-2.16b1.source.tar.bz2) = 122349139
 SHA256 (enigmail-1.5.0.tar.gz) = 51f55573448586718c8d7e664329d519b02c4b28af4910bcb550961ace9a9e71
 SIZE (enigmail-1.5.0.tar.gz) = 1216071

Modified: trunk/mail/thunderbird/files/patch-bug685258
==============================================================================
--- trunk/mail/thunderbird/files/patch-bug685258	Mon Jan 14 01:55:01 2013	(r1140)
+++ trunk/mail/thunderbird/files/patch-bug685258	Mon Jan 14 01:55:17 2013	(r1141)
@@ -3,9 +3,9 @@
 # Parent a2291c212856ad27622416e83c8311b6a33b52f1
 Bug 685258 - Pulse audio backend does not check provided playback and crashes r=derf
 
-diff --git a/content/media/nsAudioStream.cpp b/content/media/nsAudioStream.cpp
---- mozilla/content/media/nsAudioStream.cpp
-+++ mozilla/content/media/nsAudioStream.cpp
+diff --git a/content/media/AudioStream.cpp b/content/media/AudioStream.cpp
+--- mozilla/content/media/AudioStream.cpp
++++ mozilla/content/media/AudioStream.cpp
 @@ -429,7 +429,7 @@ nsresult nsNativeAudioStream::Init(PRInt32 aNumChannels, PRInt32 aRate, SampleFo
    mFormat = aFormat;
  

Deleted: trunk/mail/thunderbird/files/patch-bug778078
==============================================================================
--- trunk/mail/thunderbird/files/patch-bug778078	Mon Jan 14 01:55:17 2013	(r1140)
+++ /dev/null	00:00:00 1970	(deleted)
@@ -1,11 +0,0 @@
---- mozilla/toolkit/xre/nsAppRunner.cpp~
-+++ mozilla/toolkit/xre/nsAppRunner.cpp
-@@ -3833,7 +3833,7 @@ XREMain::XRE_main(int argc, char* argv[]
-   ScopedLogging log;
- 
- #if defined(MOZ_WIDGET_GTK)
--#ifdef MOZ_MEMORY
-+#if defined(MOZ_MEMORY) || defined(__FreeBSD__) || defined(__NetBSD__)
-   // Disable the slice allocator, since jemalloc already uses similar layout
-   // algorithms, and using a sub-allocator tends to increase fragmentation.
-   // This must be done before g_thread_init() is called.

Deleted: trunk/mail/thunderbird/files/patch-bug788955
==============================================================================
--- trunk/mail/thunderbird/files/patch-bug788955	Mon Jan 14 01:55:17 2013	(r1140)
+++ /dev/null	00:00:00 1970	(deleted)
@@ -1,299 +0,0 @@
-diff --git Makefile.in Makefile.in
-index e341462..f75bd55 100644
---- mozilla/Makefile.in
-+++ mozilla/Makefile.in
-@@ -48,8 +48,10 @@ endif
- ifdef MOZ_MEMORY
- tier_base_dirs += memory/mozjemalloc
- ifdef MOZ_JEMALLOC
-+ifndef MOZ_NATIVE_JEMALLOC
- tier_base_dirs += memory/jemalloc
- endif
-+endif
- tier_base_dirs += memory/build
- endif
- ifndef MOZ_NATIVE_ZLIB
-diff --git allmakefiles.sh allmakefiles.sh
-index 6a9be4b..d2e49e3 100755
---- mozilla/allmakefiles.sh
-+++ mozilla/allmakefiles.sh
-@@ -59,7 +59,7 @@ if [ ! "$LIBXUL_SDK" ]; then
-     mozglue/Makefile
-     mozglue/build/Makefile
-   "
--  if [ "$MOZ_JEMALLOC" ]; then
-+  if [ "$MOZ_JEMALLOC" -a -z "$MOZ_NATIVE_JEMALLOC" ]; then
-     add_makefiles "
-       memory/jemalloc/Makefile
-     "
-diff --git configure.in configure.in
-index bb05782..2f32516 100644
---- mozilla/configure.in
-+++ mozilla/configure.in
-@@ -3711,21 +3711,22 @@ fi
- 
- dnl Check for the existence of various allocation headers/functions
- 
-+MALLOC_HEADERS="malloc.h malloc_np.h malloc/malloc.h sys/malloc.h"
- MALLOC_H=
--MOZ_CHECK_HEADER(malloc.h,        [MALLOC_H=malloc.h])
--if test "$MALLOC_H" = ""; then
--  MOZ_CHECK_HEADER(malloc/malloc.h, [MALLOC_H=malloc/malloc.h])
--  if test "$MALLOC_H" = ""; then
--    MOZ_CHECK_HEADER(sys/malloc.h,    [MALLOC_H=sys/malloc.h])
-+
-+for file in $MALLOC_HEADERS; do
-+  MOZ_CHECK_HEADER($file, [MALLOC_H=$file])
-+  if test "$MALLOC_H" != ""; then
-+    AC_DEFINE_UNQUOTED(MALLOC_H, <$MALLOC_H>)
-+    break
-   fi
--fi
--if test "$MALLOC_H" != ""; then
--   AC_DEFINE_UNQUOTED(MALLOC_H, <$MALLOC_H>)
--fi
-+done
- 
- MOZ_ALLOCATING_FUNCS="strndup posix_memalign memalign valloc"
- AC_CHECK_FUNCS(strndup posix_memalign memalign valloc)
- 
-+AC_CHECK_FUNCS(malloc_usable_size)
-+
- dnl See if compiler supports some gcc-style attributes
- 
- AC_CACHE_CHECK(for __attribute__((always_inline)),
-@@ -6939,6 +6940,18 @@ else
- fi
- 
- if test -z "$MOZ_MEMORY"; then
-+  if test -n "$MOZ_JEMALLOC"; then
-+    MOZ_NATIVE_JEMALLOC=1
-+    AC_CHECK_FUNCS(mallctl nallocm,,
-+      [MOZ_NATIVE_JEMALLOC=
-+       break])
-+    if test -n "$MOZ_NATIVE_JEMALLOC"; then
-+      MOZ_MEMORY=1
-+      AC_DEFINE(MOZ_MEMORY)
-+      AC_DEFINE(MOZ_JEMALLOC)
-+      AC_DEFINE(MOZ_NATIVE_JEMALLOC)
-+    fi
-+  fi
-   case "${target}" in
-     *-mingw*)
-       if test -z "$WIN32_REDIST_DIR" -a -z "$MOZ_DEBUG"; then
-@@ -7033,6 +7046,7 @@ else
- fi # MOZ_MEMORY
- AC_SUBST(MOZ_MEMORY)
- AC_SUBST(MOZ_JEMALLOC)
-+AC_SUBST(MOZ_NATIVE_JEMALLOC)
- AC_SUBST(MOZ_GLUE_LDFLAGS)
- AC_SUBST(MOZ_GLUE_PROGRAM_LDFLAGS)
- AC_SUBST(WIN32_CRT_LIBS)
-@@ -8820,10 +8834,22 @@ fi
- 
- # Run jemalloc configure script
- 
--if test "$MOZ_JEMALLOC" -a "$MOZ_MEMORY"; then
-+if test -z "$MOZ_NATIVE_JEMALLOC" -a "$MOZ_JEMALLOC" -a "$MOZ_MEMORY" ; then
-   ac_configure_args="$_SUBDIR_CONFIG_ARGS --build=$build --host=$target --enable-stats --with-jemalloc-prefix=je_"
--  if test "$OS_ARCH" = "Linux"; then
--    MANGLE="malloc calloc valloc free realloc memalign posix_memalign malloc_usable_size"
-+  case "$OS_ARCH" in
-+    Linux|DragonFly|FreeBSD|NetBSD|OpenBSD)
-+      MANGLE="malloc calloc valloc free realloc posix_memalign"
-+      case "$OS_ARCH" in
-+        Linux)
-+          MANGLE="$MANGLE memalign malloc_usable_size"
-+          ;;
-+        FreeBSD)
-+          MANGLE="$MANGLE malloc_usable_size"
-+          ;;
-+      esac
-+      ;;
-+  esac
-+  if test -n "$MANGLE"; then
-     MANGLED=
-     JEMALLOC_WRAPPER=
-     if test -n "$_WRAP_MALLOC"; then
-diff --git memory/build/Makefile.in memory/build/Makefile.in
-index dca0f48..af93ee0 100644
---- mozilla/memory/build/Makefile.in
-+++ mozilla/memory/build/Makefile.in
-@@ -22,7 +22,9 @@ CSRCS = extraMallocFuncs.c
- 
- ifdef MOZ_JEMALLOC
- CSRCS += mozjemalloc_compat.c
-+ifndef MOZ_NATIVE_JEMALLOC
- SHARED_LIBRARY_LIBS += $(call EXPAND_LIBNAME_PATH,jemalloc,$(DEPTH)/memory/jemalloc)
-+endif
- else
- SHARED_LIBRARY_LIBS += $(call EXPAND_LIBNAME_PATH,jemalloc,$(DEPTH)/memory/mozjemalloc)
- endif
-diff --git memory/build/extraMallocFuncs.c memory/build/extraMallocFuncs.c
-index 9d87629..03c8320 100644
---- mozilla/memory/build/extraMallocFuncs.c
-+++ mozilla/memory/build/extraMallocFuncs.c
-@@ -94,8 +94,16 @@ wrap(wcsdup)(const wchar_t *src)
- #endif
- 
- #ifdef MOZ_JEMALLOC
-+
-+#undef wrap
-+#if defined(MOZ_NATIVE_JEMALLOC)
-+#define wrap(a) a
-+#else
-+#define wrap(a) je_ ## a
-+#endif
-+
- /* Override some jemalloc defaults */
--const char *je_malloc_conf = "narenas:1,lg_chunk:20";
-+MOZ_EXPORT_DATA(const char *) wrap(malloc_conf) = "narenas:1,lg_chunk:20";
- 
- #ifdef ANDROID
- #include <android/log.h>
-diff --git memory/build/mozjemalloc_compat.c memory/build/mozjemalloc_compat.c
-index 10a845a..94ad96e 100644
---- mozilla/memory/build/mozjemalloc_compat.c
-+++ mozilla/memory/build/mozjemalloc_compat.c
-@@ -5,14 +5,21 @@
- #include "mozilla/Types.h"
- #include "jemalloc_types.h"
- 
--extern int je_mallctl(const char*, void*, size_t*, void*, size_t);
-+#if defined(MOZ_NATIVE_JEMALLOC)
-+#define wrap(a) a
-+#else
-+#define wrap(a) je_ ## a
-+#endif
- 
--MOZ_EXPORT_API (void)
-+extern MOZ_IMPORT_API(int)
-+wrap(mallctl)(const char*, void*, size_t*, void*, size_t);
-+
-+MOZ_EXPORT_API(void)
- jemalloc_stats(jemalloc_stats_t *stats)
- {
-   size_t size = sizeof(stats->mapped);
--  je_mallctl("stats.mapped", &stats->mapped, &size, NULL, 0);
--  je_mallctl("stats.allocated", &stats->allocated, &size, NULL, 0);
-+  wrap(mallctl)("stats.mapped", &stats->mapped, &size, NULL, 0);
-+  wrap(mallctl)("stats.allocated", &stats->allocated, &size, NULL, 0);
-   stats->committed = -1;
-   stats->dirty = -1;
- }
-diff --git memory/jemalloc/src/src/mutex.c memory/jemalloc/src/src/mutex.c
-index 37a843e..55e18c2 100644
---- mozilla/memory/jemalloc/src/src/mutex.c
-+++ mozilla/memory/jemalloc/src/src/mutex.c
-@@ -64,7 +64,7 @@ pthread_create(pthread_t *__restrict thread,
- /******************************************************************************/
- 
- #ifdef JEMALLOC_MUTEX_INIT_CB
--int	_pthread_mutex_init_calloc_cb(pthread_mutex_t *mutex,
-+JEMALLOC_EXPORT int	_pthread_mutex_init_calloc_cb(pthread_mutex_t *mutex,
-     void *(calloc_cb)(size_t, size_t));
- #endif
- 
-diff --git memory/mozalloc/mozalloc.cpp memory/mozalloc/mozalloc.cpp
-index 5b61050b..5b3399a 100644
---- mozilla/memory/mozalloc/mozalloc.cpp
-+++ mozilla/memory/mozalloc/mozalloc.cpp
-@@ -12,16 +12,13 @@
- #include <sys/types.h>
- 
- #if defined(MALLOC_H)
--#  include MALLOC_H             // for memalign, valloc where available
-+#  include MALLOC_H             // for memalign, valloc, malloc_size, malloc_usable_size
- #endif // if defined(MALLOC_H)
- #include <stddef.h>             // for size_t
- #include <stdlib.h>             // for malloc, free
- #if defined(XP_UNIX)
- #  include <unistd.h>           // for valloc on *BSD
- #endif //if defined(XP_UNIX)
--#if defined(__FreeBSD__)
--#  include <malloc_np.h>        // for malloc_usable_size
--#endif // if defined(__FreeBSD__)
- 
- #if defined(XP_WIN) || (defined(XP_OS2) && defined(__declspec))
- #  define MOZALLOC_EXPORT __declspec(dllexport)
-@@ -213,8 +210,7 @@ moz_malloc_usable_size(void *ptr)
- 
- #if defined(XP_MACOSX)
-     return malloc_size(ptr);
--#elif defined(MOZ_MEMORY) || (defined(XP_LINUX) && !defined(ANDROID)) || defined(__FreeBSD__)
--    // Android bionic libc doesn't have malloc_usable_size.
-+#elif defined(HAVE_MALLOC_USABLE_SIZE) || defined(MOZ_MEMORY)
-     return malloc_usable_size(ptr);
- #elif defined(XP_WIN)
-     return _msize(ptr);
-diff --git memory/mozjemalloc/jemalloc.h memory/mozjemalloc/jemalloc.h
-index f0e0878..2486e83 100644
---- mozilla/memory/mozjemalloc/jemalloc.h
-+++ mozilla/memory/mozjemalloc/jemalloc.h
-@@ -37,22 +37,29 @@
- #endif
- #include "jemalloc_types.h"
- 
-+#if defined(MOZ_NATIVE_JEMALLOC)
-+#define wrap(a) a
-+#else
-+#define wrap(a) je_ ## a
-+#endif
-+
- #ifdef __cplusplus
- extern "C" {
- #endif
- 
--#if defined(MOZ_MEMORY_LINUX)
-+#if defined(MOZ_NATIVE_JEMALLOC) \
-+  || defined(MOZ_MEMORY_LINUX) || defined(MOZ_MEMORY_BSD)
- __attribute__((weak))
- #endif
- void	jemalloc_stats(jemalloc_stats_t *stats);
- 
- /* Computes the usable size in advance. */
- #if !defined(MOZ_MEMORY_DARWIN)
--#if defined(MOZ_MEMORY_LINUX)
-+#if defined(MOZ_MEMORY_LINUX) || defined(MOZ_MEMORY_BSD)
- __attribute__((weak))
- #endif
- #if defined(MOZ_JEMALLOC)
--int je_nallocm(size_t *rsize, size_t size, int flags);
-+MOZ_IMPORT_API(int) wrap(nallocm)(size_t *rsize, size_t size, int flags);
- #else
- size_t je_malloc_good_size(size_t size);
- #endif
-@@ -62,11 +69,11 @@ static inline size_t je_malloc_usable_size_in_advance(size_t size) {
- #if defined(MOZ_MEMORY_DARWIN)
-   return malloc_good_size(size);
- #elif defined(MOZ_JEMALLOC)
--  if (je_nallocm) {
-+  if (wrap(nallocm)) {
-     size_t ret;
-     if (size == 0)
-       size = 1;
--    if (!je_nallocm(&ret, size, 0))
-+    if (!wrap(nallocm)(&ret, size, 0))
-       return ret;
-   }
-   return size;
-@@ -113,4 +120,6 @@ void    jemalloc_purge_freed_pages();
- } /* extern "C" */
- #endif
- 
-+#undef wrap
-+
- #endif /* _JEMALLOC_H_ */
-diff --git mozglue/build/Makefile.in mozglue/build/Makefile.in
-index c333647..15ba505 100644
---- mozilla/mozglue/build/Makefile.in
-+++ mozilla/mozglue/build/Makefile.in
-@@ -23,7 +23,7 @@ FORCE_STATIC_LIB = 1
- endif
- 
- # Keep jemalloc separated when mozglue is statically linked
--ifeq (1_1,$(MOZ_MEMORY)_$(FORCE_SHARED_LIB))
-+ifeq (1_1,$(MOZ_MEMORY)_$(or $(MOZ_NATIVE_JEMALLOC),$(FORCE_SHARED_LIB)))
- SHARED_LIBRARY_LIBS = $(call EXPAND_LIBNAME_PATH,memory,$(DEPTH)/memory/build)
- else
- # Temporary, until bug 662814 lands

Modified: trunk/mail/thunderbird/files/patch-bug791305
==============================================================================
--- trunk/mail/thunderbird/files/patch-bug791305	Mon Jan 14 01:55:01 2013	(r1140)
+++ trunk/mail/thunderbird/files/patch-bug791305	Mon Jan 14 01:55:17 2013	(r1141)
@@ -17,6 +17,23 @@
 
 diff --git configure.in configure.in
 index f0aeb5d..1c01010 100644
+--- configure.in
++++ configure.in
+@@ -4027,11 +4027,7 @@ if test "$MOZ_NATIVE_JPEG" = 1; then
+                      #include <jpeglib.h> ],
+                    [ #if JPEG_LIB_VERSION < $MOZJPEG
+                      #error "Insufficient JPEG library version ($MOZJPEG required)."
+-                     #endif
+-                     #ifndef JCS_EXTENSIONS
+-                     #error "libjpeg-turbo JCS_EXTENSIONS required"
+-                     #endif
+-                     ],
++                     #endif ],
+                    MOZ_NATIVE_JPEG=1,
+                    AC_MSG_ERROR([Insufficient JPEG library version for --with-system-jpeg]))
+ fi
+diff --git configure.in configure.in
+index f0aeb5d..1c01010 100644
 --- mozilla/configure.in
 +++ mozilla/configure.in
 @@ -4027,11 +4027,7 @@ if test "$MOZ_NATIVE_JPEG" = 1; then

Deleted: trunk/mail/thunderbird/files/patch-bug798354
==============================================================================
--- trunk/mail/thunderbird/files/patch-bug798354	Mon Jan 14 01:55:17 2013	(r1140)
+++ /dev/null	00:00:00 1970	(deleted)
@@ -1,15 +0,0 @@
---- mozilla/ipc/chromium/src/chrome/common/ipc_channel_posix.cc~
-+++ mozilla/ipc/chromium/src/chrome/common/ipc_channel_posix.cc
-@@ -133,7 +133,12 @@ int ChannelNameToClientFD(const std::string& channel_id) {
- }
- 
- //------------------------------------------------------------------------------
-+#if !defined(__clang__) && defined(__GNUC__) && __GNUC_MINOR__ <= 2
-+sockaddr_un sizecheck;
-+const size_t kMaxPipeNameLength = sizeof(sizecheck.sun_path);
-+#else
- const size_t kMaxPipeNameLength = sizeof(sockaddr_un::sun_path);
-+#endif
- 
- // Creates a Fifo with the specified name ready to listen on.
- bool CreateServerFifo(const std::string& pipe_name, int* server_listen_fd) {

Deleted: trunk/mail/thunderbird/files/patch-bug800401
==============================================================================
--- trunk/mail/thunderbird/files/patch-bug800401	Mon Jan 14 01:55:17 2013	(r1140)
+++ /dev/null	00:00:00 1970	(deleted)
@@ -1,91 +0,0 @@
-commit a564d64
-Author: Ehsan Akhgari <ehsan@mozilla.com>
-Date:   Thu Oct 11 13:42:12 2012 -0400
-
-    Bug 800401 - Make sure that the WebRTC build system does not impose the -Werror flag on all Linux/Mac builds; r=jesup
-    
-    In the future, we need to hook these up to the FAIL_ON_WARNINGS machinery.
----
- media/mtransport/third_party/nICEr/nicer.gyp       | 2 --
- media/mtransport/third_party/nrappkit/nrappkit.gyp | 2 --
- media/webrtc/signaling/signaling.gyp               | 6 ------
- 3 files changed, 10 deletions(-)
-
-diff --git media/mtransport/third_party/nICEr/nicer.gyp media/mtransport/third_party/nICEr/nicer.gyp
-index 26ec0c5..0e1f8b4 100644
---- mozilla/media/mtransport/third_party/nICEr/nicer.gyp
-+++ mozilla/media/mtransport/third_party/nICEr/nicer.gyp
-@@ -132,7 +132,6 @@
-               ## Mac
-               [ 'OS == "mac"', {
-                 'cflags_mozilla': [
--                    '-Werror',
-                     '-Wall',
-                     '-Wno-parentheses',
-                     '-Wno-strict-prototypes',
-@@ -183,7 +182,6 @@
-               ## Linux
-               [ 'OS == "linux"', {
-                 'cflags': [
--                    '-Werror',
-                     '-Wall',
-                     '-Wno-parentheses',
-                     '-Wno-strict-prototypes',
-diff --git media/mtransport/third_party/nrappkit/nrappkit.gyp media/mtransport/third_party/nrappkit/nrappkit.gyp
-index f9a5c19..3cc8e1c 100644
---- mozilla/media/mtransport/third_party/nrappkit/nrappkit.gyp
-+++ mozilla/media/mtransport/third_party/nrappkit/nrappkit.gyp
-@@ -150,7 +150,6 @@
-               ## Mac
-               [ 'OS == "mac"', {
-                 'cflags_mozilla': [
--                    '-Werror',
-                     '-Wall',
-                     '-Wno-parentheses',
-                     '-Wno-strict-prototypes',
-@@ -200,7 +199,6 @@
-               ## Linux
-               [ 'OS == "linux"', {
-                 'cflags': [
--                    '-Werror',
-                     '-Wall',
-                     '-Wno-parentheses',
-                     '-Wno-strict-prototypes',
-diff --git media/webrtc/signaling/signaling.gyp media/webrtc/signaling/signaling.gyp
-index 1ec0ee2..175996f 100644
---- mozilla/media/webrtc/signaling/signaling.gyp
-+++ mozilla/media/webrtc/signaling/signaling.gyp
-@@ -184,7 +184,6 @@
-           ],
-           
-           'cflags_mozilla': [
--            '-Werror',
-           ],
-         }],
-         ['OS=="win"', {
-@@ -212,8 +211,6 @@
-           ],
-           
-           'cflags_mozilla': [
--            '-Werror',
--            '-Wno-error=conversion'
-           ],
-         }],
-       ],
-@@ -633,7 +630,6 @@
-           ],
- 
-           'cflags_mozilla': [
--            '-Werror',
-           ],
-         }],
-         ['OS=="win"', {
-@@ -752,8 +748,6 @@
-           ],
-           
-           'cflags_mozilla': [
--            '-Werror',
--            '-Wno-error=conversion'
-           ],
-         }],
-       ],

Deleted: trunk/mail/thunderbird/files/patch-bug806139
==============================================================================
--- trunk/mail/thunderbird/files/patch-bug806139	Mon Jan 14 01:55:17 2013	(r1140)
+++ /dev/null	00:00:00 1970	(deleted)
@@ -1,29 +0,0 @@
---- mozilla/content/html/content/public/nsHTMLMediaElement.h~
-+++ mozilla/content/html/content/public/nsHTMLMediaElement.h
-@@ -311,7 +311,7 @@ public:
-   static bool IsH264Enabled();
-   static bool IsH264Type(const nsACString& aType);
-   static const char gH264Types[3][16];
--  static char const *const gH264Codecs[7];
-+  static char const *const gH264Codecs[9];
- #endif
- 
- #ifdef MOZ_MEDIA_PLUGINS
---- mozilla/content/html/content/src/nsHTMLMediaElement.cpp~
-+++ mozilla/content/html/content/src/nsHTMLMediaElement.cpp
-@@ -2135,12 +2135,14 @@ nsHTMLMediaElement::IsWebMType(const nsA
- #endif
- 
- #if defined(MOZ_GSTREAMER) || defined(MOZ_WIDGET_GONK)
--char const *const nsHTMLMediaElement::gH264Codecs[7] = {
-+char const *const nsHTMLMediaElement::gH264Codecs[9] = {
-   "avc1.42E01E",
-   "avc1.42001E",
-   "avc1.58A01E",
-   "avc1.4D401E",
-   "avc1.64001E",
-+  "avc1.64001F",
-+  "mp4v.20.3",
-   "mp4a.40.2",
-   nullptr
- };

Modified: trunk/mail/thunderbird/files/patch-bug807492
==============================================================================
--- trunk/mail/thunderbird/files/patch-bug807492	Mon Jan 14 01:55:01 2013	(r1140)
+++ trunk/mail/thunderbird/files/patch-bug807492	Mon Jan 14 01:55:17 2013	(r1141)
@@ -81,11 +81,11 @@
  if test -n "$MOZ_WEBRTC"; then
     AC_MSG_RESULT("generating WebRTC Makefiles...")
  
+ dnl Any --include files must also appear in -D FORCED_INCLUDE_FILE= entries
+ dnl so that regeneration via dependencies works correctly
     WEBRTC_CONFIG="-D build_with_mozilla=1 --include ${srcdir}/media/webrtc/webrtc_config.gypi -D FORCED_INCLUDE_FILE=${srcdir}/media/webrtc/webrtc_config.gypi"
  
     GYP_WEBRTC_OPTIONS="--format=mozmake ${WEBRTC_CONFIG} ${EXTRA_GYP_DEFINES} --depth=${srcdir}/media/webrtc/trunk --toplevel-dir=${srcdir} -G OBJDIR=${_objdir}"
- 
-    $PYTHON ${srcdir}/media/webrtc/trunk/build/gyp_chromium \
 diff --git js/src/config/system-headers js/src/config/system-headers
 index 9bd1efa..1095a01 100644
 --- mozilla/js/src/config/system-headers
@@ -591,10 +591,10 @@
 index a7c47e1..4f191de 100644
 --- mozilla/media/webrtc/signaling/src/sipcc/cpr/darwin/cpr_darwin_ipc.c
 +++ mozilla/media/webrtc/signaling/src/sipcc/cpr/darwin/cpr_darwin_ipc.c
-@@ -352,21 +352,25 @@ cprGetMessage (cprMsgQueue_t msgQueue, b
+@@ -317,21 +317,25 @@ cprGetMessage (cprMsgQueue_t msgQueue, boolean waitForever, void **ppUserData)
  {
      static const char fname[] = "cprGetMessage";
- 	
+ 
      void *buffer = 0;
      cpr_msg_queue_t *msgq;
      cpr_msgq_node_t *node;
@@ -609,12 +609,12 @@
  		int     tz_dsttime;     /* type of dst correction to apply */
  	} tz;
 +#endif
- 	
+ 
      /* Initialize ppUserData */
      if (ppUserData) {
          *ppUserData = NULL;
      }
- 	
+ 
      msgq = (cpr_msg_queue_t *) msgQueue;
      if (msgq == NULL) {
 diff --git media/webrtc/signaling/test/Makefile.in media/webrtc/signaling/test/Makefile.in
@@ -1278,7 +1278,6 @@
 +#include <linux/videodev2.h>
 +#endif
 +
- #include <iostream>
  #include <new>
  
  #include "ref_count.h"
@@ -1286,6 +1285,7 @@
  #include "thread_wrapper.h"
  #include "critical_section_wrapper.h"
  #include "video_capture_linux.h"
+ 
 diff --git media/webrtc/trunk/src/modules/video_capture/main/source/device_info_impl.cc media/webrtc/trunk/src/modules/video_capture/main/source/device_info_impl.cc
 index e3f7bb5..882cede 100644
 --- mozilla/media/webrtc/trunk/src/modules/video_capture/main/source/device_info_impl.cc

Modified: trunk/mail/thunderbird/files/patch-bug815025
==============================================================================
--- trunk/mail/thunderbird/files/patch-bug815025	Mon Jan 14 01:55:01 2013	(r1140)
+++ trunk/mail/thunderbird/files/patch-bug815025	Mon Jan 14 01:55:17 2013	(r1141)
@@ -1,8 +1,8 @@
 --- mozilla/mfbt/SHA1.h~
 +++ mozilla/mfbt/SHA1.h
-@@ -27,6 +27,11 @@
- #include "mozilla/StandardInteger.h"
- #include "mozilla/Types.h"
+@@ -13,6 +13,11 @@
+ 
+ #include <stddef.h>
  
 +#if !defined(__clang__) && defined(__GNUC__) && __GNUC_MINOR__ <= 3
 +/* c++/36107: mark SHA1Sum constructor as weak manually */
@@ -10,18 +10,18 @@
 +#endif
 +
  namespace mozilla {
- class SHA1Sum {
-   union {
-@@ -39,7 +43,12 @@ class SHA1Sum {
  
- public:
-   static const unsigned int HashSize = 20;
+ /**
+@@ -44,7 +49,12 @@ class SHA1Sum
+     bool mDone;
+ 
+   public:
 +#if !defined(__clang__) && defined(__GNUC__) && __GNUC_MINOR__ <= 3
-+  /* c++/36107: gcc42 fails to remove *INTERNAL* from produced asm */
-+  MOZ_IMPORT_API() SHA1Sum();
++    /* c++/36107: gcc42 fails to remove *INTERNAL* from produced asm */
++    MOZ_IMPORT_API SHA1Sum();
 +#else
-   MFBT_API() SHA1Sum();
+     MFBT_API SHA1Sum();
 +#endif
-   MFBT_API(void) update(const void* dataIn, uint32_t len);
-   MFBT_API(void) finish(uint8_t hashout[20]);
- };
+ 
+     static const size_t HashSize = 20;
+     typedef uint8_t Hash[HashSize];

Added: trunk/mail/thunderbird/files/patch-bug817267
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/mail/thunderbird/files/patch-bug817267	Mon Jan 14 01:55:17 2013	(r1141)
@@ -0,0 +1,36 @@
+commit faafeb1
+Author: Jan Beich <jbeich@tormail.org>
+Date:   Sat Dec 1 21:25:24 2012 -0500
+
+    Bug 817267 - dirfd() is a macro on some BSDs, fix build there. r=yoric
+---
+ dom/system/OSFileConstants.cpp | 9 +++++++--
+ 1 file changed, 7 insertions(+), 2 deletions(-)
+
+diff --git dom/system/OSFileConstants.cpp dom/system/OSFileConstants.cpp
+index 75a41dc..63fc6b1 100644
+--- mozilla/dom/system/OSFileConstants.cpp
++++ mozilla/dom/system/OSFileConstants.cpp
+@@ -41,6 +41,11 @@
+ #include "OSFileConstants.h"
+ #include "nsIOSFileConstantsService.h"
+ 
++#if defined(__DragonFly__) || defined(__FreeBSD__) \
++  || defined(__NetBSD__) || defined(__OpenBSD__)
++#define __dd_fd dd_fd
++#endif
++
+ /**
+  * This module defines the basic libc constants (error numbers, open modes,
+  * etc.) used by OS.File and possibly other OS-bound JavaScript libraries.
+@@ -383,8 +388,8 @@ static dom::ConstantSpec gLibcProperties[] =
+   { "OSFILE_OFFSETOF_DIRENT_D_TYPE", INT_TO_JSVAL(offsetof (struct dirent, d_type)) },
+ #endif // defined(DT_UNKNOWN)
+ 
+-  // Under MacOS X, |dirfd| is a macro rather than a function, so we
+-  // need a little help to get it to work
++  // Under MacOS X and BSDs, |dirfd| is a macro rather than a
++  // function, so we need a little help to get it to work
+ #if defined(dirfd)
+   { "OSFILE_SIZEOF_DIR", INT_TO_JSVAL(sizeof (DIR)) },
+ 

Modified: trunk/mail/thunderbird/files/patch-mozilla-content-media-nsAudioStream.cpp
==============================================================================
--- trunk/mail/thunderbird/files/patch-mozilla-content-media-nsAudioStream.cpp	Mon Jan 14 01:55:01 2013	(r1140)
+++ trunk/mail/thunderbird/files/patch-mozilla-content-media-nsAudioStream.cpp	Mon Jan 14 01:55:17 2013	(r1141)
@@ -1,5 +1,5 @@
---- mozilla/content/media/nsAudioStream.cpp~
-+++ mozilla/content/media/nsAudioStream.cpp
+--- mozilla/content/media/AudioStream.cpp~
++++ mozilla/content/media/AudioStream.cpp
 @@ -298,7 +298,7 @@ static int PrefChanged(const char* aPref, void* aClosure)
        gVolumeScale = NS_MAX<double>(0, PR_strtod(utf8.get(), nullptr));
      }

Added: trunk/mail/thunderbird/files/patch-mozilla-gfx-ots-include-opentype-sanitiser.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/mail/thunderbird/files/patch-mozilla-gfx-ots-include-opentype-sanitiser.h	Mon Jan 14 01:55:17 2013	(r1141)
@@ -0,0 +1,18 @@
+diff --git gfx/ots/include/opentype-sanitiser.h gfx/ots/include/opentype-sanitiser.h
+index f42822e..1a5a699 100644
+--- mozilla/gfx/ots/include/opentype-sanitiser.h
++++ mozilla/gfx/ots/include/opentype-sanitiser.h
+@@ -44,6 +44,13 @@ typedef unsigned __int64 uint64_t;
+ #include <stdint.h>
+ #endif
+ 
++#ifdef __FreeBSD__
++# include <osreldate.h>
++# if __FreeBSD_version < 800067
++#  include <sys/types.h> // for off_t
++# endif
++#endif
++
+ #include <algorithm>  // for std::min
+ #include <cassert>
+ #include <cstddef>

Modified: trunk/mail/thunderbird/files/patch-mozilla-ipc-chromium-src-base-message_pump_libevent.cc
==============================================================================
--- trunk/mail/thunderbird/files/patch-mozilla-ipc-chromium-src-base-message_pump_libevent.cc	Mon Jan 14 01:55:01 2013	(r1140)
+++ trunk/mail/thunderbird/files/patch-mozilla-ipc-chromium-src-base-message_pump_libevent.cc	Mon Jan 14 01:55:17 2013	(r1141)
@@ -1,9 +1,9 @@
 --- mozilla/ipc/chromium/src/base/message_pump_libevent.cc~
 +++ mozilla/ipc/chromium/src/base/message_pump_libevent.cc
-@@ -15,7 +15,7 @@
- #include "base/scoped_nsautorelease_pool.h"
+@@ -16,7 +16,7 @@
  #include "base/scoped_ptr.h"
  #include "base/time.h"
+ #include "nsDependentSubstring.h"
 -#include "third_party/libevent/event.h"
 +#include "event.h"
  

Deleted: trunk/mail/thunderbird/files/patch-mozilla-xpcom-base-AvailableMemoryTracker.cpp
==============================================================================
--- trunk/mail/thunderbird/files/patch-mozilla-xpcom-base-AvailableMemoryTracker.cpp	Mon Jan 14 01:55:17 2013	(r1140)
+++ /dev/null	00:00:00 1970	(deleted)
@@ -1,10 +0,0 @@
---- mozilla/xpcom/base/AvailableMemoryTracker.cpp~
-+++ mozilla/xpcom/base/AvailableMemoryTracker.cpp
-@@ -499,6 +499,6 @@ nsJemallocFreeDirtyPagesRunnable::Run()
-   MOZ_ASSERT(NS_IsMainThread());
- 
- #if defined(MOZ_JEMALLOC)
--  mallctl("arenas.purge", nullptr, 0, nullptr, 0);
-+//  mallctl("arenas.purge", nullptr, 0, nullptr, 0);
- #elif defined(MOZ_MEMORY)
-   jemalloc_free_dirty_pages();

Deleted: trunk/mail/thunderbird/files/patch-z-bug762445
==============================================================================
--- trunk/mail/thunderbird/files/patch-z-bug762445	Mon Jan 14 01:55:17 2013	(r1140)
+++ /dev/null	00:00:00 1970	(deleted)
@@ -1,70 +0,0 @@
-commit b44dc8e
-Author: Jan Beich <jbeich@tormail.org>
-Date:   Fri Oct 12 18:49:59 2012 +0000
-
-    Bug 762445 - Add jemalloc3 glue for heap-committed, heap-dirty in about:memory.
----
- memory/build/mozjemalloc_compat.c | 34 ++++++++++++++++++++++++++++------
- 1 file changed, 28 insertions(+), 6 deletions(-)
-
-diff --git memory/build/mozjemalloc_compat.c memory/build/mozjemalloc_compat.c
-index 94ad96e..7adfef5 100644
---- mozilla/memory/build/mozjemalloc_compat.c
-+++ mozilla/memory/build/mozjemalloc_compat.c
-@@ -11,15 +11,50 @@
- #define wrap(a) je_ ## a
- #endif
- 
--extern MOZ_IMPORT_API(int)
-+/*
-+ *  CTL_* macros are from memory/jemalloc/src/src/stats.c with changes:
-+ *  - drop `t' argument to avoid redundancy in calculating type size
-+ *  - require `i' argument for arena number explicitly
-+ */
-+
-+#define	CTL_GET(n, v) do {						\
-+	size_t sz = sizeof(v);						\
-+	wrap(mallctl)(n, &v, &sz, NULL, 0);				\
-+} while (0)
-+
-+#define	CTL_I_GET(n, v, i) do {						\
-+	size_t mib[6];							\
-+	size_t miblen = sizeof(mib) / sizeof(mib[0]);			\
-+	size_t sz = sizeof(v);						\
-+	wrap(mallctlnametomib)(n, mib, &miblen);			\
-+	mib[2] = i;							\
-+	wrap(mallctlbymib)(mib, miblen, &v, &sz, NULL, 0);		\
-+} while (0)
-+
-+MOZ_IMPORT_API(int)
- wrap(mallctl)(const char*, void*, size_t*, void*, size_t);
-+MOZ_IMPORT_API(int)
-+wrap(mallctlnametomib)(const char *name, size_t *mibp, size_t *miblenp);
-+MOZ_IMPORT_API(int)
-+wrap(mallctlbymib)(const size_t *mib, size_t miblen, void *oldp, size_t *oldlenp, void *newp, size_t newlen);
- 
- MOZ_EXPORT_API(void)
- jemalloc_stats(jemalloc_stats_t *stats)
- {
--  size_t size = sizeof(stats->mapped);
--  wrap(mallctl)("stats.mapped", &stats->mapped, &size, NULL, 0);
--  wrap(mallctl)("stats.allocated", &stats->allocated, &size, NULL, 0);
--  stats->committed = -1;
--  stats->dirty = -1;
-+  unsigned narenas;
-+  size_t active, allocated, mapped, page, pdirty;
-+
-+  CTL_GET("arenas.narenas", narenas);
-+  CTL_GET("arenas.page", page);
-+  CTL_GET("stats.active", active);
-+  CTL_GET("stats.allocated", allocated);
-+  CTL_GET("stats.mapped", mapped);
-+
-+  /* get the summation for all arenas, i == narenas */
-+  CTL_I_GET("stats.arenas.0.pdirty", pdirty, narenas);
-+
-+  stats->allocated = allocated;
-+  stats->mapped = mapped;
-+  stats->dirty = pdirty * page;
-+  stats->committed = active + stats->dirty;
- }

Modified: trunk/www/firefox-nightly/Makefile
==============================================================================
--- trunk/www/firefox-nightly/Makefile	Mon Jan 14 01:55:01 2013	(r1140)
+++ trunk/www/firefox-nightly/Makefile	Mon Jan 14 01:55:17 2013	(r1141)
@@ -21,7 +21,7 @@
 #		nss>=3.14.2:${PORTSDIR}/security/nss \
 
 USE_AUTOTOOLS=	autoconf213:env
-USE_PYTHON_BUILD=-2.7
+USE_PYTHON_BUILD=2.7
 OBJDIR_BUILD=	# in-tree build broken after bug 789837
 USE_GECKO=	gecko
 MOZ_PKGCONFIG_FILES=	# empty

Modified: trunk/www/firefox-nightly/Makefile.hgrev
==============================================================================
--- trunk/www/firefox-nightly/Makefile.hgrev	Mon Jan 14 01:55:01 2013	(r1140)
+++ trunk/www/firefox-nightly/Makefile.hgrev	Mon Jan 14 01:55:17 2013	(r1141)
@@ -1 +1 @@
-HGREV=		118260:f60b87eed1ac
+HGREV=		118722:43d65f5d22b2

Modified: trunk/www/firefox-nightly/distinfo
==============================================================================
--- trunk/www/firefox-nightly/distinfo	Mon Jan 14 01:55:01 2013	(r1140)
+++ trunk/www/firefox-nightly/distinfo	Mon Jan 14 01:55:17 2013	(r1141)
@@ -1,2 +1,2 @@
-SHA256 (firefox-nightly/f60b87eed1ac.tar.bz2) = 792c4e74fe8637156a0ba140b8241f7f6a5ae0a7195584acfa5a129b1e8b33b0
-SIZE (firefox-nightly/f60b87eed1ac.tar.bz2) = 98289798
+SHA256 (firefox-nightly/43d65f5d22b2.tar.bz2) = 0e4f6c8765a182814e2b349e8ce6c202e8bc2719983ff4b59814d31aef0cc0b3
+SIZE (firefox-nightly/43d65f5d22b2.tar.bz2) = 98245517

Copied and modified: trunk/www/firefox-nightly/files/patch-content-media-AudioStream.cpp (from r1140, trunk/www/firefox-nightly/files/patch-content-media-nsAudioStream.cpp)
==============================================================================

Deleted: trunk/www/firefox-nightly/files/patch-content-media-nsAudioStream.cpp
==============================================================================
--- trunk/www/firefox-nightly/files/patch-content-media-nsAudioStream.cpp	Mon Jan 14 01:55:17 2013	(r1140)
+++ /dev/null	00:00:00 1970	(deleted)
@@ -1,11 +0,0 @@
---- content/media/AudioStream.cpp~
-+++ content/media/AudioStream.cpp
-@@ -298,7 +298,7 @@ static int PrefChanged(const char* aPref, void* aClosure)
-       gVolumeScale = NS_MAX<double>(0, PR_strtod(utf8.get(), nullptr));
-     }
-   } else if (strcmp(aPref, PREF_USE_CUBEB) == 0) {
--#ifdef MOZ_WIDGET_GONK
-+#if defined(MOZ_WIDGET_GONK) || defined(__FreeBSD__) && __FreeBSD_version < 800097
-     bool value = Preferences::GetBool(aPref, false);
- #else
-     bool value = Preferences::GetBool(aPref, true);

Modified: trunk/www/firefox/Makefile
==============================================================================
--- trunk/www/firefox/Makefile	Mon Jan 14 01:55:01 2013	(r1140)
+++ trunk/www/firefox/Makefile	Mon Jan 14 01:55:17 2013	(r1141)
@@ -2,7 +2,7 @@
 # $FreeBSD: head/www/firefox/Makefile 310227 2013-01-11 10:22:40Z ehaupt $
 
 PORTNAME=	firefox
-DISTVERSION=	18.0
+DISTVERSION=	19.0b1
 PORTEPOCH=	1
 CATEGORIES=	www ipv6
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
@@ -12,7 +12,7 @@
 MAINTAINER=	gecko@FreeBSD.org
 COMMENT=	Web browser based on the browser portion of Mozilla
 
-BUILD_DEPENDS=	nspr>=4.9.3:${PORTSDIR}/devel/nspr \
+BUILD_DEPENDS=	nspr>=4.9.4:${PORTSDIR}/devel/nspr \
 		nss>=3.14.1:${PORTSDIR}/security/nss \
 		sqlite3>=3.7.14.1:${PORTSDIR}/databases/sqlite3 \
 		${PYTHON_SITELIBDIR}/_sqlite3.so:${PORTSDIR}/databases/py-sqlite3 \
@@ -54,7 +54,7 @@
 
 .include <bsd.port.pre.mk>
 
-WRKSRC:=	${WRKDIR}/mozilla-release
+WRKSRC:=	${WRKDIR}/mozilla-beta
 
 .if ${ARCH} == amd64
 CONFIGURE_TARGET=x86_64-portbld-freebsd${OSREL}

Modified: trunk/www/firefox/distinfo
==============================================================================
--- trunk/www/firefox/distinfo	Mon Jan 14 01:55:01 2013	(r1140)
+++ trunk/www/firefox/distinfo	Mon Jan 14 01:55:17 2013	(r1141)
@@ -1,2 +1,2 @@
-SHA256 (firefox-18.0.source.tar.bz2) = 53f06ff49882060e811b06ceb5d59e5a8851bda23e4cc82426010de967565014
-SIZE (firefox-18.0.source.tar.bz2) = 96948716
+SHA256 (firefox-19.0b1.source.tar.bz2) = f46c5641c8fc06fab7a2f6ce977f9ee3c7c783fb23e01a6fc3a9299aa91e8f40
+SIZE (firefox-19.0b1.source.tar.bz2) = 99068309

Modified: trunk/www/firefox/files/patch-bug685258
==============================================================================
--- trunk/www/firefox/files/patch-bug685258	Mon Jan 14 01:55:01 2013	(r1140)
+++ trunk/www/firefox/files/patch-bug685258	Mon Jan 14 01:55:17 2013	(r1141)
@@ -3,9 +3,9 @@
 # Parent a2291c212856ad27622416e83c8311b6a33b52f1
 Bug 685258 - Pulse audio backend does not check provided playback and crashes r=derf
 
-diff --git a/content/media/nsAudioStream.cpp b/content/media/nsAudioStream.cpp
---- content/media/nsAudioStream.cpp
-+++ content/media/nsAudioStream.cpp
+diff --git a/content/media/AudioStream.cpp b/content/media/AudioStream.cpp
+--- content/media/AudioStream.cpp
++++ content/media/AudioStream.cpp
 @@ -429,7 +429,7 @@ nsresult nsNativeAudioStream::Init(PRInt32 aNumChannels, PRInt32 aRate, SampleFo
    mFormat = aFormat;
  

Deleted: trunk/www/firefox/files/patch-bug778078
==============================================================================
--- trunk/www/firefox/files/patch-bug778078	Mon Jan 14 01:55:17 2013	(r1140)
+++ /dev/null	00:00:00 1970	(deleted)
@@ -1,11 +0,0 @@
---- toolkit/xre/nsAppRunner.cpp~
-+++ toolkit/xre/nsAppRunner.cpp
-@@ -3833,7 +3833,7 @@ XREMain::XRE_main(int argc, char* argv[]
-   ScopedLogging log;
- 
- #if defined(MOZ_WIDGET_GTK)
--#ifdef MOZ_MEMORY
-+#if defined(MOZ_MEMORY) || defined(__FreeBSD__) || defined(__NetBSD__)
-   // Disable the slice allocator, since jemalloc already uses similar layout
-   // algorithms, and using a sub-allocator tends to increase fragmentation.
-   // This must be done before g_thread_init() is called.

Deleted: trunk/www/firefox/files/patch-bug788955
==============================================================================
--- trunk/www/firefox/files/patch-bug788955	Mon Jan 14 01:55:17 2013	(r1140)
+++ /dev/null	00:00:00 1970	(deleted)
@@ -1,299 +0,0 @@
-diff --git Makefile.in Makefile.in
-index e341462..f75bd55 100644
---- Makefile.in
-+++ Makefile.in
-@@ -48,8 +48,10 @@ endif
- ifdef MOZ_MEMORY
- tier_base_dirs += memory/mozjemalloc
- ifdef MOZ_JEMALLOC
-+ifndef MOZ_NATIVE_JEMALLOC
- tier_base_dirs += memory/jemalloc
- endif
-+endif
- tier_base_dirs += memory/build
- endif
- ifndef MOZ_NATIVE_ZLIB
-diff --git allmakefiles.sh allmakefiles.sh
-index 6a9be4b..d2e49e3 100755
---- allmakefiles.sh
-+++ allmakefiles.sh
-@@ -59,7 +59,7 @@ if [ ! "$LIBXUL_SDK" ]; then
-     mozglue/Makefile
-     mozglue/build/Makefile
-   "
--  if [ "$MOZ_JEMALLOC" ]; then
-+  if [ "$MOZ_JEMALLOC" -a -z "$MOZ_NATIVE_JEMALLOC" ]; then
-     add_makefiles "
-       memory/jemalloc/Makefile
-     "
-diff --git configure.in configure.in
-index bb05782..2f32516 100644
---- configure.in
-+++ configure.in
-@@ -3711,21 +3711,22 @@ fi
- 
- dnl Check for the existence of various allocation headers/functions
- 
-+MALLOC_HEADERS="malloc.h malloc_np.h malloc/malloc.h sys/malloc.h"
- MALLOC_H=
--MOZ_CHECK_HEADER(malloc.h,        [MALLOC_H=malloc.h])
--if test "$MALLOC_H" = ""; then
--  MOZ_CHECK_HEADER(malloc/malloc.h, [MALLOC_H=malloc/malloc.h])
--  if test "$MALLOC_H" = ""; then
--    MOZ_CHECK_HEADER(sys/malloc.h,    [MALLOC_H=sys/malloc.h])
-+
-+for file in $MALLOC_HEADERS; do
-+  MOZ_CHECK_HEADER($file, [MALLOC_H=$file])
-+  if test "$MALLOC_H" != ""; then
-+    AC_DEFINE_UNQUOTED(MALLOC_H, <$MALLOC_H>)
-+    break
-   fi
--fi
--if test "$MALLOC_H" != ""; then
--   AC_DEFINE_UNQUOTED(MALLOC_H, <$MALLOC_H>)
--fi
-+done
- 
- MOZ_ALLOCATING_FUNCS="strndup posix_memalign memalign valloc"
- AC_CHECK_FUNCS(strndup posix_memalign memalign valloc)
- 
-+AC_CHECK_FUNCS(malloc_usable_size)
-+
- dnl See if compiler supports some gcc-style attributes
- 
- AC_CACHE_CHECK(for __attribute__((always_inline)),
-@@ -6939,6 +6940,18 @@ else
- fi
- 
- if test -z "$MOZ_MEMORY"; then
-+  if test -n "$MOZ_JEMALLOC"; then
-+    MOZ_NATIVE_JEMALLOC=1
-+    AC_CHECK_FUNCS(mallctl nallocm,,
-+      [MOZ_NATIVE_JEMALLOC=
-+       break])
-+    if test -n "$MOZ_NATIVE_JEMALLOC"; then
-+      MOZ_MEMORY=1
-+      AC_DEFINE(MOZ_MEMORY)
-+      AC_DEFINE(MOZ_JEMALLOC)
-+      AC_DEFINE(MOZ_NATIVE_JEMALLOC)
-+    fi
-+  fi
-   case "${target}" in
-     *-mingw*)
-       if test -z "$WIN32_REDIST_DIR" -a -z "$MOZ_DEBUG"; then
-@@ -7033,6 +7046,7 @@ else
- fi # MOZ_MEMORY
- AC_SUBST(MOZ_MEMORY)
- AC_SUBST(MOZ_JEMALLOC)
-+AC_SUBST(MOZ_NATIVE_JEMALLOC)
- AC_SUBST(MOZ_GLUE_LDFLAGS)
- AC_SUBST(MOZ_GLUE_PROGRAM_LDFLAGS)
- AC_SUBST(WIN32_CRT_LIBS)
-@@ -8820,10 +8834,22 @@ fi
- 
- # Run jemalloc configure script
- 
--if test "$MOZ_JEMALLOC" -a "$MOZ_MEMORY"; then
-+if test -z "$MOZ_NATIVE_JEMALLOC" -a "$MOZ_JEMALLOC" -a "$MOZ_MEMORY" ; then
-   ac_configure_args="$_SUBDIR_CONFIG_ARGS --build=$build --host=$target --enable-stats --with-jemalloc-prefix=je_"
--  if test "$OS_ARCH" = "Linux"; then
--    MANGLE="malloc calloc valloc free realloc memalign posix_memalign malloc_usable_size"
-+  case "$OS_ARCH" in
-+    Linux|DragonFly|FreeBSD|NetBSD|OpenBSD)
-+      MANGLE="malloc calloc valloc free realloc posix_memalign"
-+      case "$OS_ARCH" in
-+        Linux)
-+          MANGLE="$MANGLE memalign malloc_usable_size"
-+          ;;
-+        FreeBSD)
-+          MANGLE="$MANGLE malloc_usable_size"
-+          ;;
-+      esac
-+      ;;
-+  esac
-+  if test -n "$MANGLE"; then
-     MANGLED=
-     JEMALLOC_WRAPPER=
-     if test -n "$_WRAP_MALLOC"; then
-diff --git memory/build/Makefile.in memory/build/Makefile.in
-index dca0f48..af93ee0 100644
---- memory/build/Makefile.in
-+++ memory/build/Makefile.in
-@@ -22,7 +22,9 @@ CSRCS = extraMallocFuncs.c
- 
- ifdef MOZ_JEMALLOC
- CSRCS += mozjemalloc_compat.c
-+ifndef MOZ_NATIVE_JEMALLOC
- SHARED_LIBRARY_LIBS += $(call EXPAND_LIBNAME_PATH,jemalloc,$(DEPTH)/memory/jemalloc)
-+endif
- else
- SHARED_LIBRARY_LIBS += $(call EXPAND_LIBNAME_PATH,jemalloc,$(DEPTH)/memory/mozjemalloc)
- endif
-diff --git memory/build/extraMallocFuncs.c memory/build/extraMallocFuncs.c
-index 9d87629..03c8320 100644
---- memory/build/extraMallocFuncs.c
-+++ memory/build/extraMallocFuncs.c
-@@ -94,8 +94,16 @@ wrap(wcsdup)(const wchar_t *src)
- #endif
- 
- #ifdef MOZ_JEMALLOC
-+
-+#undef wrap
-+#if defined(MOZ_NATIVE_JEMALLOC)
-+#define wrap(a) a
-+#else
-+#define wrap(a) je_ ## a
-+#endif
-+
- /* Override some jemalloc defaults */
--const char *je_malloc_conf = "narenas:1,lg_chunk:20";
-+MOZ_EXPORT_DATA(const char *) wrap(malloc_conf) = "narenas:1,lg_chunk:20";
- 
- #ifdef ANDROID
- #include <android/log.h>
-diff --git memory/build/mozjemalloc_compat.c memory/build/mozjemalloc_compat.c
-index 10a845a..94ad96e 100644
---- memory/build/mozjemalloc_compat.c
-+++ memory/build/mozjemalloc_compat.c
-@@ -5,14 +5,21 @@
- #include "mozilla/Types.h"
- #include "jemalloc_types.h"
- 
--extern int je_mallctl(const char*, void*, size_t*, void*, size_t);
-+#if defined(MOZ_NATIVE_JEMALLOC)
-+#define wrap(a) a
-+#else
-+#define wrap(a) je_ ## a
-+#endif
- 
--MOZ_EXPORT_API (void)
-+extern MOZ_IMPORT_API(int)
-+wrap(mallctl)(const char*, void*, size_t*, void*, size_t);
-+
-+MOZ_EXPORT_API(void)
- jemalloc_stats(jemalloc_stats_t *stats)
- {
-   size_t size = sizeof(stats->mapped);
--  je_mallctl("stats.mapped", &stats->mapped, &size, NULL, 0);
--  je_mallctl("stats.allocated", &stats->allocated, &size, NULL, 0);
-+  wrap(mallctl)("stats.mapped", &stats->mapped, &size, NULL, 0);
-+  wrap(mallctl)("stats.allocated", &stats->allocated, &size, NULL, 0);
-   stats->committed = -1;
-   stats->dirty = -1;
- }
-diff --git memory/jemalloc/src/src/mutex.c memory/jemalloc/src/src/mutex.c
-index 37a843e..55e18c2 100644
---- memory/jemalloc/src/src/mutex.c
-+++ memory/jemalloc/src/src/mutex.c
-@@ -64,7 +64,7 @@ pthread_create(pthread_t *__restrict thread,
- /******************************************************************************/
- 
- #ifdef JEMALLOC_MUTEX_INIT_CB
--int	_pthread_mutex_init_calloc_cb(pthread_mutex_t *mutex,
-+JEMALLOC_EXPORT int	_pthread_mutex_init_calloc_cb(pthread_mutex_t *mutex,
-     void *(calloc_cb)(size_t, size_t));
- #endif
- 
-diff --git memory/mozalloc/mozalloc.cpp memory/mozalloc/mozalloc.cpp
-index 5b61050b..5b3399a 100644
---- memory/mozalloc/mozalloc.cpp
-+++ memory/mozalloc/mozalloc.cpp
-@@ -12,16 +12,13 @@
- #include <sys/types.h>
- 
- #if defined(MALLOC_H)
--#  include MALLOC_H             // for memalign, valloc where available
-+#  include MALLOC_H             // for memalign, valloc, malloc_size, malloc_usable_size
- #endif // if defined(MALLOC_H)
- #include <stddef.h>             // for size_t
- #include <stdlib.h>             // for malloc, free
- #if defined(XP_UNIX)
- #  include <unistd.h>           // for valloc on *BSD
- #endif //if defined(XP_UNIX)
--#if defined(__FreeBSD__)
--#  include <malloc_np.h>        // for malloc_usable_size
--#endif // if defined(__FreeBSD__)
- 
- #if defined(XP_WIN) || (defined(XP_OS2) && defined(__declspec))
- #  define MOZALLOC_EXPORT __declspec(dllexport)
-@@ -213,8 +210,7 @@ moz_malloc_usable_size(void *ptr)
- 
- #if defined(XP_MACOSX)
-     return malloc_size(ptr);
--#elif defined(MOZ_MEMORY) || (defined(XP_LINUX) && !defined(ANDROID)) || defined(__FreeBSD__)
--    // Android bionic libc doesn't have malloc_usable_size.
-+#elif defined(HAVE_MALLOC_USABLE_SIZE) || defined(MOZ_MEMORY)
-     return malloc_usable_size(ptr);
- #elif defined(XP_WIN)
-     return _msize(ptr);
-diff --git memory/mozjemalloc/jemalloc.h memory/mozjemalloc/jemalloc.h
-index f0e0878..2486e83 100644
---- memory/mozjemalloc/jemalloc.h
-+++ memory/mozjemalloc/jemalloc.h
-@@ -37,22 +37,29 @@
- #endif
- #include "jemalloc_types.h"
- 
-+#if defined(MOZ_NATIVE_JEMALLOC)
-+#define wrap(a) a
-+#else
-+#define wrap(a) je_ ## a
-+#endif
-+
- #ifdef __cplusplus
- extern "C" {
- #endif
- 
--#if defined(MOZ_MEMORY_LINUX)
-+#if defined(MOZ_NATIVE_JEMALLOC) \
-+  || defined(MOZ_MEMORY_LINUX) || defined(MOZ_MEMORY_BSD)
- __attribute__((weak))
- #endif
- void	jemalloc_stats(jemalloc_stats_t *stats);
- 
- /* Computes the usable size in advance. */
- #if !defined(MOZ_MEMORY_DARWIN)
--#if defined(MOZ_MEMORY_LINUX)
-+#if defined(MOZ_MEMORY_LINUX) || defined(MOZ_MEMORY_BSD)
- __attribute__((weak))
- #endif
- #if defined(MOZ_JEMALLOC)
--int je_nallocm(size_t *rsize, size_t size, int flags);
-+MOZ_IMPORT_API(int) wrap(nallocm)(size_t *rsize, size_t size, int flags);
- #else
- size_t je_malloc_good_size(size_t size);
- #endif
-@@ -62,11 +69,11 @@ static inline size_t je_malloc_usable_size_in_advance(size_t size) {
- #if defined(MOZ_MEMORY_DARWIN)
-   return malloc_good_size(size);
- #elif defined(MOZ_JEMALLOC)
--  if (je_nallocm) {
-+  if (wrap(nallocm)) {
-     size_t ret;
-     if (size == 0)
-       size = 1;
--    if (!je_nallocm(&ret, size, 0))
-+    if (!wrap(nallocm)(&ret, size, 0))
-       return ret;
-   }
-   return size;
-@@ -113,4 +120,6 @@ void    jemalloc_purge_freed_pages();
- } /* extern "C" */
- #endif
- 
-+#undef wrap
-+
- #endif /* _JEMALLOC_H_ */
-diff --git mozglue/build/Makefile.in mozglue/build/Makefile.in
-index c333647..15ba505 100644
---- mozglue/build/Makefile.in
-+++ mozglue/build/Makefile.in
-@@ -23,7 +23,7 @@ FORCE_STATIC_LIB = 1
- endif
- 
- # Keep jemalloc separated when mozglue is statically linked
--ifeq (1_1,$(MOZ_MEMORY)_$(FORCE_SHARED_LIB))
-+ifeq (1_1,$(MOZ_MEMORY)_$(or $(MOZ_NATIVE_JEMALLOC),$(FORCE_SHARED_LIB)))
- SHARED_LIBRARY_LIBS = $(call EXPAND_LIBNAME_PATH,memory,$(DEPTH)/memory/build)
- else
- # Temporary, until bug 662814 lands

Deleted: trunk/www/firefox/files/patch-bug798354
==============================================================================
--- trunk/www/firefox/files/patch-bug798354	Mon Jan 14 01:55:17 2013	(r1140)
+++ /dev/null	00:00:00 1970	(deleted)
@@ -1,15 +0,0 @@
---- ipc/chromium/src/chrome/common/ipc_channel_posix.cc~
-+++ ipc/chromium/src/chrome/common/ipc_channel_posix.cc
-@@ -133,7 +133,12 @@ int ChannelNameToClientFD(const std::string& channel_id) {
- }
- 
- //------------------------------------------------------------------------------
-+#if !defined(__clang__) && defined(__GNUC__) && __GNUC_MINOR__ <= 2
-+sockaddr_un sizecheck;
-+const size_t kMaxPipeNameLength = sizeof(sizecheck.sun_path);
-+#else
- const size_t kMaxPipeNameLength = sizeof(sockaddr_un::sun_path);
-+#endif
- 
- // Creates a Fifo with the specified name ready to listen on.
- bool CreateServerFifo(const std::string& pipe_name, int* server_listen_fd) {

Deleted: trunk/www/firefox/files/patch-bug800401
==============================================================================
--- trunk/www/firefox/files/patch-bug800401	Mon Jan 14 01:55:17 2013	(r1140)
+++ /dev/null	00:00:00 1970	(deleted)
@@ -1,91 +0,0 @@
-commit a564d64
-Author: Ehsan Akhgari <ehsan@mozilla.com>
-Date:   Thu Oct 11 13:42:12 2012 -0400
-
-    Bug 800401 - Make sure that the WebRTC build system does not impose the -Werror flag on all Linux/Mac builds; r=jesup
-    
-    In the future, we need to hook these up to the FAIL_ON_WARNINGS machinery.
----
- media/mtransport/third_party/nICEr/nicer.gyp       | 2 --
- media/mtransport/third_party/nrappkit/nrappkit.gyp | 2 --
- media/webrtc/signaling/signaling.gyp               | 6 ------
- 3 files changed, 10 deletions(-)
-
-diff --git media/mtransport/third_party/nICEr/nicer.gyp media/mtransport/third_party/nICEr/nicer.gyp
-index 26ec0c5..0e1f8b4 100644
---- media/mtransport/third_party/nICEr/nicer.gyp
-+++ media/mtransport/third_party/nICEr/nicer.gyp
-@@ -132,7 +132,6 @@
-               ## Mac
-               [ 'OS == "mac"', {
-                 'cflags_mozilla': [
--                    '-Werror',
-                     '-Wall',
-                     '-Wno-parentheses',
-                     '-Wno-strict-prototypes',
-@@ -183,7 +182,6 @@
-               ## Linux
-               [ 'OS == "linux"', {
-                 'cflags': [
--                    '-Werror',
-                     '-Wall',
-                     '-Wno-parentheses',
-                     '-Wno-strict-prototypes',
-diff --git media/mtransport/third_party/nrappkit/nrappkit.gyp media/mtransport/third_party/nrappkit/nrappkit.gyp
-index f9a5c19..3cc8e1c 100644
---- media/mtransport/third_party/nrappkit/nrappkit.gyp
-+++ media/mtransport/third_party/nrappkit/nrappkit.gyp
-@@ -150,7 +150,6 @@
-               ## Mac
-               [ 'OS == "mac"', {
-                 'cflags_mozilla': [
--                    '-Werror',
-                     '-Wall',
-                     '-Wno-parentheses',
-                     '-Wno-strict-prototypes',
-@@ -200,7 +199,6 @@
-               ## Linux
-               [ 'OS == "linux"', {
-                 'cflags': [
--                    '-Werror',
-                     '-Wall',
-                     '-Wno-parentheses',
-                     '-Wno-strict-prototypes',
-diff --git media/webrtc/signaling/signaling.gyp media/webrtc/signaling/signaling.gyp
-index 1ec0ee2..175996f 100644
---- media/webrtc/signaling/signaling.gyp
-+++ media/webrtc/signaling/signaling.gyp
-@@ -184,7 +184,6 @@
-           ],
-           
-           'cflags_mozilla': [
--            '-Werror',
-           ],
-         }],
-         ['OS=="win"', {
-@@ -212,8 +211,6 @@
-           ],
-           
-           'cflags_mozilla': [
--            '-Werror',
--            '-Wno-error=conversion'
-           ],
-         }],
-       ],
-@@ -633,7 +630,6 @@
-           ],
- 
-           'cflags_mozilla': [
--            '-Werror',
-           ],
-         }],
-         ['OS=="win"', {
-@@ -752,8 +748,6 @@
-           ],
-           
-           'cflags_mozilla': [
--            '-Werror',
--            '-Wno-error=conversion'
-           ],
-         }],
-       ],

Deleted: trunk/www/firefox/files/patch-bug806139
==============================================================================
--- trunk/www/firefox/files/patch-bug806139	Mon Jan 14 01:55:17 2013	(r1140)
+++ /dev/null	00:00:00 1970	(deleted)
@@ -1,29 +0,0 @@
---- content/html/content/public/nsHTMLMediaElement.h~
-+++ content/html/content/public/nsHTMLMediaElement.h
-@@ -311,7 +311,7 @@ public:
-   static bool IsH264Enabled();
-   static bool IsH264Type(const nsACString& aType);
-   static const char gH264Types[3][16];
--  static char const *const gH264Codecs[7];
-+  static char const *const gH264Codecs[9];
- #endif
- 
- #ifdef MOZ_MEDIA_PLUGINS
---- content/html/content/src/nsHTMLMediaElement.cpp~
-+++ content/html/content/src/nsHTMLMediaElement.cpp
-@@ -2135,12 +2135,14 @@ nsHTMLMediaElement::IsWebMType(const nsA
- #endif
- 
- #if defined(MOZ_GSTREAMER) || defined(MOZ_WIDGET_GONK)
--char const *const nsHTMLMediaElement::gH264Codecs[7] = {
-+char const *const nsHTMLMediaElement::gH264Codecs[9] = {
-   "avc1.42E01E",
-   "avc1.42001E",
-   "avc1.58A01E",
-   "avc1.4D401E",
-   "avc1.64001E",
-+  "avc1.64001F",
-+  "mp4v.20.3",
-   "mp4a.40.2",
-   nullptr
- };

Modified: trunk/www/firefox/files/patch-bug807492
==============================================================================
--- trunk/www/firefox/files/patch-bug807492	Mon Jan 14 01:55:01 2013	(r1140)
+++ trunk/www/firefox/files/patch-bug807492	Mon Jan 14 01:55:17 2013	(r1141)
@@ -81,11 +81,11 @@
  if test -n "$MOZ_WEBRTC"; then
     AC_MSG_RESULT("generating WebRTC Makefiles...")
  
+ dnl Any --include files must also appear in -D FORCED_INCLUDE_FILE= entries
+ dnl so that regeneration via dependencies works correctly
     WEBRTC_CONFIG="-D build_with_mozilla=1 --include ${srcdir}/media/webrtc/webrtc_config.gypi -D FORCED_INCLUDE_FILE=${srcdir}/media/webrtc/webrtc_config.gypi"
  
     GYP_WEBRTC_OPTIONS="--format=mozmake ${WEBRTC_CONFIG} ${EXTRA_GYP_DEFINES} --depth=${srcdir}/media/webrtc/trunk --toplevel-dir=${srcdir} -G OBJDIR=${_objdir}"
- 
-    $PYTHON ${srcdir}/media/webrtc/trunk/build/gyp_chromium \
 diff --git js/src/config/system-headers js/src/config/system-headers
 index 9bd1efa..1095a01 100644
 --- js/src/config/system-headers
@@ -591,10 +591,10 @@
 index a7c47e1..4f191de 100644
 --- media/webrtc/signaling/src/sipcc/cpr/darwin/cpr_darwin_ipc.c
 +++ media/webrtc/signaling/src/sipcc/cpr/darwin/cpr_darwin_ipc.c
-@@ -352,21 +352,25 @@ cprGetMessage (cprMsgQueue_t msgQueue, b
+@@ -317,21 +317,25 @@ cprGetMessage (cprMsgQueue_t msgQueue, boolean waitForever, void **ppUserData)
  {
      static const char fname[] = "cprGetMessage";
- 	
+ 
      void *buffer = 0;
      cpr_msg_queue_t *msgq;
      cpr_msgq_node_t *node;
@@ -609,12 +609,12 @@
  		int     tz_dsttime;     /* type of dst correction to apply */
  	} tz;
 +#endif
- 	
+ 
      /* Initialize ppUserData */
      if (ppUserData) {
          *ppUserData = NULL;
      }
- 	
+ 
      msgq = (cpr_msg_queue_t *) msgQueue;
      if (msgq == NULL) {
 diff --git media/webrtc/signaling/test/Makefile.in media/webrtc/signaling/test/Makefile.in
@@ -1278,7 +1278,6 @@
 +#include <linux/videodev2.h>
 +#endif
 +
- #include <iostream>
  #include <new>
  
  #include "ref_count.h"
@@ -1286,6 +1285,7 @@
  #include "thread_wrapper.h"
  #include "critical_section_wrapper.h"
  #include "video_capture_linux.h"
+ 
 diff --git media/webrtc/trunk/src/modules/video_capture/main/source/device_info_impl.cc media/webrtc/trunk/src/modules/video_capture/main/source/device_info_impl.cc
 index e3f7bb5..882cede 100644
 --- media/webrtc/trunk/src/modules/video_capture/main/source/device_info_impl.cc

Modified: trunk/www/firefox/files/patch-bug815025
==============================================================================
--- trunk/www/firefox/files/patch-bug815025	Mon Jan 14 01:55:01 2013	(r1140)
+++ trunk/www/firefox/files/patch-bug815025	Mon Jan 14 01:55:17 2013	(r1141)
@@ -1,8 +1,8 @@
 --- mfbt/SHA1.h~
 +++ mfbt/SHA1.h
-@@ -27,6 +27,11 @@
- #include "mozilla/StandardInteger.h"
- #include "mozilla/Types.h"
+@@ -13,6 +13,11 @@
+ 
+ #include <stddef.h>
  
 +#if !defined(__clang__) && defined(__GNUC__) && __GNUC_MINOR__ <= 3
 +/* c++/36107: mark SHA1Sum constructor as weak manually */
@@ -10,18 +10,18 @@
 +#endif
 +
  namespace mozilla {
- class SHA1Sum {
-   union {
-@@ -39,7 +43,12 @@ class SHA1Sum {
  
- public:
-   static const unsigned int HashSize = 20;
+ /**
+@@ -44,7 +49,12 @@ class SHA1Sum
+     bool mDone;
+ 
+   public:
 +#if !defined(__clang__) && defined(__GNUC__) && __GNUC_MINOR__ <= 3
-+  /* c++/36107: gcc42 fails to remove *INTERNAL* from produced asm */
-+  MOZ_IMPORT_API() SHA1Sum();
++    /* c++/36107: gcc42 fails to remove *INTERNAL* from produced asm */
++    MOZ_IMPORT_API SHA1Sum();
 +#else
-   MFBT_API() SHA1Sum();
+     MFBT_API SHA1Sum();
 +#endif
-   MFBT_API(void) update(const void* dataIn, uint32_t len);
-   MFBT_API(void) finish(uint8_t hashout[20]);
- };
+ 
+     static const size_t HashSize = 20;
+     typedef uint8_t Hash[HashSize];

Added: trunk/www/firefox/files/patch-bug817267
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/www/firefox/files/patch-bug817267	Mon Jan 14 01:55:17 2013	(r1141)
@@ -0,0 +1,36 @@
+commit faafeb1
+Author: Jan Beich <jbeich@tormail.org>
+Date:   Sat Dec 1 21:25:24 2012 -0500
+
+    Bug 817267 - dirfd() is a macro on some BSDs, fix build there. r=yoric
+---
+ dom/system/OSFileConstants.cpp | 9 +++++++--
+ 1 file changed, 7 insertions(+), 2 deletions(-)
+
+diff --git dom/system/OSFileConstants.cpp dom/system/OSFileConstants.cpp
+index 75a41dc..63fc6b1 100644
+--- dom/system/OSFileConstants.cpp
++++ dom/system/OSFileConstants.cpp
+@@ -41,6 +41,11 @@
+ #include "OSFileConstants.h"
+ #include "nsIOSFileConstantsService.h"
+ 
++#if defined(__DragonFly__) || defined(__FreeBSD__) \
++  || defined(__NetBSD__) || defined(__OpenBSD__)
++#define __dd_fd dd_fd
++#endif
++
+ /**
+  * This module defines the basic libc constants (error numbers, open modes,
+  * etc.) used by OS.File and possibly other OS-bound JavaScript libraries.
+@@ -383,8 +388,8 @@ static dom::ConstantSpec gLibcProperties[] =
+   { "OSFILE_OFFSETOF_DIRENT_D_TYPE", INT_TO_JSVAL(offsetof (struct dirent, d_type)) },
+ #endif // defined(DT_UNKNOWN)
+ 
+-  // Under MacOS X, |dirfd| is a macro rather than a function, so we
+-  // need a little help to get it to work
++  // Under MacOS X and BSDs, |dirfd| is a macro rather than a
++  // function, so we need a little help to get it to work
+ #if defined(dirfd)
+   { "OSFILE_SIZEOF_DIR", INT_TO_JSVAL(sizeof (DIR)) },
+ 

Copied and modified: trunk/www/firefox/files/patch-content-media-AudioStream.cpp (from r1140, trunk/www/firefox-nightly/files/patch-content-media-nsAudioStream.cpp)
==============================================================================

Deleted: trunk/www/firefox/files/patch-content-media-nsAudioStream.cpp
==============================================================================
--- trunk/www/firefox/files/patch-content-media-nsAudioStream.cpp	Mon Jan 14 01:55:17 2013	(r1140)
+++ /dev/null	00:00:00 1970	(deleted)
@@ -1,11 +0,0 @@
---- content/media/nsAudioStream.cpp~
-+++ content/media/nsAudioStream.cpp
-@@ -298,7 +298,7 @@ static int PrefChanged(const char* aPref, void* aClosure)
-       gVolumeScale = NS_MAX<double>(0, PR_strtod(utf8.get(), nullptr));
-     }
-   } else if (strcmp(aPref, PREF_USE_CUBEB) == 0) {
--#ifdef MOZ_WIDGET_GONK
-+#if defined(MOZ_WIDGET_GONK) || defined(__FreeBSD__) && __FreeBSD_version < 800097
-     bool value = Preferences::GetBool(aPref, false);
- #else
-     bool value = Preferences::GetBool(aPref, true);

Added: trunk/www/firefox/files/patch-gfx-ots-include-opentype-sanitiser.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/www/firefox/files/patch-gfx-ots-include-opentype-sanitiser.h	Mon Jan 14 01:55:17 2013	(r1141)
@@ -0,0 +1,18 @@
+diff --git gfx/ots/include/opentype-sanitiser.h gfx/ots/include/opentype-sanitiser.h
+index f42822e..1a5a699 100644
+--- gfx/ots/include/opentype-sanitiser.h
++++ gfx/ots/include/opentype-sanitiser.h
+@@ -44,6 +44,13 @@ typedef unsigned __int64 uint64_t;
+ #include <stdint.h>
+ #endif
+ 
++#ifdef __FreeBSD__
++# include <osreldate.h>
++# if __FreeBSD_version < 800067
++#  include <sys/types.h> // for off_t
++# endif
++#endif
++
+ #include <algorithm>  // for std::min
+ #include <cassert>
+ #include <cstddef>

Modified: trunk/www/firefox/files/patch-ipc-chromium-src-base-message_pump_libevent.cc
==============================================================================
--- trunk/www/firefox/files/patch-ipc-chromium-src-base-message_pump_libevent.cc	Mon Jan 14 01:55:01 2013	(r1140)
+++ trunk/www/firefox/files/patch-ipc-chromium-src-base-message_pump_libevent.cc	Mon Jan 14 01:55:17 2013	(r1141)
@@ -1,9 +1,9 @@
 --- ipc/chromium/src/base/message_pump_libevent.cc~
 +++ ipc/chromium/src/base/message_pump_libevent.cc
-@@ -15,7 +15,7 @@
- #include "base/scoped_nsautorelease_pool.h"
+@@ -16,7 +16,7 @@
  #include "base/scoped_ptr.h"
  #include "base/time.h"
+ #include "nsDependentSubstring.h"
 -#include "third_party/libevent/event.h"
 +#include "event.h"
  

Deleted: trunk/www/firefox/files/patch-xpcom-base-AvailableMemoryTracker.cpp
==============================================================================
--- trunk/www/firefox/files/patch-xpcom-base-AvailableMemoryTracker.cpp	Mon Jan 14 01:55:17 2013	(r1140)
+++ /dev/null	00:00:00 1970	(deleted)
@@ -1,10 +0,0 @@
---- xpcom/base/AvailableMemoryTracker.cpp~
-+++ xpcom/base/AvailableMemoryTracker.cpp
-@@ -499,6 +499,6 @@ nsJemallocFreeDirtyPagesRunnable::Run()
-   MOZ_ASSERT(NS_IsMainThread());
- 
- #if defined(MOZ_JEMALLOC)
--  mallctl("arenas.purge", nullptr, 0, nullptr, 0);
-+//  mallctl("arenas.purge", nullptr, 0, nullptr, 0);
- #elif defined(MOZ_MEMORY)
-   jemalloc_free_dirty_pages();

Deleted: trunk/www/firefox/files/patch-z-bug762445
==============================================================================
--- trunk/www/firefox/files/patch-z-bug762445	Mon Jan 14 01:55:17 2013	(r1140)
+++ /dev/null	00:00:00 1970	(deleted)
@@ -1,70 +0,0 @@
-commit b44dc8e
-Author: Jan Beich <jbeich@tormail.org>
-Date:   Fri Oct 12 18:49:59 2012 +0000
-
-    Bug 762445 - Add jemalloc3 glue for heap-committed, heap-dirty in about:memory.
----
- memory/build/mozjemalloc_compat.c | 34 ++++++++++++++++++++++++++++------
- 1 file changed, 28 insertions(+), 6 deletions(-)
-
-diff --git memory/build/mozjemalloc_compat.c memory/build/mozjemalloc_compat.c
-index 94ad96e..7adfef5 100644
---- memory/build/mozjemalloc_compat.c
-+++ memory/build/mozjemalloc_compat.c
-@@ -11,15 +11,50 @@
- #define wrap(a) je_ ## a
- #endif
- 
--extern MOZ_IMPORT_API(int)
-+/*
-+ *  CTL_* macros are from memory/jemalloc/src/src/stats.c with changes:
-+ *  - drop `t' argument to avoid redundancy in calculating type size
-+ *  - require `i' argument for arena number explicitly
-+ */
-+
-+#define	CTL_GET(n, v) do {						\
-+	size_t sz = sizeof(v);						\
-+	wrap(mallctl)(n, &v, &sz, NULL, 0);				\
-+} while (0)
-+
-+#define	CTL_I_GET(n, v, i) do {						\
-+	size_t mib[6];							\
-+	size_t miblen = sizeof(mib) / sizeof(mib[0]);			\
-+	size_t sz = sizeof(v);						\
-+	wrap(mallctlnametomib)(n, mib, &miblen);			\
-+	mib[2] = i;							\
-+	wrap(mallctlbymib)(mib, miblen, &v, &sz, NULL, 0);		\
-+} while (0)
-+
-+MOZ_IMPORT_API(int)
- wrap(mallctl)(const char*, void*, size_t*, void*, size_t);
-+MOZ_IMPORT_API(int)
-+wrap(mallctlnametomib)(const char *name, size_t *mibp, size_t *miblenp);
-+MOZ_IMPORT_API(int)
-+wrap(mallctlbymib)(const size_t *mib, size_t miblen, void *oldp, size_t *oldlenp, void *newp, size_t newlen);
- 
- MOZ_EXPORT_API(void)
- jemalloc_stats(jemalloc_stats_t *stats)
- {
--  size_t size = sizeof(stats->mapped);
--  wrap(mallctl)("stats.mapped", &stats->mapped, &size, NULL, 0);
--  wrap(mallctl)("stats.allocated", &stats->allocated, &size, NULL, 0);
--  stats->committed = -1;
--  stats->dirty = -1;
-+  unsigned narenas;
-+  size_t active, allocated, mapped, page, pdirty;
-+
-+  CTL_GET("arenas.narenas", narenas);
-+  CTL_GET("arenas.page", page);
-+  CTL_GET("stats.active", active);
-+  CTL_GET("stats.allocated", allocated);
-+  CTL_GET("stats.mapped", mapped);
-+
-+  /* get the summation for all arenas, i == narenas */
-+  CTL_I_GET("stats.arenas.0.pdirty", pdirty, narenas);
-+
-+  stats->allocated = allocated;
-+  stats->mapped = mapped;
-+  stats->dirty = pdirty * page;
-+  stats->committed = active + stats->dirty;
- }

Modified: trunk/www/seamonkey/Makefile
==============================================================================
--- trunk/www/seamonkey/Makefile	Mon Jan 14 01:55:01 2013	(r1140)
+++ trunk/www/seamonkey/Makefile	Mon Jan 14 01:55:17 2013	(r1141)
@@ -2,7 +2,7 @@
 # $FreeBSD: head/www/seamonkey/Makefile 310240 2013-01-11 16:48:10Z flo $
 
 PORTNAME=	seamonkey
-DISTVERSION=	2.15
+DISTVERSION=	2.16b1
 CATEGORIES?=	www ipv6
 MASTER_SITES=	${MASTER_SITE_MOZILLA_EXTENDED}
 MASTER_SITE_SUBDIR=	seamonkey/releases/${DISTVERSION}/source
@@ -12,13 +12,14 @@
 MAINTAINER=	gecko@FreeBSD.org
 COMMENT=	The open source, standards compliant web browser
 
-BUILD_DEPENDS=	nspr>=4.9.3:${PORTSDIR}/devel/nspr \
+BUILD_DEPENDS=	nspr>=4.9.4:${PORTSDIR}/devel/nspr \
 		nss>=3.14.1:${PORTSDIR}/security/nss \
 		sqlite3>=3.7.14.1:${PORTSDIR}/databases/sqlite3 \
 		${PYTHON_SITELIBDIR}/_sqlite3.so:${PORTSDIR}/databases/py-sqlite3 \
 		unzip:${PORTSDIR}/archivers/unzip
 
 EM_VERSION=	1.5.0
+L_VERSION=	2.1b1
 
 USE_AUTOTOOLS=	autoconf213:env
 USE_PYTHON_BUILD=-2.7
@@ -65,7 +66,7 @@
 
 .include <bsd.port.pre.mk>
 
-WRKSRC=		${WRKDIR}/comm-release
+WRKSRC=		${WRKDIR}/comm-beta
 MOZSRC:=	${WRKSRC}/mozilla
 
 XPI_LIBDIR=	${PREFIX}/lib/xpi
@@ -116,7 +117,7 @@
 MOZ_OPTIONS+=	--enable-calendar
 MOZ_MK_OPTIONS+=	MOZ_CO_PROJECT=calendar
 LIGHTNING_DIR=	share/lightning
-XPI_FILE=	${MOZ_OBJDIR}/mozilla/dist/xpi-stage/lightning.xpi
+XPI_FILE=	${MOZ_OBJDIR}/mozilla/dist/xpi-stage/lightning-${L_VERSION}.en-US.freebsd${OSREL}-${ARCH:S/amd64/x86_64/}.xpi
 XPI_ORIG_ID=	{e2fda1a4-762b-4020-b5ad-a41df1933103}
 XPI_ID=		lightning@seamonkey.mozilla.org
 .else

Modified: trunk/www/seamonkey/distinfo
==============================================================================
--- trunk/www/seamonkey/distinfo	Mon Jan 14 01:55:01 2013	(r1140)
+++ trunk/www/seamonkey/distinfo	Mon Jan 14 01:55:17 2013	(r1141)
@@ -1,4 +1,4 @@
-SHA256 (seamonkey-2.15.source.tar.bz2) = 29ef839f30bb5998cc60adfe16b2e5e64abc14e48cbf10dff98b5b3a5260f5c7
-SIZE (seamonkey-2.15.source.tar.bz2) = 120128259
+SHA256 (seamonkey-2.16b1.source.tar.bz2) = 4feabd38674595c839e689142106bb1428dcdc1d5575e02ad5375039e1d047e7
+SIZE (seamonkey-2.16b1.source.tar.bz2) = 122349139
 SHA256 (enigmail-1.5.0.tar.gz) = 51f55573448586718c8d7e664329d519b02c4b28af4910bcb550961ace9a9e71
 SIZE (enigmail-1.5.0.tar.gz) = 1216071

Modified: trunk/www/seamonkey/files/patch-bug685258
==============================================================================
--- trunk/www/seamonkey/files/patch-bug685258	Mon Jan 14 01:55:01 2013	(r1140)
+++ trunk/www/seamonkey/files/patch-bug685258	Mon Jan 14 01:55:17 2013	(r1141)
@@ -3,9 +3,9 @@
 # Parent a2291c212856ad27622416e83c8311b6a33b52f1
 Bug 685258 - Pulse audio backend does not check provided playback and crashes r=derf
 
-diff --git a/content/media/nsAudioStream.cpp b/content/media/nsAudioStream.cpp
---- mozilla/content/media/nsAudioStream.cpp
-+++ mozilla/content/media/nsAudioStream.cpp
+diff --git a/content/media/AudioStream.cpp b/content/media/AudioStream.cpp
+--- mozilla/content/media/AudioStream.cpp
++++ mozilla/content/media/AudioStream.cpp
 @@ -429,7 +429,7 @@ nsresult nsNativeAudioStream::Init(PRInt32 aNumChannels, PRInt32 aRate, SampleFo
    mFormat = aFormat;
  

Deleted: trunk/www/seamonkey/files/patch-bug778078
==============================================================================
--- trunk/www/seamonkey/files/patch-bug778078	Mon Jan 14 01:55:17 2013	(r1140)
+++ /dev/null	00:00:00 1970	(deleted)
@@ -1,11 +0,0 @@
---- mozilla/toolkit/xre/nsAppRunner.cpp~
-+++ mozilla/toolkit/xre/nsAppRunner.cpp
-@@ -3833,7 +3833,7 @@ XREMain::XRE_main(int argc, char* argv[]
-   ScopedLogging log;
- 
- #if defined(MOZ_WIDGET_GTK)
--#ifdef MOZ_MEMORY
-+#if defined(MOZ_MEMORY) || defined(__FreeBSD__) || defined(__NetBSD__)
-   // Disable the slice allocator, since jemalloc already uses similar layout
-   // algorithms, and using a sub-allocator tends to increase fragmentation.
-   // This must be done before g_thread_init() is called.

Deleted: trunk/www/seamonkey/files/patch-bug788955
==============================================================================
--- trunk/www/seamonkey/files/patch-bug788955	Mon Jan 14 01:55:17 2013	(r1140)
+++ /dev/null	00:00:00 1970	(deleted)
@@ -1,299 +0,0 @@
-diff --git Makefile.in Makefile.in
-index e341462..f75bd55 100644
---- mozilla/Makefile.in
-+++ mozilla/Makefile.in
-@@ -48,8 +48,10 @@ endif
- ifdef MOZ_MEMORY
- tier_base_dirs += memory/mozjemalloc
- ifdef MOZ_JEMALLOC
-+ifndef MOZ_NATIVE_JEMALLOC
- tier_base_dirs += memory/jemalloc
- endif
-+endif
- tier_base_dirs += memory/build
- endif
- ifndef MOZ_NATIVE_ZLIB
-diff --git allmakefiles.sh allmakefiles.sh
-index 6a9be4b..d2e49e3 100755
---- mozilla/allmakefiles.sh
-+++ mozilla/allmakefiles.sh
-@@ -59,7 +59,7 @@ if [ ! "$LIBXUL_SDK" ]; then
-     mozglue/Makefile
-     mozglue/build/Makefile
-   "
--  if [ "$MOZ_JEMALLOC" ]; then
-+  if [ "$MOZ_JEMALLOC" -a -z "$MOZ_NATIVE_JEMALLOC" ]; then
-     add_makefiles "
-       memory/jemalloc/Makefile
-     "
-diff --git configure.in configure.in
-index bb05782..2f32516 100644
---- mozilla/configure.in
-+++ mozilla/configure.in
-@@ -3711,21 +3711,22 @@ fi
- 
- dnl Check for the existence of various allocation headers/functions
- 
-+MALLOC_HEADERS="malloc.h malloc_np.h malloc/malloc.h sys/malloc.h"
- MALLOC_H=
--MOZ_CHECK_HEADER(malloc.h,        [MALLOC_H=malloc.h])
--if test "$MALLOC_H" = ""; then
--  MOZ_CHECK_HEADER(malloc/malloc.h, [MALLOC_H=malloc/malloc.h])
--  if test "$MALLOC_H" = ""; then
--    MOZ_CHECK_HEADER(sys/malloc.h,    [MALLOC_H=sys/malloc.h])
-+
-+for file in $MALLOC_HEADERS; do
-+  MOZ_CHECK_HEADER($file, [MALLOC_H=$file])
-+  if test "$MALLOC_H" != ""; then
-+    AC_DEFINE_UNQUOTED(MALLOC_H, <$MALLOC_H>)
-+    break
-   fi
--fi
--if test "$MALLOC_H" != ""; then
--   AC_DEFINE_UNQUOTED(MALLOC_H, <$MALLOC_H>)
--fi
-+done
- 
- MOZ_ALLOCATING_FUNCS="strndup posix_memalign memalign valloc"
- AC_CHECK_FUNCS(strndup posix_memalign memalign valloc)
- 
-+AC_CHECK_FUNCS(malloc_usable_size)
-+
- dnl See if compiler supports some gcc-style attributes
- 
- AC_CACHE_CHECK(for __attribute__((always_inline)),
-@@ -6939,6 +6940,18 @@ else
- fi
- 
- if test -z "$MOZ_MEMORY"; then
-+  if test -n "$MOZ_JEMALLOC"; then
-+    MOZ_NATIVE_JEMALLOC=1
-+    AC_CHECK_FUNCS(mallctl nallocm,,
-+      [MOZ_NATIVE_JEMALLOC=
-+       break])
-+    if test -n "$MOZ_NATIVE_JEMALLOC"; then
-+      MOZ_MEMORY=1
-+      AC_DEFINE(MOZ_MEMORY)
-+      AC_DEFINE(MOZ_JEMALLOC)
-+      AC_DEFINE(MOZ_NATIVE_JEMALLOC)
-+    fi
-+  fi
-   case "${target}" in
-     *-mingw*)
-       if test -z "$WIN32_REDIST_DIR" -a -z "$MOZ_DEBUG"; then
-@@ -7033,6 +7046,7 @@ else
- fi # MOZ_MEMORY
- AC_SUBST(MOZ_MEMORY)
- AC_SUBST(MOZ_JEMALLOC)
-+AC_SUBST(MOZ_NATIVE_JEMALLOC)
- AC_SUBST(MOZ_GLUE_LDFLAGS)
- AC_SUBST(MOZ_GLUE_PROGRAM_LDFLAGS)
- AC_SUBST(WIN32_CRT_LIBS)
-@@ -8820,10 +8834,22 @@ fi
- 
- # Run jemalloc configure script
- 
--if test "$MOZ_JEMALLOC" -a "$MOZ_MEMORY"; then
-+if test -z "$MOZ_NATIVE_JEMALLOC" -a "$MOZ_JEMALLOC" -a "$MOZ_MEMORY" ; then
-   ac_configure_args="$_SUBDIR_CONFIG_ARGS --build=$build --host=$target --enable-stats --with-jemalloc-prefix=je_"
--  if test "$OS_ARCH" = "Linux"; then
--    MANGLE="malloc calloc valloc free realloc memalign posix_memalign malloc_usable_size"
-+  case "$OS_ARCH" in
-+    Linux|DragonFly|FreeBSD|NetBSD|OpenBSD)
-+      MANGLE="malloc calloc valloc free realloc posix_memalign"
-+      case "$OS_ARCH" in
-+        Linux)
-+          MANGLE="$MANGLE memalign malloc_usable_size"
-+          ;;
-+        FreeBSD)
-+          MANGLE="$MANGLE malloc_usable_size"
-+          ;;
-+      esac
-+      ;;
-+  esac
-+  if test -n "$MANGLE"; then
-     MANGLED=
-     JEMALLOC_WRAPPER=
-     if test -n "$_WRAP_MALLOC"; then
-diff --git memory/build/Makefile.in memory/build/Makefile.in
-index dca0f48..af93ee0 100644
---- mozilla/memory/build/Makefile.in
-+++ mozilla/memory/build/Makefile.in
-@@ -22,7 +22,9 @@ CSRCS = extraMallocFuncs.c
- 
- ifdef MOZ_JEMALLOC
- CSRCS += mozjemalloc_compat.c
-+ifndef MOZ_NATIVE_JEMALLOC
- SHARED_LIBRARY_LIBS += $(call EXPAND_LIBNAME_PATH,jemalloc,$(DEPTH)/memory/jemalloc)
-+endif
- else
- SHARED_LIBRARY_LIBS += $(call EXPAND_LIBNAME_PATH,jemalloc,$(DEPTH)/memory/mozjemalloc)
- endif
-diff --git memory/build/extraMallocFuncs.c memory/build/extraMallocFuncs.c
-index 9d87629..03c8320 100644
---- mozilla/memory/build/extraMallocFuncs.c
-+++ mozilla/memory/build/extraMallocFuncs.c
-@@ -94,8 +94,16 @@ wrap(wcsdup)(const wchar_t *src)
- #endif
- 
- #ifdef MOZ_JEMALLOC
-+
-+#undef wrap
-+#if defined(MOZ_NATIVE_JEMALLOC)
-+#define wrap(a) a
-+#else
-+#define wrap(a) je_ ## a
-+#endif
-+
- /* Override some jemalloc defaults */
--const char *je_malloc_conf = "narenas:1,lg_chunk:20";
-+MOZ_EXPORT_DATA(const char *) wrap(malloc_conf) = "narenas:1,lg_chunk:20";
- 
- #ifdef ANDROID
- #include <android/log.h>
-diff --git memory/build/mozjemalloc_compat.c memory/build/mozjemalloc_compat.c
-index 10a845a..94ad96e 100644
---- mozilla/memory/build/mozjemalloc_compat.c
-+++ mozilla/memory/build/mozjemalloc_compat.c
-@@ -5,14 +5,21 @@
- #include "mozilla/Types.h"
- #include "jemalloc_types.h"
- 
--extern int je_mallctl(const char*, void*, size_t*, void*, size_t);
-+#if defined(MOZ_NATIVE_JEMALLOC)
-+#define wrap(a) a
-+#else
-+#define wrap(a) je_ ## a
-+#endif
- 
--MOZ_EXPORT_API (void)
-+extern MOZ_IMPORT_API(int)
-+wrap(mallctl)(const char*, void*, size_t*, void*, size_t);
-+
-+MOZ_EXPORT_API(void)
- jemalloc_stats(jemalloc_stats_t *stats)
- {
-   size_t size = sizeof(stats->mapped);
--  je_mallctl("stats.mapped", &stats->mapped, &size, NULL, 0);
--  je_mallctl("stats.allocated", &stats->allocated, &size, NULL, 0);
-+  wrap(mallctl)("stats.mapped", &stats->mapped, &size, NULL, 0);
-+  wrap(mallctl)("stats.allocated", &stats->allocated, &size, NULL, 0);
-   stats->committed = -1;
-   stats->dirty = -1;
- }
-diff --git memory/jemalloc/src/src/mutex.c memory/jemalloc/src/src/mutex.c
-index 37a843e..55e18c2 100644
---- mozilla/memory/jemalloc/src/src/mutex.c
-+++ mozilla/memory/jemalloc/src/src/mutex.c
-@@ -64,7 +64,7 @@ pthread_create(pthread_t *__restrict thread,
- /******************************************************************************/
- 
- #ifdef JEMALLOC_MUTEX_INIT_CB
--int	_pthread_mutex_init_calloc_cb(pthread_mutex_t *mutex,
-+JEMALLOC_EXPORT int	_pthread_mutex_init_calloc_cb(pthread_mutex_t *mutex,
-     void *(calloc_cb)(size_t, size_t));
- #endif
- 
-diff --git memory/mozalloc/mozalloc.cpp memory/mozalloc/mozalloc.cpp
-index 5b61050b..5b3399a 100644
---- mozilla/memory/mozalloc/mozalloc.cpp
-+++ mozilla/memory/mozalloc/mozalloc.cpp
-@@ -12,16 +12,13 @@
- #include <sys/types.h>
- 
- #if defined(MALLOC_H)
--#  include MALLOC_H             // for memalign, valloc where available
-+#  include MALLOC_H             // for memalign, valloc, malloc_size, malloc_usable_size
- #endif // if defined(MALLOC_H)
- #include <stddef.h>             // for size_t
- #include <stdlib.h>             // for malloc, free
- #if defined(XP_UNIX)
- #  include <unistd.h>           // for valloc on *BSD
- #endif //if defined(XP_UNIX)
--#if defined(__FreeBSD__)
--#  include <malloc_np.h>        // for malloc_usable_size
--#endif // if defined(__FreeBSD__)
- 
- #if defined(XP_WIN) || (defined(XP_OS2) && defined(__declspec))
- #  define MOZALLOC_EXPORT __declspec(dllexport)
-@@ -213,8 +210,7 @@ moz_malloc_usable_size(void *ptr)
- 
- #if defined(XP_MACOSX)
-     return malloc_size(ptr);
--#elif defined(MOZ_MEMORY) || (defined(XP_LINUX) && !defined(ANDROID)) || defined(__FreeBSD__)
--    // Android bionic libc doesn't have malloc_usable_size.
-+#elif defined(HAVE_MALLOC_USABLE_SIZE) || defined(MOZ_MEMORY)
-     return malloc_usable_size(ptr);
- #elif defined(XP_WIN)
-     return _msize(ptr);
-diff --git memory/mozjemalloc/jemalloc.h memory/mozjemalloc/jemalloc.h
-index f0e0878..2486e83 100644
---- mozilla/memory/mozjemalloc/jemalloc.h
-+++ mozilla/memory/mozjemalloc/jemalloc.h
-@@ -37,22 +37,29 @@
- #endif
- #include "jemalloc_types.h"
- 
-+#if defined(MOZ_NATIVE_JEMALLOC)
-+#define wrap(a) a
-+#else
-+#define wrap(a) je_ ## a
-+#endif
-+
- #ifdef __cplusplus
- extern "C" {
- #endif
- 
--#if defined(MOZ_MEMORY_LINUX)
-+#if defined(MOZ_NATIVE_JEMALLOC) \
-+  || defined(MOZ_MEMORY_LINUX) || defined(MOZ_MEMORY_BSD)
- __attribute__((weak))
- #endif
- void	jemalloc_stats(jemalloc_stats_t *stats);
- 
- /* Computes the usable size in advance. */
- #if !defined(MOZ_MEMORY_DARWIN)
--#if defined(MOZ_MEMORY_LINUX)
-+#if defined(MOZ_MEMORY_LINUX) || defined(MOZ_MEMORY_BSD)
- __attribute__((weak))
- #endif
- #if defined(MOZ_JEMALLOC)
--int je_nallocm(size_t *rsize, size_t size, int flags);
-+MOZ_IMPORT_API(int) wrap(nallocm)(size_t *rsize, size_t size, int flags);
- #else
- size_t je_malloc_good_size(size_t size);
- #endif
-@@ -62,11 +69,11 @@ static inline size_t je_malloc_usable_size_in_advance(size_t size) {
- #if defined(MOZ_MEMORY_DARWIN)
-   return malloc_good_size(size);
- #elif defined(MOZ_JEMALLOC)
--  if (je_nallocm) {
-+  if (wrap(nallocm)) {
-     size_t ret;
-     if (size == 0)
-       size = 1;
--    if (!je_nallocm(&ret, size, 0))
-+    if (!wrap(nallocm)(&ret, size, 0))
-       return ret;
-   }
-   return size;
-@@ -113,4 +120,6 @@ void    jemalloc_purge_freed_pages();
- } /* extern "C" */
- #endif
- 
-+#undef wrap
-+
- #endif /* _JEMALLOC_H_ */
-diff --git mozglue/build/Makefile.in mozglue/build/Makefile.in
-index c333647..15ba505 100644
---- mozilla/mozglue/build/Makefile.in
-+++ mozilla/mozglue/build/Makefile.in
-@@ -23,7 +23,7 @@ FORCE_STATIC_LIB = 1
- endif
- 
- # Keep jemalloc separated when mozglue is statically linked
--ifeq (1_1,$(MOZ_MEMORY)_$(FORCE_SHARED_LIB))
-+ifeq (1_1,$(MOZ_MEMORY)_$(or $(MOZ_NATIVE_JEMALLOC),$(FORCE_SHARED_LIB)))
- SHARED_LIBRARY_LIBS = $(call EXPAND_LIBNAME_PATH,memory,$(DEPTH)/memory/build)
- else
- # Temporary, until bug 662814 lands

Modified: trunk/www/seamonkey/files/patch-bug791305
==============================================================================
--- trunk/www/seamonkey/files/patch-bug791305	Mon Jan 14 01:55:01 2013	(r1140)
+++ trunk/www/seamonkey/files/patch-bug791305	Mon Jan 14 01:55:17 2013	(r1141)
@@ -17,6 +17,23 @@
 
 diff --git configure.in configure.in
 index f0aeb5d..1c01010 100644
+--- configure.in
++++ configure.in
+@@ -4027,11 +4027,7 @@ if test "$MOZ_NATIVE_JPEG" = 1; then
+                      #include <jpeglib.h> ],
+                    [ #if JPEG_LIB_VERSION < $MOZJPEG
+                      #error "Insufficient JPEG library version ($MOZJPEG required)."
+-                     #endif
+-                     #ifndef JCS_EXTENSIONS
+-                     #error "libjpeg-turbo JCS_EXTENSIONS required"
+-                     #endif
+-                     ],
++                     #endif ],
+                    MOZ_NATIVE_JPEG=1,
+                    AC_MSG_ERROR([Insufficient JPEG library version for --with-system-jpeg]))
+ fi
+diff --git configure.in configure.in
+index f0aeb5d..1c01010 100644
 --- mozilla/configure.in
 +++ mozilla/configure.in
 @@ -4027,11 +4027,7 @@ if test "$MOZ_NATIVE_JPEG" = 1; then

Deleted: trunk/www/seamonkey/files/patch-bug798354
==============================================================================
--- trunk/www/seamonkey/files/patch-bug798354	Mon Jan 14 01:55:17 2013	(r1140)
+++ /dev/null	00:00:00 1970	(deleted)
@@ -1,15 +0,0 @@
---- mozilla/ipc/chromium/src/chrome/common/ipc_channel_posix.cc~
-+++ mozilla/ipc/chromium/src/chrome/common/ipc_channel_posix.cc
-@@ -133,7 +133,12 @@ int ChannelNameToClientFD(const std::string& channel_id) {
- }
- 
- //------------------------------------------------------------------------------
-+#if !defined(__clang__) && defined(__GNUC__) && __GNUC_MINOR__ <= 2
-+sockaddr_un sizecheck;
-+const size_t kMaxPipeNameLength = sizeof(sizecheck.sun_path);
-+#else
- const size_t kMaxPipeNameLength = sizeof(sockaddr_un::sun_path);
-+#endif
- 
- // Creates a Fifo with the specified name ready to listen on.
- bool CreateServerFifo(const std::string& pipe_name, int* server_listen_fd) {

Deleted: trunk/www/seamonkey/files/patch-bug800401
==============================================================================
--- trunk/www/seamonkey/files/patch-bug800401	Mon Jan 14 01:55:17 2013	(r1140)
+++ /dev/null	00:00:00 1970	(deleted)
@@ -1,91 +0,0 @@
-commit a564d64
-Author: Ehsan Akhgari <ehsan@mozilla.com>
-Date:   Thu Oct 11 13:42:12 2012 -0400
-
-    Bug 800401 - Make sure that the WebRTC build system does not impose the -Werror flag on all Linux/Mac builds; r=jesup
-    
-    In the future, we need to hook these up to the FAIL_ON_WARNINGS machinery.
----
- media/mtransport/third_party/nICEr/nicer.gyp       | 2 --
- media/mtransport/third_party/nrappkit/nrappkit.gyp | 2 --
- media/webrtc/signaling/signaling.gyp               | 6 ------
- 3 files changed, 10 deletions(-)
-
-diff --git media/mtransport/third_party/nICEr/nicer.gyp media/mtransport/third_party/nICEr/nicer.gyp
-index 26ec0c5..0e1f8b4 100644
---- mozilla/media/mtransport/third_party/nICEr/nicer.gyp
-+++ mozilla/media/mtransport/third_party/nICEr/nicer.gyp
-@@ -132,7 +132,6 @@
-               ## Mac
-               [ 'OS == "mac"', {
-                 'cflags_mozilla': [
--                    '-Werror',
-                     '-Wall',
-                     '-Wno-parentheses',
-                     '-Wno-strict-prototypes',
-@@ -183,7 +182,6 @@
-               ## Linux
-               [ 'OS == "linux"', {
-                 'cflags': [
--                    '-Werror',
-                     '-Wall',
-                     '-Wno-parentheses',
-                     '-Wno-strict-prototypes',
-diff --git media/mtransport/third_party/nrappkit/nrappkit.gyp media/mtransport/third_party/nrappkit/nrappkit.gyp
-index f9a5c19..3cc8e1c 100644
---- mozilla/media/mtransport/third_party/nrappkit/nrappkit.gyp
-+++ mozilla/media/mtransport/third_party/nrappkit/nrappkit.gyp
-@@ -150,7 +150,6 @@
-               ## Mac
-               [ 'OS == "mac"', {
-                 'cflags_mozilla': [
--                    '-Werror',
-                     '-Wall',
-                     '-Wno-parentheses',
-                     '-Wno-strict-prototypes',
-@@ -200,7 +199,6 @@
-               ## Linux
-               [ 'OS == "linux"', {
-                 'cflags': [
--                    '-Werror',
-                     '-Wall',
-                     '-Wno-parentheses',
-                     '-Wno-strict-prototypes',
-diff --git media/webrtc/signaling/signaling.gyp media/webrtc/signaling/signaling.gyp
-index 1ec0ee2..175996f 100644
---- mozilla/media/webrtc/signaling/signaling.gyp
-+++ mozilla/media/webrtc/signaling/signaling.gyp
-@@ -184,7 +184,6 @@
-           ],
-           
-           'cflags_mozilla': [
--            '-Werror',
-           ],
-         }],
-         ['OS=="win"', {
-@@ -212,8 +211,6 @@
-           ],
-           
-           'cflags_mozilla': [
--            '-Werror',
--            '-Wno-error=conversion'
-           ],
-         }],
-       ],
-@@ -633,7 +630,6 @@
-           ],
- 
-           'cflags_mozilla': [
--            '-Werror',
-           ],
-         }],
-         ['OS=="win"', {
-@@ -752,8 +748,6 @@
-           ],
-           
-           'cflags_mozilla': [
--            '-Werror',
--            '-Wno-error=conversion'
-           ],
-         }],
-       ],

Deleted: trunk/www/seamonkey/files/patch-bug806139
==============================================================================
--- trunk/www/seamonkey/files/patch-bug806139	Mon Jan 14 01:55:17 2013	(r1140)
+++ /dev/null	00:00:00 1970	(deleted)
@@ -1,29 +0,0 @@
---- mozilla/content/html/content/public/nsHTMLMediaElement.h~
-+++ mozilla/content/html/content/public/nsHTMLMediaElement.h
-@@ -311,7 +311,7 @@ public:
-   static bool IsH264Enabled();
-   static bool IsH264Type(const nsACString& aType);
-   static const char gH264Types[3][16];
--  static char const *const gH264Codecs[7];
-+  static char const *const gH264Codecs[9];
- #endif
- 
- #ifdef MOZ_MEDIA_PLUGINS
---- mozilla/content/html/content/src/nsHTMLMediaElement.cpp~
-+++ mozilla/content/html/content/src/nsHTMLMediaElement.cpp
-@@ -2135,12 +2135,14 @@ nsHTMLMediaElement::IsWebMType(const nsA
- #endif
- 
- #if defined(MOZ_GSTREAMER) || defined(MOZ_WIDGET_GONK)
--char const *const nsHTMLMediaElement::gH264Codecs[7] = {
-+char const *const nsHTMLMediaElement::gH264Codecs[9] = {
-   "avc1.42E01E",
-   "avc1.42001E",
-   "avc1.58A01E",
-   "avc1.4D401E",
-   "avc1.64001E",
-+  "avc1.64001F",
-+  "mp4v.20.3",
-   "mp4a.40.2",
-   nullptr
- };

Modified: trunk/www/seamonkey/files/patch-bug807492
==============================================================================
--- trunk/www/seamonkey/files/patch-bug807492	Mon Jan 14 01:55:01 2013	(r1140)
+++ trunk/www/seamonkey/files/patch-bug807492	Mon Jan 14 01:55:17 2013	(r1141)
@@ -81,11 +81,11 @@
  if test -n "$MOZ_WEBRTC"; then
     AC_MSG_RESULT("generating WebRTC Makefiles...")
  
+ dnl Any --include files must also appear in -D FORCED_INCLUDE_FILE= entries
+ dnl so that regeneration via dependencies works correctly
     WEBRTC_CONFIG="-D build_with_mozilla=1 --include ${srcdir}/media/webrtc/webrtc_config.gypi -D FORCED_INCLUDE_FILE=${srcdir}/media/webrtc/webrtc_config.gypi"
  
     GYP_WEBRTC_OPTIONS="--format=mozmake ${WEBRTC_CONFIG} ${EXTRA_GYP_DEFINES} --depth=${srcdir}/media/webrtc/trunk --toplevel-dir=${srcdir} -G OBJDIR=${_objdir}"
- 
-    $PYTHON ${srcdir}/media/webrtc/trunk/build/gyp_chromium \
 diff --git js/src/config/system-headers js/src/config/system-headers
 index 9bd1efa..1095a01 100644
 --- mozilla/js/src/config/system-headers
@@ -591,10 +591,10 @@
 index a7c47e1..4f191de 100644
 --- mozilla/media/webrtc/signaling/src/sipcc/cpr/darwin/cpr_darwin_ipc.c
 +++ mozilla/media/webrtc/signaling/src/sipcc/cpr/darwin/cpr_darwin_ipc.c
-@@ -352,21 +352,25 @@ cprGetMessage (cprMsgQueue_t msgQueue, b
+@@ -317,21 +317,25 @@ cprGetMessage (cprMsgQueue_t msgQueue, boolean waitForever, void **ppUserData)
  {
      static const char fname[] = "cprGetMessage";
- 	
+ 
      void *buffer = 0;
      cpr_msg_queue_t *msgq;
      cpr_msgq_node_t *node;
@@ -609,12 +609,12 @@
  		int     tz_dsttime;     /* type of dst correction to apply */
  	} tz;
 +#endif
- 	
+ 
      /* Initialize ppUserData */
      if (ppUserData) {
          *ppUserData = NULL;
      }
- 	
+ 
      msgq = (cpr_msg_queue_t *) msgQueue;
      if (msgq == NULL) {
 diff --git media/webrtc/signaling/test/Makefile.in media/webrtc/signaling/test/Makefile.in
@@ -1278,7 +1278,6 @@
 +#include <linux/videodev2.h>
 +#endif
 +
- #include <iostream>
  #include <new>
  
  #include "ref_count.h"
@@ -1286,6 +1285,7 @@
  #include "thread_wrapper.h"
  #include "critical_section_wrapper.h"
  #include "video_capture_linux.h"
+ 
 diff --git media/webrtc/trunk/src/modules/video_capture/main/source/device_info_impl.cc media/webrtc/trunk/src/modules/video_capture/main/source/device_info_impl.cc
 index e3f7bb5..882cede 100644
 --- mozilla/media/webrtc/trunk/src/modules/video_capture/main/source/device_info_impl.cc

Modified: trunk/www/seamonkey/files/patch-bug815025
==============================================================================
--- trunk/www/seamonkey/files/patch-bug815025	Mon Jan 14 01:55:01 2013	(r1140)
+++ trunk/www/seamonkey/files/patch-bug815025	Mon Jan 14 01:55:17 2013	(r1141)
@@ -1,8 +1,8 @@
 --- mozilla/mfbt/SHA1.h~
 +++ mozilla/mfbt/SHA1.h
-@@ -27,6 +27,11 @@
- #include "mozilla/StandardInteger.h"
- #include "mozilla/Types.h"
+@@ -13,6 +13,11 @@
+ 
+ #include <stddef.h>
  
 +#if !defined(__clang__) && defined(__GNUC__) && __GNUC_MINOR__ <= 3
 +/* c++/36107: mark SHA1Sum constructor as weak manually */
@@ -10,18 +10,18 @@
 +#endif
 +
  namespace mozilla {
- class SHA1Sum {
-   union {
-@@ -39,7 +43,12 @@ class SHA1Sum {
  
- public:
-   static const unsigned int HashSize = 20;
+ /**
+@@ -44,7 +49,12 @@ class SHA1Sum
+     bool mDone;
+ 
+   public:
 +#if !defined(__clang__) && defined(__GNUC__) && __GNUC_MINOR__ <= 3
-+  /* c++/36107: gcc42 fails to remove *INTERNAL* from produced asm */
-+  MOZ_IMPORT_API() SHA1Sum();
++    /* c++/36107: gcc42 fails to remove *INTERNAL* from produced asm */
++    MOZ_IMPORT_API SHA1Sum();
 +#else
-   MFBT_API() SHA1Sum();
+     MFBT_API SHA1Sum();
 +#endif
-   MFBT_API(void) update(const void* dataIn, uint32_t len);
-   MFBT_API(void) finish(uint8_t hashout[20]);
- };
+ 
+     static const size_t HashSize = 20;
+     typedef uint8_t Hash[HashSize];

Added: trunk/www/seamonkey/files/patch-bug817267
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/www/seamonkey/files/patch-bug817267	Mon Jan 14 01:55:17 2013	(r1141)
@@ -0,0 +1,36 @@
+commit faafeb1
+Author: Jan Beich <jbeich@tormail.org>
+Date:   Sat Dec 1 21:25:24 2012 -0500
+
+    Bug 817267 - dirfd() is a macro on some BSDs, fix build there. r=yoric
+---
+ dom/system/OSFileConstants.cpp | 9 +++++++--
+ 1 file changed, 7 insertions(+), 2 deletions(-)
+
+diff --git dom/system/OSFileConstants.cpp dom/system/OSFileConstants.cpp
+index 75a41dc..63fc6b1 100644
+--- mozilla/dom/system/OSFileConstants.cpp
++++ mozilla/dom/system/OSFileConstants.cpp
+@@ -41,6 +41,11 @@
+ #include "OSFileConstants.h"
+ #include "nsIOSFileConstantsService.h"
+ 
++#if defined(__DragonFly__) || defined(__FreeBSD__) \
++  || defined(__NetBSD__) || defined(__OpenBSD__)
++#define __dd_fd dd_fd
++#endif
++
+ /**
+  * This module defines the basic libc constants (error numbers, open modes,
+  * etc.) used by OS.File and possibly other OS-bound JavaScript libraries.
+@@ -383,8 +388,8 @@ static dom::ConstantSpec gLibcProperties[] =
+   { "OSFILE_OFFSETOF_DIRENT_D_TYPE", INT_TO_JSVAL(offsetof (struct dirent, d_type)) },
+ #endif // defined(DT_UNKNOWN)
+ 
+-  // Under MacOS X, |dirfd| is a macro rather than a function, so we
+-  // need a little help to get it to work
++  // Under MacOS X and BSDs, |dirfd| is a macro rather than a
++  // function, so we need a little help to get it to work
+ #if defined(dirfd)
+   { "OSFILE_SIZEOF_DIR", INT_TO_JSVAL(sizeof (DIR)) },
+ 

Modified: trunk/www/seamonkey/files/patch-mozilla-content-media-nsAudioStream.cpp
==============================================================================
--- trunk/www/seamonkey/files/patch-mozilla-content-media-nsAudioStream.cpp	Mon Jan 14 01:55:01 2013	(r1140)
+++ trunk/www/seamonkey/files/patch-mozilla-content-media-nsAudioStream.cpp	Mon Jan 14 01:55:17 2013	(r1141)
@@ -1,5 +1,5 @@
---- mozilla/content/media/nsAudioStream.cpp~
-+++ mozilla/content/media/nsAudioStream.cpp
+--- mozilla/content/media/AudioStream.cpp~
++++ mozilla/content/media/AudioStream.cpp
 @@ -298,7 +298,7 @@ static int PrefChanged(const char* aPref, void* aClosure)
        gVolumeScale = NS_MAX<double>(0, PR_strtod(utf8.get(), nullptr));
      }

Added: trunk/www/seamonkey/files/patch-mozilla-gfx-ots-include-opentype-sanitiser.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/www/seamonkey/files/patch-mozilla-gfx-ots-include-opentype-sanitiser.h	Mon Jan 14 01:55:17 2013	(r1141)
@@ -0,0 +1,18 @@
+diff --git gfx/ots/include/opentype-sanitiser.h gfx/ots/include/opentype-sanitiser.h
+index f42822e..1a5a699 100644
+--- mozilla/gfx/ots/include/opentype-sanitiser.h
++++ mozilla/gfx/ots/include/opentype-sanitiser.h
+@@ -44,6 +44,13 @@ typedef unsigned __int64 uint64_t;
+ #include <stdint.h>
+ #endif
+ 
++#ifdef __FreeBSD__
++# include <osreldate.h>
++# if __FreeBSD_version < 800067
++#  include <sys/types.h> // for off_t
++# endif
++#endif
++
+ #include <algorithm>  // for std::min
+ #include <cassert>
+ #include <cstddef>

Modified: trunk/www/seamonkey/files/patch-mozilla-ipc-chromium-src-base-message_pump_libevent.cc
==============================================================================
--- trunk/www/seamonkey/files/patch-mozilla-ipc-chromium-src-base-message_pump_libevent.cc	Mon Jan 14 01:55:01 2013	(r1140)
+++ trunk/www/seamonkey/files/patch-mozilla-ipc-chromium-src-base-message_pump_libevent.cc	Mon Jan 14 01:55:17 2013	(r1141)
@@ -1,9 +1,9 @@
 --- mozilla/ipc/chromium/src/base/message_pump_libevent.cc~
 +++ mozilla/ipc/chromium/src/base/message_pump_libevent.cc
-@@ -15,7 +15,7 @@
- #include "base/scoped_nsautorelease_pool.h"
+@@ -16,7 +16,7 @@
  #include "base/scoped_ptr.h"
  #include "base/time.h"
+ #include "nsDependentSubstring.h"
 -#include "third_party/libevent/event.h"
 +#include "event.h"
  

Deleted: trunk/www/seamonkey/files/patch-mozilla-xpcom-base-AvailableMemoryTracker.cpp
==============================================================================
--- trunk/www/seamonkey/files/patch-mozilla-xpcom-base-AvailableMemoryTracker.cpp	Mon Jan 14 01:55:17 2013	(r1140)
+++ /dev/null	00:00:00 1970	(deleted)
@@ -1,10 +0,0 @@
---- mozilla/xpcom/base/AvailableMemoryTracker.cpp~
-+++ mozilla/xpcom/base/AvailableMemoryTracker.cpp
-@@ -499,6 +499,6 @@ nsJemallocFreeDirtyPagesRunnable::Run()
-   MOZ_ASSERT(NS_IsMainThread());
- 
- #if defined(MOZ_JEMALLOC)
--  mallctl("arenas.purge", nullptr, 0, nullptr, 0);
-+//  mallctl("arenas.purge", nullptr, 0, nullptr, 0);
- #elif defined(MOZ_MEMORY)
-   jemalloc_free_dirty_pages();

Deleted: trunk/www/seamonkey/files/patch-z-bug762445
==============================================================================
--- trunk/www/seamonkey/files/patch-z-bug762445	Mon Jan 14 01:55:17 2013	(r1140)
+++ /dev/null	00:00:00 1970	(deleted)
@@ -1,70 +0,0 @@
-commit b44dc8e
-Author: Jan Beich <jbeich@tormail.org>
-Date:   Fri Oct 12 18:49:59 2012 +0000
-
-    Bug 762445 - Add jemalloc3 glue for heap-committed, heap-dirty in about:memory.
----
- memory/build/mozjemalloc_compat.c | 34 ++++++++++++++++++++++++++++------
- 1 file changed, 28 insertions(+), 6 deletions(-)
-
-diff --git memory/build/mozjemalloc_compat.c memory/build/mozjemalloc_compat.c
-index 94ad96e..7adfef5 100644
---- mozilla/memory/build/mozjemalloc_compat.c
-+++ mozilla/memory/build/mozjemalloc_compat.c
-@@ -11,15 +11,50 @@
- #define wrap(a) je_ ## a
- #endif
- 
--extern MOZ_IMPORT_API(int)
-+/*
-+ *  CTL_* macros are from memory/jemalloc/src/src/stats.c with changes:
-+ *  - drop `t' argument to avoid redundancy in calculating type size
-+ *  - require `i' argument for arena number explicitly
-+ */
-+
-+#define	CTL_GET(n, v) do {						\
-+	size_t sz = sizeof(v);						\
-+	wrap(mallctl)(n, &v, &sz, NULL, 0);				\
-+} while (0)
-+
-+#define	CTL_I_GET(n, v, i) do {						\
-+	size_t mib[6];							\
-+	size_t miblen = sizeof(mib) / sizeof(mib[0]);			\
-+	size_t sz = sizeof(v);						\
-+	wrap(mallctlnametomib)(n, mib, &miblen);			\
-+	mib[2] = i;							\
-+	wrap(mallctlbymib)(mib, miblen, &v, &sz, NULL, 0);		\
-+} while (0)
-+
-+MOZ_IMPORT_API(int)
- wrap(mallctl)(const char*, void*, size_t*, void*, size_t);
-+MOZ_IMPORT_API(int)
-+wrap(mallctlnametomib)(const char *name, size_t *mibp, size_t *miblenp);
-+MOZ_IMPORT_API(int)
-+wrap(mallctlbymib)(const size_t *mib, size_t miblen, void *oldp, size_t *oldlenp, void *newp, size_t newlen);
- 
- MOZ_EXPORT_API(void)
- jemalloc_stats(jemalloc_stats_t *stats)
- {
--  size_t size = sizeof(stats->mapped);
--  wrap(mallctl)("stats.mapped", &stats->mapped, &size, NULL, 0);
--  wrap(mallctl)("stats.allocated", &stats->allocated, &size, NULL, 0);
--  stats->committed = -1;
--  stats->dirty = -1;
-+  unsigned narenas;
-+  size_t active, allocated, mapped, page, pdirty;
-+
-+  CTL_GET("arenas.narenas", narenas);
-+  CTL_GET("arenas.page", page);
-+  CTL_GET("stats.active", active);
-+  CTL_GET("stats.allocated", allocated);
-+  CTL_GET("stats.mapped", mapped);
-+
-+  /* get the summation for all arenas, i == narenas */
-+  CTL_I_GET("stats.arenas.0.pdirty", pdirty, narenas);
-+
-+  stats->allocated = allocated;
-+  stats->mapped = mapped;
-+  stats->dirty = pdirty * page;
-+  stats->committed = active + stats->dirty;
- }

---

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201301140155.r0E1tI6i079235>

Legal Notices | © 1995-2024 The FreeBSD Project. All rights reserved.

Contact