Update to 42.0

Changelog:
    New Private Browsing with Tracking Protection blocks certain Web elements that could be used to record your behavior across sites
    New Control Center that contains site security and privacy controls
    New Indicator added to tabs that play audio with one-click muting
    New WebRTC improvements:
        IPV6 support
        Preferences for controlling ICE candidate generation and IP exposure
        Hooks for extensions to allow/deny createOffer/Answer
        Improved ability for applications to monitor and control which devices are used in getUserMedia
    New Login Manager improvements:
        Improved heuristics to save usernames and passwords
        Edit and show all logins in line, Copy/Paste usernames/passwords from the Context menu
        Migration imports your passwords to Firefox from Google Chrome for Windows and Internet Explorer; import anytime from the Login Manager
    Changed Improved performance on interactive websites that trigger a lot of restyles
    HTML5 Media Source Extension for HTML5 video available for all sites
    HTML5 Support ImageBitmap and createImageBitmap()
    HTML5 Implemented ES6 Reflect
    Developer Ability to save filter presets inside CSS Filter Tooltip
    Developer CSS filter presets in the Inspector
    Developer Configurable Firefox OS Simulator in WebIDE, to simulate reference devices like phones, tablets, even TVs
    Developer Asynchronous call stacks now allow web developers to follow the code flow through setTimeout, DOM event handlers, and Promise handlers.
    Developer Remote website debugging over WiFi (no USB cable or ADB needed)
    Developer View HTML source in a tab

27 files changed, 63 insertions, 860 deletions

diff --git a/www/firefox/patches/patch-aa b/www/firefox/patches/patch-aa
index 75298024a8f..95638a19710 100644
--- a/www/firefox/patches/patch-aa
+++ b/www/firefox/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.40 2015/09/23 06:44:42 ryoon Exp $
+$NetBSD: patch-aa,v 1.41 2015/11/03 15:52:57 ryoon Exp $
 
 * The profiler does not support Darwin/PPC so don't try to enable it
   on that platform.
@@ -13,9 +13,9 @@ $NetBSD: patch-aa,v 1.40 2015/09/23 06:44:42 ryoon Exp $
   heavy patching. Ideally they should be fixed individually but that
   will be an extremely hard work, so don't define XP_MACOSX for now.
 
---- configure.in.orig	2015-08-24 21:53:10.000000000 +0000
+--- configure.in.orig	2015-10-22 22:30:30.000000000 +0000
 +++ configure.in
-@@ -1933,7 +1933,7 @@ case "$host" in
+@@ -1897,7 +1897,7 @@ case "$host" in
      ;;
  
  *-darwin*)
@@ -24,7 +24,7 @@ $NetBSD: patch-aa,v 1.40 2015/09/23 06:44:42 ryoon Exp $
      HOST_NSPR_MDCPUCFG='\"md/_darwin.cfg\"'
      HOST_OPTIMIZE_FLAGS="${HOST_OPTIMIZE_FLAGS=-O3}"
      ;;
-@@ -2065,7 +2065,6 @@ case "$target" in
+@@ -2029,7 +2029,6 @@ case "$target" in
          AC_DEFINE(XP_DARWIN)
          _PLATFORM_DEFAULT_TOOLKIT='cairo-uikit'
      else
@@ -32,7 +32,7 @@ $NetBSD: patch-aa,v 1.40 2015/09/23 06:44:42 ryoon Exp $
          AC_DEFINE(XP_DARWIN)
          _PLATFORM_DEFAULT_TOOLKIT='cairo-cocoa'
          # The ExceptionHandling framework is needed for Objective-C exception
-@@ -2670,8 +2669,7 @@ MOZ_CXX11
+@@ -2609,8 +2608,7 @@ MOZ_CXX11
  
  AC_LANG_C
  
@@ -42,7 +42,7 @@ $NetBSD: patch-aa,v 1.40 2015/09/23 06:44:42 ryoon Exp $
  dnl ===============================================================
  if test "$GNU_CC" -a "$OS_TARGET" != WINNT; then
    AC_DEFINE(HAVE_VISIBILITY_HIDDEN_ATTRIBUTE)
-@@ -3615,6 +3613,14 @@ if test -n "$YASM"; then
+@@ -3533,6 +3531,14 @@ if test -n "$YASM"; then
    _YASM_BUILD=`        echo ${YASM_VERSION} | $AWK -F\. '{ print $4 }'`
  fi
  
@@ -57,7 +57,7 @@ $NetBSD: patch-aa,v 1.40 2015/09/23 06:44:42 ryoon Exp $
  if test -z "$SKIP_LIBRARY_CHECKS"; then
  dnl system JPEG support
  dnl ========================================================
-@@ -3642,11 +3648,7 @@ if test "$MOZ_NATIVE_JPEG" = 1; then
+@@ -3560,11 +3566,7 @@ if test "$MOZ_NATIVE_JPEG" = 1; then
                       #include <jpeglib.h> ],
                     [ #if JPEG_LIB_VERSION < $MOZJPEG
                       #error "Insufficient JPEG library version ($MOZJPEG required)."
@@ -70,16 +70,7 @@ $NetBSD: patch-aa,v 1.40 2015/09/23 06:44:42 ryoon Exp $
                     MOZ_NATIVE_JPEG=1,
                     AC_MSG_ERROR([Insufficient JPEG library version for --with-system-jpeg]))
  fi
-@@ -4337,7 +4339,7 @@ cairo-cocoa)
-     MOZ_USER_DIR="Mozilla"
-     MOZ_FS_LAYOUT=bundle
-     # skip event loop instrumentation on UIKit for now
--    if test "$MOZ_WIDGET_TOOLKIT" == "cocoa"; then
-+    if test "$MOZ_WIDGET_TOOLKIT" = "cocoa"; then
-       MOZ_INSTRUMENT_EVENT_LOOP=1
-     fi
-     ;;
-@@ -4376,6 +4378,10 @@ cairo-gonk)
+@@ -4288,6 +4290,10 @@ cairo-gonk)
  
  esac
  
@@ -90,7 +81,7 @@ $NetBSD: patch-aa,v 1.40 2015/09/23 06:44:42 ryoon Exp $
  AC_SUBST(MOZ_PDF_PRINTING)
  if test "$MOZ_PDF_PRINTING"; then
     PDF_SURFACE_FEATURE="#define CAIRO_HAS_PDF_SURFACE 1"
-@@ -5108,6 +5114,9 @@ if test -n "$MOZ_WEBRTC"; then
+@@ -5020,6 +5026,9 @@ if test -n "$MOZ_WEBRTC"; then
      MOZ_VPX=1
      MOZ_VPX_ERROR_CONCEALMENT=1
  
@@ -100,7 +91,7 @@ $NetBSD: patch-aa,v 1.40 2015/09/23 06:44:42 ryoon Exp $
  dnl enable once Signaling lands
      MOZ_WEBRTC_SIGNALING=1
      AC_DEFINE(MOZ_WEBRTC_SIGNALING)
-@@ -5251,6 +5260,142 @@ if test "${ac_cv_c_attribute_aligned}" !
+@@ -5163,6 +5172,142 @@ if test "${ac_cv_c_attribute_aligned}" !
  fi
  
  dnl ========================================================
@@ -243,7 +234,7 @@ $NetBSD: patch-aa,v 1.40 2015/09/23 06:44:42 ryoon Exp $
  dnl = Disable VP8 decoder support
  dnl ========================================================
  MOZ_ARG_DISABLE_BOOL(webm,
-@@ -5632,6 +5777,67 @@ fi
+@@ -5548,6 +5693,67 @@ fi
  AC_SUBST(MOZ_WEBM_ENCODER)
  
  dnl ==================================
@@ -311,7 +302,7 @@ $NetBSD: patch-aa,v 1.40 2015/09/23 06:44:42 ryoon Exp $
  dnl = Check alsa availability on Linux
  dnl ==================================
  
-@@ -5645,12 +5851,23 @@ MOZ_ARG_ENABLE_BOOL(alsa,
+@@ -5561,12 +5767,23 @@ MOZ_ARG_ENABLE_BOOL(alsa,
     MOZ_ALSA=1,
     MOZ_ALSA=)
  
@@ -335,7 +326,7 @@ $NetBSD: patch-aa,v 1.40 2015/09/23 06:44:42 ryoon Exp $
  AC_SUBST(MOZ_ALSA)
  
  dnl ========================================================
-@@ -8131,6 +8348,49 @@ if test "$USE_FC_FREETYPE"; then
+@@ -8141,6 +8358,49 @@ if test "$USE_FC_FREETYPE"; then
  fi
  
  dnl ========================================================
diff --git a/www/firefox/patches/patch-b2g_installer_Makefile.in b/www/firefox/patches/patch-b2g_installer_Makefile.in
deleted file mode 100644
index 633df287efe..00000000000
--- a/www/firefox/patches/patch-b2g_installer_Makefile.in
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-b2g_installer_Makefile.in,v 1.5 2015/02/28 04:30:55 ryoon Exp $
-
---- b2g/installer/Makefile.in.orig	2015-02-17 21:40:34.000000000 +0000
-+++ b2g/installer/Makefile.in
-@@ -79,6 +79,10 @@ ifneq (,$(filter rtsp,$(NECKO_PROTOCOLS)
- DEFINES += -DMOZ_RTSP
- endif
- 
-+ifdef MOZ_DEBUG
-+DEFINES += -DMOZ_DEBUG=1
-+endif
-+
- ifdef GKMEDIAS_SHARED_LIBRARY
- DEFINES += -DGKMEDIAS_SHARED_LIBRARY
- endif
diff --git a/www/firefox/patches/patch-b2g_installer_package-manifest.in b/www/firefox/patches/patch-b2g_installer_package-manifest.in
deleted file mode 100644
index f9e367465f7..00000000000
--- a/www/firefox/patches/patch-b2g_installer_package-manifest.in
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-b2g_installer_package-manifest.in,v 1.5 2015/07/03 10:25:40 ryoon Exp $
-
---- b2g/installer/package-manifest.in.orig	2015-06-18 20:55:24.000000000 +0000
-+++ b2g/installer/package-manifest.in
-@@ -671,7 +671,7 @@
- @RESPATH@/components/EngineeringModeAPI.js
- @RESPATH@/components/EngineeringModeService.js
- 
--#ifdef MOZ_DEBUG
-+#if defined(ENABLE_TESTS) && defined(MOZ_DEBUG)
- @RESPATH@/components/TestInterfaceJS.js
- @RESPATH@/components/TestInterfaceJS.manifest
- #endif
diff --git a/www/firefox/patches/patch-browser_app_nsBrowserApp.cpp b/www/firefox/patches/patch-browser_app_nsBrowserApp.cpp
deleted file mode 100644
index d900ce4a78c..00000000000
--- a/www/firefox/patches/patch-browser_app_nsBrowserApp.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-browser_app_nsBrowserApp.cpp,v 1.8 2015/08/12 05:41:30 ryoon Exp $
-
-* Replace XP_MACOSX with XP_DARWIN as the former is not defined when
-  the toolkit is not cocoa.
-
---- browser/app/nsBrowserApp.cpp.orig	2015-05-04 00:43:18.000000000 +0000
-+++ browser/app/nsBrowserApp.cpp
-@@ -18,8 +18,10 @@
- #include <unistd.h>
- #endif
- 
--#ifdef XP_MACOSX
-+#ifdef XP_DARWIN
- #include <mach/mach_time.h>
-+#endif
-+#ifdef MOZ_WIDGET_COCOA
- #include "MacQuirks.h"
- #endif
- 
-@@ -459,7 +461,7 @@ TimeStamp_Now()
-   }
- 
-   return sGetTickCount64() * freq.QuadPart;
--#elif defined(XP_MACOSX)
-+#elif defined(XP_DARWIN)
-   return mach_absolute_time();
- #elif defined(HAVE_CLOCK_MONOTONIC)
-   struct timespec ts;
diff --git a/www/firefox/patches/patch-browser_installer_package-manifest.in b/www/firefox/patches/patch-browser_installer_package-manifest.in
index cee214bf10e..9252bb33fc1 100644
--- a/www/firefox/patches/patch-browser_installer_package-manifest.in
+++ b/www/firefox/patches/patch-browser_installer_package-manifest.in
@@ -1,10 +1,10 @@
-$NetBSD: patch-browser_installer_package-manifest.in,v 1.6 2015/02/28 04:30:55 ryoon Exp $
+$NetBSD: patch-browser_installer_package-manifest.in,v 1.7 2015/11/03 15:52:57 ryoon Exp $
 
 Limit SPARC bits to just SPARC (untested, but fixes x86).
 
---- browser/installer/package-manifest.in.orig	2015-02-17 21:40:38.000000000 +0000
+--- browser/installer/package-manifest.in.orig	2015-10-22 22:30:28.000000000 +0000
 +++ browser/installer/package-manifest.in
-@@ -609,7 +609,7 @@
+@@ -620,7 +620,7 @@
  @RESPATH@/components/MozKeyboard.js
  @RESPATH@/components/InputMethod.manifest
  
@@ -12,8 +12,8 @@ Limit SPARC bits to just SPARC (untested, but fixes x86).
 +#if defined(ENABLE_TESTS) && defined(MOZ_DEBUG)
  @RESPATH@/components/TestInterfaceJS.js
  @RESPATH@/components/TestInterfaceJS.manifest
- #endif
-@@ -788,7 +788,7 @@
+ @RESPATH@/components/TestInterfaceJSMaplike.js
+@@ -822,7 +822,7 @@
  #endif
  
  ; for Solaris SPARC
diff --git a/www/firefox/patches/patch-config_system-headers b/www/firefox/patches/patch-config_system-headers
index ae6ad830f0d..533f1b329c4 100644
--- a/www/firefox/patches/patch-config_system-headers
+++ b/www/firefox/patches/patch-config_system-headers
@@ -1,8 +1,8 @@
-$NetBSD: patch-config_system-headers,v 1.14 2015/07/03 10:25:40 ryoon Exp $
+$NetBSD: patch-config_system-headers,v 1.15 2015/11/03 15:52:57 ryoon Exp $
 
---- config/system-headers.orig	2015-06-18 20:55:30.000000000 +0000
+--- config/system-headers.orig	2015-10-22 22:30:30.000000000 +0000
 +++ config/system-headers
-@@ -628,6 +628,7 @@ libgnome/libgnome.h
+@@ -626,6 +626,7 @@ libgnome/libgnome.h
  libgnomeui/gnome-icon-lookup.h
  libgnomeui/gnome-icon-theme.h
  libgnomeui/gnome-ui-init.h
@@ -10,15 +10,7 @@ $NetBSD: patch-config_system-headers,v 1.14 2015/07/03 10:25:40 ryoon Exp $
  lib$routines.h
  limits
  limits.h
-@@ -1258,7 +1259,6 @@ X11/Xlocale.h
- X11/Xos.h
- X11/Xutil.h
- zmouse.h
--soundtouch/SoundTouch.h
- #if MOZ_NATIVE_PNG==1
- png.h
- #endif
-@@ -1320,10 +1320,13 @@ vorbis/codec.h
+@@ -1322,10 +1323,13 @@ vorbis/codec.h
  theora/theoradec.h
  tremor/ivorbiscodec.h
  speex/speex_resampler.h
@@ -32,7 +24,7 @@ $NetBSD: patch-config_system-headers,v 1.14 2015/07/03 10:25:40 ryoon Exp $
  #endif
  gst/gst.h
  gst/app/gstappsink.h
-@@ -1352,3 +1355,43 @@ unicode/utypes.h
+@@ -1355,3 +1359,43 @@ unicode/utypes.h
  #endif
  libutil.h
  unwind.h
diff --git a/www/firefox/patches/patch-dom_media_AudioStream.h b/www/firefox/patches/patch-dom_media_AudioStream.h
deleted file mode 100644
index 43593cdb248..00000000000
--- a/www/firefox/patches/patch-dom_media_AudioStream.h
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-dom_media_AudioStream.h,v 1.1 2015/02/28 04:30:55 ryoon Exp $
-
---- dom/media/AudioStream.h.orig	2015-02-17 21:40:44.000000000 +0000
-+++ dom/media/AudioStream.h
-@@ -17,7 +17,7 @@
- #include "CubebUtils.h"
- 
- namespace soundtouch {
--class SoundTouch;
-+class MOZ_IMPORT_API SoundTouch;
- }
- 
- namespace mozilla {
diff --git a/www/firefox/patches/patch-dom_system_OSFileConstants.cpp b/www/firefox/patches/patch-dom_system_OSFileConstants.cpp
index ee2a238c2ad..ecb58239eb7 100644
--- a/www/firefox/patches/patch-dom_system_OSFileConstants.cpp
+++ b/www/firefox/patches/patch-dom_system_OSFileConstants.cpp
@@ -1,13 +1,13 @@
-$NetBSD: patch-dom_system_OSFileConstants.cpp,v 1.6 2015/02/16 16:10:22 bad Exp $
+$NetBSD: patch-dom_system_OSFileConstants.cpp,v 1.7 2015/11/03 15:52:57 ryoon Exp $
 
 * NetBSD 5 does not support posix_spawn(3)
 
 * Replace XP_MACOSX with XP_DARWIN as the former is not defined when
   the toolkit is not cocoa.
 
---- dom/system/OSFileConstants.cpp.orig	2014-07-17 01:45:12.000000000 +0000
-+++ dom/system/OSFileConstants.cpp	2014-08-19 17:41:25.000000000 +0000
-@@ -9,6 +9,10 @@
+--- dom/system/OSFileConstants.cpp.orig	2015-10-22 22:30:38.000000000 +0000
++++ dom/system/OSFileConstants.cpp
+@@ -11,6 +11,10 @@
  
  #include "prsystem.h"
  
@@ -18,7 +18,7 @@ $NetBSD: patch-dom_system_OSFileConstants.cpp,v 1.6 2015/02/16 16:10:22 bad Exp
  #if defined(XP_UNIX)
  #include "unistd.h"
  #include "dirent.h"
-@@ -18,7 +22,9 @@
+@@ -20,7 +24,9 @@
  #define statvfs statfs
  #else
  #include "sys/statvfs.h"
@@ -28,7 +28,7 @@ $NetBSD: patch-dom_system_OSFileConstants.cpp,v 1.6 2015/02/16 16:10:22 bad Exp
  #endif // defined(ANDROID)
  #endif // defined(XP_UNIX)
  
-@@ -26,9 +32,9 @@
+@@ -28,9 +34,9 @@
  #include <linux/fadvise.h>
  #endif // defined(XP_LINUX)
  
@@ -40,25 +40,12 @@ $NetBSD: patch-dom_system_OSFileConstants.cpp,v 1.6 2015/02/16 16:10:22 bad Exp
  
  #if defined(XP_WIN)
  #include <windows.h>
-@@ -564,10 +570,10 @@
+@@ -590,7 +596,7 @@ static const dom::ConstantSpec gLibcProp
    // The size of |fsblkcnt_t|.
-   { "OSFILE_SIZEOF_FSBLKCNT_T", INT_TO_JSVAL(sizeof (fsblkcnt_t)) },
+   { "OSFILE_SIZEOF_FSBLKCNT_T", JS::Int32Value(sizeof (fsblkcnt_t)) },
  
 -#if !defined(ANDROID)
 +#if !defined(ANDROID) && !(defined(__NetBSD__) && (__NetBSD_Version__ < 600000000))
    // The size of |posix_spawn_file_actions_t|.
-   { "OSFILE_SIZEOF_POSIX_SPAWN_FILE_ACTIONS_T", INT_TO_JSVAL(sizeof (posix_spawn_file_actions_t)) },
--#endif // !defined(ANDROID)
-+#endif // !defined(ANDROID) && NetBSD 5.*
- 
-   // Defining |dirent|.
-   // Size
-@@ -627,7 +633,7 @@
- 
-   { "OSFILE_SIZEOF_STATVFS", INT_TO_JSVAL(sizeof (struct statvfs)) },
- 
--  { "OSFILE_OFFSETOF_STATVFS_F_BSIZE", INT_TO_JSVAL(offsetof (struct statvfs, f_bsize)) },
-+  { "OSFILE_OFFSETOF_STATVFS_F_FRSIZE", INT_TO_JSVAL(offsetof (struct statvfs, f_frsize)) },
-   { "OSFILE_OFFSETOF_STATVFS_F_BAVAIL", INT_TO_JSVAL(offsetof (struct statvfs, f_bavail)) },
- 
- #endif // defined(XP_UNIX)
+   { "OSFILE_SIZEOF_POSIX_SPAWN_FILE_ACTIONS_T", JS::Int32Value(sizeof (posix_spawn_file_actions_t)) },
+ #endif // !defined(ANDROID)
diff --git a/www/firefox/patches/patch-gfx_skia_generate__mozbuild.py b/www/firefox/patches/patch-gfx_skia_generate__mozbuild.py
index 437a4415643..17dbcce94d2 100644
--- a/www/firefox/patches/patch-gfx_skia_generate__mozbuild.py
+++ b/www/firefox/patches/patch-gfx_skia_generate__mozbuild.py
@@ -1,10 +1,10 @@
-$NetBSD: patch-gfx_skia_generate__mozbuild.py,v 1.2 2015/08/11 23:48:18 ryoon Exp $
+$NetBSD: patch-gfx_skia_generate__mozbuild.py,v 1.3 2015/11/03 15:52:57 ryoon Exp $
 
---- gfx/skia/generate_mozbuild.py.orig	2015-08-07 15:54:04.000000000 +0000
+--- gfx/skia/generate_mozbuild.py.orig	2015-10-22 22:30:23.000000000 +0000
 +++ gfx/skia/generate_mozbuild.py
-@@ -142,6 +142,12 @@ if CONFIG['GNU_CXX']:
+@@ -147,6 +147,12 @@ if CONFIG['GNU_CXX']:
      if CONFIG['CPU_ARCH'] == 'arm':
-         SOURCES['trunk/src/opts/SkBlitRow_opts_arm.cpp'].flags += ['-fomit-frame-pointer']
+         SOURCES['skia/src/opts/SkBlitRow_opts_arm.cpp'].flags += ['-fomit-frame-pointer']
  
 +if CONFIG['MOZ_NATIVE_HARFBUZZ']:
 +    CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS']
diff --git a/www/firefox/patches/patch-gfx_skia_moz.build b/www/firefox/patches/patch-gfx_skia_moz.build
index 11ce166d2d1..88dc1518a99 100644
--- a/www/firefox/patches/patch-gfx_skia_moz.build
+++ b/www/firefox/patches/patch-gfx_skia_moz.build
@@ -1,10 +1,10 @@
-$NetBSD: patch-gfx_skia_moz.build,v 1.9 2015/08/11 23:48:18 ryoon Exp $
+$NetBSD: patch-gfx_skia_moz.build,v 1.10 2015/11/03 15:52:57 ryoon Exp $
 
---- gfx/skia/moz.build.orig	2015-08-07 15:54:04.000000000 +0000
+--- gfx/skia/moz.build.orig	2015-10-22 22:30:23.000000000 +0000
 +++ gfx/skia/moz.build
-@@ -970,6 +970,12 @@ if CONFIG['GNU_CXX']:
+@@ -675,6 +675,12 @@ if CONFIG['GNU_CXX']:
      if CONFIG['CPU_ARCH'] == 'arm':
-         SOURCES['trunk/src/opts/SkBlitRow_opts_arm.cpp'].flags += ['-fomit-frame-pointer']
+         SOURCES['skia/src/opts/SkBlitRow_opts_arm.cpp'].flags += ['-fomit-frame-pointer']
  
 +if CONFIG['MOZ_NATIVE_HARFBUZZ']:
 +    CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS']
diff --git a/www/firefox/patches/patch-gfx_skia_trunk_src_core_SkUtilsArm.cpp b/www/firefox/patches/patch-gfx_skia_skia_src_core_SkUtilsArm.cpp
index 00f3f0e6fa7..44208c8fffd 100644
--- a/www/firefox/patches/patch-gfx_skia_trunk_src_core_SkUtilsArm.cpp
+++ b/www/firefox/patches/patch-gfx_skia_skia_src_core_SkUtilsArm.cpp
@@ -1,7 +1,7 @@
-$NetBSD: patch-gfx_skia_trunk_src_core_SkUtilsArm.cpp,v 1.2 2015/10/25 15:59:37 jmcneill Exp $
+$NetBSD: patch-gfx_skia_skia_src_core_SkUtilsArm.cpp,v 1.1 2015/11/03 15:52:57 ryoon Exp $
 
---- gfx/skia/trunk/src/core/SkUtilsArm.cpp.orig	2015-09-29 21:44:49.000000000 +0000
-+++ gfx/skia/trunk/src/core/SkUtilsArm.cpp
+--- gfx/skia/skia/src/core/SkUtilsArm.cpp.orig	2015-10-22 22:30:24.000000000 +0000
++++ gfx/skia/skia/src/core/SkUtilsArm.cpp
 @@ -16,6 +16,10 @@
  #include <string.h>
  #include <pthread.h>
diff --git a/www/firefox/patches/patch-gfx_skia_trunk_src_opts_SkBitmapProcState__opts__arm.cpp b/www/firefox/patches/patch-gfx_skia_skia_src_opts_SkBitmapProcState__opts__arm.cpp
index 536ec63edb1..92bc3310d69 100644
--- a/www/firefox/patches/patch-gfx_skia_trunk_src_opts_SkBitmapProcState__opts__arm.cpp
+++ b/www/firefox/patches/patch-gfx_skia_skia_src_opts_SkBitmapProcState__opts__arm.cpp
@@ -1,7 +1,7 @@
-$NetBSD: patch-gfx_skia_trunk_src_opts_SkBitmapProcState__opts__arm.cpp,v 1.1 2015/10/16 12:59:36 jmcneill Exp $
+$NetBSD: patch-gfx_skia_skia_src_opts_SkBitmapProcState__opts__arm.cpp,v 1.1 2015/11/03 15:52:57 ryoon Exp $
 
---- gfx/skia/trunk/src/opts/SkBitmapProcState_opts_arm.cpp.orig	2015-09-29 21:44:50.000000000 +0000
-+++ gfx/skia/trunk/src/opts/SkBitmapProcState_opts_arm.cpp
+--- gfx/skia/skia/src/opts/SkBitmapProcState_opts_arm.cpp.orig	2015-10-22 22:30:24.000000000 +0000
++++ gfx/skia/skia/src/opts/SkBitmapProcState_opts_arm.cpp
 @@ -97,7 +97,11 @@ void SI8_D16_nofilter_DX_arm(const SkBit
              "2:                                        \n\t"
              : [xx] "+r" (xx), [count8] "+r" (count8), [colors] "+r" (colors)
diff --git a/www/firefox/patches/patch-gfx_skia_trunk_src_opts_memset.arm.S b/www/firefox/patches/patch-gfx_skia_skia_src_opts_memset.arm.S
index 66fb59ea117..bfc28ebb21b 100644
--- a/www/firefox/patches/patch-gfx_skia_trunk_src_opts_memset.arm.S
+++ b/www/firefox/patches/patch-gfx_skia_skia_src_opts_memset.arm.S
@@ -1,7 +1,7 @@
-$NetBSD: patch-gfx_skia_trunk_src_opts_memset.arm.S,v 1.1 2015/10/16 12:59:36 jmcneill Exp $
+$NetBSD: patch-gfx_skia_skia_src_opts_memset.arm.S,v 1.1 2015/11/03 15:52:57 ryoon Exp $
 
---- gfx/skia/trunk/src/opts/memset.arm.S.orig	2015-09-29 21:44:50.000000000 +0000
-+++ gfx/skia/trunk/src/opts/memset.arm.S
+--- gfx/skia/skia/src/opts/memset.arm.S.orig	2015-10-22 22:30:24.000000000 +0000
++++ gfx/skia/skia/src/opts/memset.arm.S
 @@ -13,6 +13,12 @@
   *    to aid future maintenance.
   */
diff --git a/www/firefox/patches/patch-gfx_thebes_gfxWindowsPlatform.cpp b/www/firefox/patches/patch-gfx_thebes_gfxWindowsPlatform.cpp
deleted file mode 100644
index 95c039d1cac..00000000000
--- a/www/firefox/patches/patch-gfx_thebes_gfxWindowsPlatform.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-gfx_thebes_gfxWindowsPlatform.cpp,v 1.1 2015/09/23 06:44:42 ryoon Exp $
-
---- gfx/thebes/gfxWindowsPlatform.cpp.orig	2015-08-24 21:53:05.000000000 +0000
-+++ gfx/thebes/gfxWindowsPlatform.cpp
-@@ -1879,6 +1879,10 @@ gfxWindowsPlatform::InitD3D11Devices()
-     return;
-   }
- 
-+  if (!CouldD3D11DeviceWork()) {
-+    return;
-+  }
-+
-   bool useWARP = false;
-   bool allowWARP = false;
- 
diff --git a/www/firefox/patches/patch-ipc_glue_ScopedXREEmbed.cpp b/www/firefox/patches/patch-ipc_glue_ScopedXREEmbed.cpp
deleted file mode 100644
index bccbf8f491b..00000000000
--- a/www/firefox/patches/patch-ipc_glue_ScopedXREEmbed.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ipc_glue_ScopedXREEmbed.cpp,v 1.1 2014/05/30 03:03:36 pho Exp $
-
-Walking out of [subprocess].app/Contents/MacOS would only be needed if
-we were using the cocoa toolkit.
-
---- ipc/glue/ScopedXREEmbed.cpp.orig	2014-05-06 22:55:41.000000000 +0000
-+++ ipc/glue/ScopedXREEmbed.cpp
-@@ -66,7 +66,7 @@ ScopedXREEmbed::Start()
-   localFile = do_QueryInterface(parent);
-   NS_ENSURE_TRUE_VOID(localFile);
- 
--#ifdef OS_MACOSX
-+#ifdef MOZ_WIDGET_COCOA
-   if (XRE_GetProcessType() == GeckoProcessType_Content) {
-     // We're an XPCOM-using subprocess.  Walk out of
-     // [subprocess].app/Contents/MacOS to the real GRE dir.
diff --git a/www/firefox/patches/patch-memory_jemalloc_Makefile.in b/www/firefox/patches/patch-memory_jemalloc_Makefile.in
deleted file mode 100644
index 3866d1139cb..00000000000
--- a/www/firefox/patches/patch-memory_jemalloc_Makefile.in
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-memory_jemalloc_Makefile.in,v 1.1 2014/03/20 21:02:00 ryoon Exp $
-
---- memory/jemalloc/Makefile.in.orig	2014-03-15 05:19:31.000000000 +0000
-+++ memory/jemalloc/Makefile.in
-@@ -21,3 +21,7 @@ endif
- ifdef GNU_CC
- CFLAGS += -std=gnu99
- endif
-+
-+# XXX startup crash workaround for gcc47 on amd64
-+jemalloc.$(OBJ_SUFFIX): OS_CFLAGS := $(filter-out -O3 -Ofast,$(OS_CFLAGS))
-+jemalloc.$(OBJ_SUFFIX): MOZ_OPTIMIZE_FLAGS=
diff --git a/www/firefox/patches/patch-mfbt_Alignment.h b/www/firefox/patches/patch-mfbt_Alignment.h
index f2c6380d873..4b64b88411b 100644
--- a/www/firefox/patches/patch-mfbt_Alignment.h
+++ b/www/firefox/patches/patch-mfbt_Alignment.h
@@ -1,18 +1,11 @@
-$NetBSD: patch-mfbt_Alignment.h,v 1.2 2014/07/24 14:57:12 ryoon Exp $
+$NetBSD: patch-mfbt_Alignment.h,v 1.3 2015/11/03 15:52:57 ryoon Exp $
 
 Make MOZ_ALIGNOF() use gcc's builtin __alignof__.
 From https://bugzilla.mozilla.org/show_bug.cgi?id=1026499
 
---- mfbt/Alignment.h.orig	2014-07-17 01:45:32.000000000 +0000
+--- mfbt/Alignment.h.orig	2015-10-22 22:30:35.000000000 +0000
 +++ mfbt/Alignment.h
-@@ -9,11 +9,20 @@
- #ifndef mozilla_Alignment_h
- #define mozilla_Alignment_h
- 
-+#include "mozilla/Attributes.h"
-+
- #include <stddef.h>
- #include <stdint.h>
+@@ -15,6 +15,13 @@
  
  namespace mozilla {
  
@@ -26,7 +19,7 @@ From https://bugzilla.mozilla.org/show_bug.cgi?id=1026499
  /*
   * This class, and the corresponding macro MOZ_ALIGNOF, figures out how many
   * bytes of alignment a given type needs.
-@@ -32,6 +41,7 @@ class AlignmentFinder
+@@ -33,6 +40,7 @@ public:
  };
  
  #define MOZ_ALIGNOF(T) mozilla::AlignmentFinder<T>::alignment
@@ -34,7 +27,7 @@ From https://bugzilla.mozilla.org/show_bug.cgi?id=1026499
  
  /*
   * Declare the MOZ_ALIGNED_DECL macro for declaring aligned types.
-@@ -43,7 +53,10 @@ class AlignmentFinder
+@@ -44,7 +52,10 @@ public:
   * will declare a two-character array |arr| aligned to 8 bytes.
   */
  
diff --git a/www/firefox/patches/patch-mfbt_Attributes.h b/www/firefox/patches/patch-mfbt_Attributes.h
index 33278d4ca58..1a240af7783 100644
--- a/www/firefox/patches/patch-mfbt_Attributes.h
+++ b/www/firefox/patches/patch-mfbt_Attributes.h
@@ -1,6 +1,6 @@
-$NetBSD: patch-mfbt_Attributes.h,v 1.5 2015/07/03 10:25:40 ryoon Exp $
+$NetBSD: patch-mfbt_Attributes.h,v 1.6 2015/11/03 15:52:57 ryoon Exp $
 
---- mfbt/Attributes.h.orig	2015-06-18 20:55:34.000000000 +0000
+--- mfbt/Attributes.h.orig	2015-10-22 22:30:35.000000000 +0000
 +++ mfbt/Attributes.h
 @@ -50,6 +50,7 @@
   * don't indicate support for them here, due to
@@ -9,8 +9,8 @@ $NetBSD: patch-mfbt_Attributes.h,v 1.5 2015/07/03 10:25:40 ryoon Exp $
 +#  define MOZ_HAVE_CXX11_ALIGNAS
  #  define MOZ_HAVE_NEVER_INLINE          __declspec(noinline)
  #  define MOZ_HAVE_NORETURN              __declspec(noreturn)
- #  ifdef __clang__
-@@ -70,6 +71,9 @@
+ #  if _MSC_VER >= 1900
+@@ -73,6 +74,9 @@
  #  ifndef __has_extension
  #    define __has_extension __has_feature /* compatibility, for older versions of clang */
  #  endif
@@ -20,7 +20,7 @@ $NetBSD: patch-mfbt_Attributes.h,v 1.5 2015/07/03 10:25:40 ryoon Exp $
  #  if __has_extension(cxx_constexpr)
  #    define MOZ_HAVE_CXX11_CONSTEXPR
  #  endif
-@@ -86,6 +90,7 @@
+@@ -89,6 +93,7 @@
  #  if defined(__GXX_EXPERIMENTAL_CXX0X__) || __cplusplus >= 201103L
  #    define MOZ_HAVE_CXX11_CONSTEXPR
  #    if MOZ_GCC_VERSION_AT_LEAST(4, 8, 0)
diff --git a/www/firefox/patches/patch-modules_libpref_init_all.js b/www/firefox/patches/patch-modules_libpref_init_all.js
index ba520529754..5a75825436d 100644
--- a/www/firefox/patches/patch-modules_libpref_init_all.js
+++ b/www/firefox/patches/patch-modules_libpref_init_all.js
@@ -1,10 +1,10 @@
-$NetBSD: patch-modules_libpref_init_all.js,v 1.2 2015/09/23 06:44:42 ryoon Exp $
+$NetBSD: patch-modules_libpref_init_all.js,v 1.3 2015/11/03 15:52:57 ryoon Exp $
 
 * Improve stability under NetBSD.
 
---- modules/libpref/init/all.js.orig	2015-08-26 09:39:08.000000000 +0000
+--- modules/libpref/init/all.js.orig	2015-10-29 22:17:56.000000000 +0000
 +++ modules/libpref/init/all.js
-@@ -4048,7 +4048,7 @@ pref("layers.max-active", -1);
+@@ -4283,7 +4283,7 @@ pref("layers.max-active", -1);
  pref("layers.tiles.adjust", true);
  
  // Set the default values, and then override per-platform as needed
diff --git a/www/firefox/patches/patch-netwerk_base_nsNetUtil.h b/www/firefox/patches/patch-netwerk_base_nsNetUtil.h
deleted file mode 100644
index f316c5d6e80..00000000000
--- a/www/firefox/patches/patch-netwerk_base_nsNetUtil.h
+++ /dev/null
@@ -1,39 +0,0 @@
-$NetBSD: patch-netwerk_base_nsNetUtil.h,v 1.1 2015/05/12 22:48:54 ryoon Exp $
-
---- netwerk/base/nsNetUtil.h.orig	2015-05-04 00:43:34.000000000 +0000
-+++ netwerk/base/nsNetUtil.h
-@@ -13,6 +13,7 @@
- #include "nsMemory.h"
- #include "nsCOMPtr.h"
- #include "prio.h" // for read/write flags, permissions, etc.
-+#include "prnetdb.h"
- #include "nsHashKeys.h"
- 
- #include "plstr.h"
-@@ -2828,6 +2829,26 @@ NS_IsSrcdocChannel(nsIChannel *aChannel)
- bool NS_IsReasonableHTTPHeaderValue(const nsACString& aValue);
- 
- /**
-+ * Return a host endian value decoded from network byte order,
-+ * accessed in an alignement safe way.
-+ */
-+inline uint16_t NS_decodeN16(const void *bytes)
-+{
-+    uint16_t tmp;
-+
-+    memcpy(&tmp, bytes, sizeof tmp);
-+    return PR_ntohs(tmp);
-+}
-+
-+inline uint32_t NS_decodeN32(const void *bytes)
-+{
-+    uint32_t tmp;
-+
-+    memcpy(&tmp, bytes, sizeof tmp);
-+    return PR_ntohl(tmp);
-+}
-+
-+/**
-  * Return true if the given string is a valid HTTP token per RFC 2616 section
-  * 2.2.
-  */
diff --git a/www/firefox/patches/patch-testing_mozharness_README.md b/www/firefox/patches/patch-testing_mozharness_README.md
deleted file mode 100644
index 676b7d42ed9..00000000000
--- a/www/firefox/patches/patch-testing_mozharness_README.md
+++ /dev/null
@@ -1,88 +0,0 @@
-$NetBSD: patch-testing_mozharness_README.md,v 1.1 2015/08/11 23:48:18 ryoon Exp $
-
---- testing/mozharness/README.md.orig	2015-08-11 19:24:52.000000000 +0000
-+++ testing/mozharness/README.md
-@@ -0,0 +1,83 @@
-+# Mozharness
-+This repository is a downstream read-only copy of:
-+http://hg.mozilla.org/build/mozharness/
-+
-+### Submitting changes
-+We do not support the github Pull Request workflow, since github is only a downstream
-+mirror for us. However, feel free to fork from us and make changes. Then, rather than
-+submitting a pull request, please create a patch for your changes (capture the output
-+of your changes using e.g. git diff) and attach the patch file to a Bugzilla bug,
-+created in the following component:
-+https://bugzilla.mozilla.org/enter_bug.cgi?product=Release%20Engineering&component=Mozharness
-+
-+This bug will get triaged by us.
-+
-+### Docs
-+* https://developer.mozilla.org/en-US/docs/Mozharness_FAQ
-+* https://wiki.mozilla.org/ReleaseEngineering/Mozharness
-+* http://moz-releng-mozharness.readthedocs.org/en/latest/mozharness.mozilla.html
-+* http://moz-releng-docs.readthedocs.org/en/latest/software.html#mozharness
-+
-+### To run mozharness unit tests
-+```
-+pip install tox
-+tox
-+```
-+
-+### To run tests in travis
-+Please note if you fork this repository and wish to run the tests in travis,
-+you will need to enable your github fork in both travis and coveralls. In both
-+cases you can log in with your github account, you do not need to set up a new
-+one. To enable:
-+* https://travis-ci.org/profile
-+* https://coveralls.io/repos/new
-+
-+After enabling, you will need to push changes to your repo in order for a travis
-+job to be triggered.
-+
-+### To match commits to upstream hg changesets
-+Add this following section to the .git/config file in your local clone:
-+```
-+[remote "mozilla"]
-+	url = git@github.com:mozilla/build-mozharness
-+	fetch = +refs/heads/*:refs/remotes/mozilla/*
-+	fetch = +refs/notes/*:refs/notes/*
-+```
-+then to match a git commit to an upstream hg changeset:
-+```
-+git fetch mozilla
-+git log
-+```
-+This will produce output like this:
-+```
-+commit c6dc279ab791d7cd11ccc57d2d83a61dc5e0dd09
-+Author: Simarpreet Singh <s244sing@uwaterloo.ca>
-+Date:   Mon Dec 22 14:46:56 2014 -0500
-+
-+    Bug 1078619 - Allow to run talos jobs as a developer. r=armenzg
-+
-+Notes:
-+    Upstream source: https://hg.mozilla.org/build/mozharness/rev/7204ff2ff48a6d31dc2fd6aa25465962f93a91ee
-+
-+commit dce9aae0dadf3875afd44c8e61b70fd5ba91f91f
-+Author: Ankit Goyal <ankit.goyal90@hotmail.com>
-+Date:   Mon Dec 22 10:18:16 2014 -0500
-+
-+    Bug 1113081 - Remove references to metro mode from talos.py script. r=jmaher
-+
-+Notes:
-+    Upstream source: https://hg.mozilla.org/build/mozharness/rev/0424b451c005724c08a12bfe64733142305f4476
-+
-+commit 7bc17c00dafb144b9982dff2e19e8da91229c6c5
-+Author: Peter Moore <pmoore@mozilla.com>
-+Date:   Fri Dec 19 20:35:55 2014 +0100
-+
-+    Bug 1076810 - coveralls publish failures should not cause travis job result to be failure,r=rail
-+
-+Notes:
-+    Upstream source: https://hg.mozilla.org/build/mozharness/rev/701d2eda2aece7c63d34e907bcd657f0895d1c4e
-+```
-+This allows you to map a git commit SHA to an hg changeset SHA ("Upstream source").
-+
-+
-+Happy contributing! =)
diff --git a/www/firefox/patches/patch-testing_mozharness_configs_update__tests_mozilla-beta.py b/www/firefox/patches/patch-testing_mozharness_configs_update__tests_mozilla-beta.py
deleted file mode 100644
index 2de015238dd..00000000000
--- a/www/firefox/patches/patch-testing_mozharness_configs_update__tests_mozilla-beta.py
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-testing_mozharness_configs_update__tests_mozilla-beta.py,v 1.1 2015/08/11 23:48:18 ryoon Exp $
-
---- testing/mozharness/configs/update_tests/mozilla-beta.py.orig	2015-08-11 19:24:52.000000000 +0000
-+++ testing/mozharness/configs/update_tests/mozilla-beta.py
-@@ -0,0 +1,18 @@
-+from mozharness.base.script import platform_name
-+
-+PLATFORM_CONFIG = {
-+    'linux64': {
-+        'update_verify_config': 'mozBeta-firefox-linux64.cfg'
-+    },
-+    'macosx': {
-+        'update_verify_config': 'mozBeta-firefox-mac64.cfg'
-+    },
-+    'win32': {
-+        'update_verify_config': 'mozBeta-firefox-win32.cfg'
-+    },
-+}
-+
-+config = PLATFORM_CONFIG[platform_name()]
-+config.update({
-+    'firefox_ui_branch': 'mozilla-beta'
-+})
diff --git a/www/firefox/patches/patch-testing_mozharness_configs_update__tests_mozilla-release.py b/www/firefox/patches/patch-testing_mozharness_configs_update__tests_mozilla-release.py
deleted file mode 100644
index 037ccf7dbbc..00000000000
--- a/www/firefox/patches/patch-testing_mozharness_configs_update__tests_mozilla-release.py
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-testing_mozharness_configs_update__tests_mozilla-release.py,v 1.1 2015/08/11 23:48:18 ryoon Exp $
-
---- testing/mozharness/configs/update_tests/mozilla-release.py.orig	2015-08-11 19:24:52.000000000 +0000
-+++ testing/mozharness/configs/update_tests/mozilla-release.py
-@@ -0,0 +1,18 @@
-+from mozharness.base.script import platform_name
-+
-+PLATFORM_CONFIG = {
-+    'linux64': {
-+        'update_verify_config': 'mozRelease-firefox-linux64.cfg'
-+    },
-+    'macosx': {
-+        'update_verify_config': 'mozRelease-firefox-mac64.cfg'
-+    },
-+    'win32': {
-+        'update_verify_config': 'mozRelease-firefox-win32.cfg'
-+    },
-+}
-+
-+config = PLATFORM_CONFIG[platform_name()]
-+config.update({
-+    'firefox_ui_branch': 'mozilla-beta'
-+})
diff --git a/www/firefox/patches/patch-testing_mozharness_configs_vcs__sync_staging__build-repos.py b/www/firefox/patches/patch-testing_mozharness_configs_vcs__sync_staging__build-repos.py
deleted file mode 100644
index e24be3e4627..00000000000
--- a/www/firefox/patches/patch-testing_mozharness_configs_vcs__sync_staging__build-repos.py
+++ /dev/null
@@ -1,118 +0,0 @@
-$NetBSD: patch-testing_mozharness_configs_vcs__sync_staging__build-repos.py,v 1.1 2015/08/11 23:48:18 ryoon Exp $
-
---- testing/mozharness/configs/vcs_sync/staging_build-repos.py.orig	2015-08-11 19:24:52.000000000 +0000
-+++ testing/mozharness/configs/vcs_sync/staging_build-repos.py
-@@ -0,0 +1,113 @@
-+import os
-+import socket
-+hostname = socket.gethostname()
-+
-+build_repos = (
-+    'autoland',
-+    'buildapi',
-+    'buildbot-configs',
-+    'buildbotcustom',
-+    'cloud-tools',
-+    'mozharness',
-+    'opsi-package-sources',
-+    'partner-repacks',
-+    'preproduction',
-+    'puppet',
-+    'puppet-manifests',
-+    'rpm-sources',
-+    'talos',
-+    'tools',
-+)
-+
-+conversion_repos = []
-+remote_targets = {}
-+
-+for repo in build_repos:
-+    conversion_repos.append({
-+        "repo": "https://hg.mozilla.org/build/%s" % repo,
-+        "repo_name": "build-%s" % repo,
-+        "conversion_dir": "build-%s" % repo,
-+        "targets": [{
-+            "target_dest": "build-%s-github" % repo,
-+            "force_push": True
-+        }],
-+        "vcs": "hg",
-+        "mapper": {
-+            "url": "https://api-pub-build.allizom.org/mapper",
-+            "project": "build-%s" % repo,
-+        },
-+        "branch_config": {
-+            "branches": {
-+                "default": "master",
-+            },
-+            "branch_regexes": [
-+                "^.*$"
-+            ]
-+        },
-+        "tag_config": {
-+            "tag_regexes": [
-+                "^.*$"
-+            ]
-+        },
-+        "generate_git_notes": True, # False by default
-+    })
-+    remote_targets["build-%s-github" % repo] = {
-+        "repo": "git@github.com:petermoore/build-%s.git" % repo,
-+        "ssh_key": "~/.ssh/github_mozilla_rsa",
-+        "vcs": "git",
-+    }
-+
-+config = {
-+    "log_name": "build-repos",
-+    "log_max_rotate": 99,
-+    "job_name": "build-repos",
-+    "env": {
-+        "PATH": "%(PATH)s:/usr/libexec/git-core",
-+    },
-+    "conversion_repos": conversion_repos,
-+    "remote_targets": remote_targets,
-+    "virtualenv_modules": [
-+        "dulwich==0.9.0",
-+        "ordereddict==1.1",
-+        "hg-git==0.4.0-moz2",
-+        "mapper==0.1",
-+        "mercurial==2.6.3",
-+        "mozfile==0.9",
-+        "mozinfo==0.5",
-+        "mozprocess==0.11",
-+        "requests==2.2.1",
-+    ],
-+    "find_links": [
-+        "http://pypi.pub.build.mozilla.org/pub"
-+    ],
-+    "pip_index": False,
-+
-+    "default_notify_from": "developer-services@mozilla.org",
-+    "notify_config": [{
-+        "to": "releng-ops-trial@mozilla.com",
-+        "failure_only": False,
-+        "skip_empty_messages": True,
-+    }],
-+
-+    # Disallow sharing, since we want pristine .hg and .git directories.
-+    "vcs_share_base": None,
-+    "hg_share_base": None,
-+
-+    # any hg command line options
-+    "hg_options": (
-+        "--config",
-+        "web.cacerts=/etc/pki/tls/certs/ca-bundle.crt"
-+    ),
-+
-+    "default_actions": [
-+        'list-repos',
-+        'create-virtualenv',
-+        'update-stage-mirror',
-+        'update-work-mirror',
-+        'create-git-notes',
-+        'publish-to-mapper',
-+        'push',
-+        'combine-mapfiles',
-+        'notify',
-+    ],
-+}
diff --git a/www/firefox/patches/patch-testing_mozharness_configs_vcs__sync_staging__l10n.py b/www/firefox/patches/patch-testing_mozharness_configs_vcs__sync_staging__l10n.py
deleted file mode 100644
index 7fc0c02ff4d..00000000000
--- a/www/firefox/patches/patch-testing_mozharness_configs_vcs__sync_staging__l10n.py
+++ /dev/null
@@ -1,295 +0,0 @@
-$NetBSD: patch-testing_mozharness_configs_vcs__sync_staging__l10n.py,v 1.1 2015/08/11 23:48:18 ryoon Exp $
-
---- testing/mozharness/configs/vcs_sync/staging_l10n.py.orig	2015-08-11 19:24:52.000000000 +0000
-+++ testing/mozharness/configs/vcs_sync/staging_l10n.py
-@@ -0,0 +1,290 @@
-+from copy import deepcopy
-+import socket
-+hostname = socket.gethostname()
-+
-+GECKO_BRANCHES = {
-+    'v2.0': 'mozilla-beta',
-+    'v2.1': 'mozilla-aurora',
-+    'v2.2': 'mozilla-central',
-+}
-+
-+GECKO_CONFIG_TEMPLATE = {
-+
-+    'mozilla-release': {
-+        'generate_git_notes': False, # we can change this when bug 1034725 is resolved
-+        'mapper': {
-+            'project': 'gitmo-gecko-l10n',
-+            'url': 'https://api-pub-build.allizom.org/mapper'
-+        },
-+        'locales_file_url': 'https://hg.mozilla.org/releases/mozilla-release/raw-file/default/b2g/locales/all-locales',
-+        'hg_url': 'https://hg.mozilla.org/releases/l10n/mozilla-release/%(locale)s',
-+        'targets': [{
-+            'target_dest': 'releases-l10n-%(locale)s-gecko/.git',
-+            'test_push': True,
-+            'vcs': 'git'
-+        }, {
-+            'target_dest': 'gitmo-gecko-l10n-%(locale)s',
-+        }],
-+        'tag_config': {
-+            'tag_regexes': [
-+                '^B2G_',
-+            ],
-+        },
-+    },
-+
-+    'mozilla-beta': {
-+        'generate_git_notes': False, # we can change this when bug 1034725 is resolved
-+        'mapper': {
-+            'project': 'gitmo-gecko-l10n',
-+            'url': 'https://api-pub-build.allizom.org/mapper'
-+        },
-+        'locales_file_url': 'https://hg.mozilla.org/releases/mozilla-beta/raw-file/default/b2g/locales/all-locales',
-+        'hg_url': 'https://hg.mozilla.org/releases/l10n/mozilla-beta/%(locale)s',
-+        'targets': [{
-+            'target_dest': 'releases-l10n-%(locale)s-gecko/.git',
-+            'test_push': True,
-+            'vcs': 'git'
-+        }, {
-+            'target_dest': 'gitmo-gecko-l10n-%(locale)s',
-+        }],
-+        'tag_config': {
-+            'tag_regexes': [
-+                '^B2G_',
-+            ],
-+        },
-+    },
-+
-+    'mozilla-aurora': {
-+        'generate_git_notes': False, # we can change this when bug 1034725 is resolved
-+        'mapper': {
-+            'project': 'gitmo-gecko-l10n',
-+            'url': 'https://api-pub-build.allizom.org/mapper'
-+        },
-+        'locales_file_url': 'https://hg.mozilla.org/releases/mozilla-aurora/raw-file/default/b2g/locales/all-locales',
-+        'hg_url': 'https://hg.mozilla.org/releases/l10n/mozilla-aurora/%(locale)s',
-+        'targets': [{
-+            'target_dest': 'releases-l10n-%(locale)s-gecko/.git',
-+            'test_push': True,
-+            'vcs': 'git'
-+        }, {
-+            'target_dest': 'gitmo-gecko-l10n-%(locale)s',
-+        }],
-+        'tag_config': {
-+            'tag_regexes': [
-+                '^B2G_',
-+            ],
-+        },
-+    },
-+
-+    'mozilla-central': {
-+        'generate_git_notes': False, # we can change this when bug 1034725 is resolved
-+        'mapper': {
-+            'project': 'gitmo-gecko-l10n',
-+            'url': 'https://api-pub-build.allizom.org/mapper'
-+        },
-+        'locales_file_url': 'https://hg.mozilla.org/mozilla-central/raw-file/default/b2g/locales/all-locales',
-+        'hg_url': 'https://hg.mozilla.org/l10n-central/%(locale)s',
-+        'targets': [{
-+            'target_dest': 'releases-l10n-%(locale)s-gecko/.git',
-+            'test_push': True,
-+            'vcs': 'git'
-+        }, {
-+            'target_dest': 'gitmo-gecko-l10n-%(locale)s',
-+        }],
-+        'tag_config': {
-+            'tag_regexes': [
-+                '^B2G_',
-+            ],
-+        },
-+    },
-+}
-+
-+# Build gecko_config
-+GECKO_CONFIG = {}
-+for version, branch in GECKO_BRANCHES.items():
-+    GECKO_CONFIG[branch] = deepcopy(GECKO_CONFIG_TEMPLATE[branch])
-+    GECKO_CONFIG[branch]['git_branch_name'] = version
-+
-+config = {
-+    "log_name": "l10n",
-+    "log_max_rotate": 99,
-+    "job_name": "l10n",
-+    "env": {
-+        "PATH": "%(PATH)s:/usr/libexec/git-core",
-+    },
-+    "conversion_type": "b2g-l10n",
-+    "combined_mapfile": "l10n-mapfile",
-+    "l10n_config": {
-+        "gecko_config": GECKO_CONFIG,
-+        "gaia_config": {
-+            'v2_0': {
-+                'generate_git_notes': False, # we can change this when bug 1034725 is resolved
-+                'mapper': {
-+                    'project': 'gitmo-gaia-l10n',
-+                    'url': 'https://api-pub-build.allizom.org/mapper'
-+                },
-+                'locales_file_url': 'https://raw.github.com/mozilla-b2g/gaia/v2.0/locales/languages_all.json',
-+                'hg_url': 'https://hg.mozilla.org/releases/gaia-l10n/v2_0/%(locale)s',
-+                'git_branch_name': 'v2.0',
-+                'targets': [{
-+                    'target_dest': 'releases-l10n-%(locale)s-gaia/.git',
-+                    'test_push': True,
-+                    'vcs': 'git'
-+                }, {
-+                    'target_dest': 'gitmo-gaia-l10n-%(locale)s',
-+                }],
-+                'tag_config': {
-+                    'tag_regexes': [
-+                        '^B2G_',
-+                    ],
-+                },
-+            },
-+            'v1_4': {
-+                'generate_git_notes': False, # we can change this when bug 1034725 is resolved
-+                'mapper': {
-+                    'project': 'gitmo-gaia-l10n',
-+                    'url': 'https://api-pub-build.allizom.org/mapper'
-+                },
-+                'locales_file_url': 'https://raw.github.com/mozilla-b2g/gaia/v1.4/locales/languages_all.json',
-+                'hg_url': 'https://hg.mozilla.org/releases/gaia-l10n/v1_4/%(locale)s',
-+                'git_branch_name': 'v1.4',
-+                'targets': [{
-+                    'target_dest': 'releases-l10n-%(locale)s-gaia/.git',
-+                    'test_push': True,
-+                    'vcs': 'git'
-+                }, {
-+                    'target_dest': 'gitmo-gaia-l10n-%(locale)s',
-+                }],
-+                'tag_config': {
-+                    'tag_regexes': [
-+                        '^B2G_',
-+                    ],
-+                },
-+            },
-+            'v1_3': {
-+                'generate_git_notes': False, # we can change this when bug 1034725 is resolved
-+                'mapper': {
-+                    'project': 'gitmo-gaia-l10n',
-+                    'url': 'https://api-pub-build.allizom.org/mapper'
-+                },
-+                'locales_file_url': 'https://raw.github.com/mozilla-b2g/gaia/v1.3/locales/languages_dev.json',
-+                'hg_url': 'https://hg.mozilla.org/releases/gaia-l10n/v1_3/%(locale)s',
-+                'git_branch_name': 'v1.3',
-+                'targets': [{
-+                    'target_dest': 'releases-l10n-%(locale)s-gaia/.git',
-+                    'test_push': True,
-+                    'vcs': 'git'
-+                }, {
-+                    'target_dest': 'gitmo-gaia-l10n-%(locale)s',
-+                }],
-+                'tag_config': {
-+                    'tag_regexes': [
-+                        '^B2G_',
-+                    ],
-+                },
-+            },
-+            'v1_2': {
-+                'generate_git_notes': False, # we can change this when bug 1034725 is resolved
-+                'mapper': {
-+                    'project': 'gitmo-gaia-l10n',
-+                    'url': 'https://api-pub-build.allizom.org/mapper'
-+                },
-+                'locales_file_url': 'https://raw.github.com/mozilla-b2g/gaia/v1.2/locales/languages_all.json',
-+                'hg_url': 'https://hg.mozilla.org/releases/gaia-l10n/v1_2/%(locale)s',
-+                'git_branch_name': 'v1.2',
-+                'targets': [{
-+                    'target_dest': 'releases-l10n-%(locale)s-gaia/.git',
-+                    'test_push': True,
-+                    'vcs': 'git'
-+                }, {
-+                    'target_dest': 'gitmo-gaia-l10n-%(locale)s',
-+                }],
-+                'tag_config': {
-+                    'tag_regexes': [
-+                        '^B2G_',
-+                    ],
-+                },
-+            },
-+            'master': {
-+                'generate_git_notes': False, # we can change this when bug 1034725 is resolved
-+                'mapper': {
-+                    'project': 'gitmo-gaia-l10n',
-+                    'url': 'https://api-pub-build.allizom.org/mapper'
-+                },
-+                'locales_file_url': 'https://raw.github.com/mozilla-b2g/gaia/master/locales/languages_all.json',
-+                'hg_url': 'https://hg.mozilla.org/gaia-l10n/%(locale)s',
-+                'git_branch_name': 'master',
-+                'targets': [{
-+                    'target_dest': 'releases-l10n-%(locale)s-gaia/.git',
-+                    'test_push': True,
-+                    'vcs': 'git'
-+                }, {
-+                    'target_dest': 'gitmo-gaia-l10n-%(locale)s',
-+                }],
-+                'tag_config': {
-+                    'tag_regexes': [
-+                        '^B2G_',
-+                    ],
-+                },
-+            },
-+        },
-+    },
-+
-+    "remote_targets": {
-+        "gitmo-gecko-l10n-%(locale)s": {
-+            "repo": 'git@github.com:petermoore/l10n-%(locale)s-gecko.git',
-+            "ssh_key": "~/.ssh/github_mozilla_rsa",
-+            "vcs": "git",
-+        },
-+        "gitmo-gaia-l10n-%(locale)s": {
-+            "repo": 'git@github.com:petermoore/l10n-%(locale)s-gaia.git',
-+            "ssh_key": "~/.ssh/github_mozilla_rsa",
-+            "vcs": "git",
-+        },
-+    },
-+
-+    "virtualenv_modules": [
-+        "bottle==0.11.6",
-+        "dulwich==0.9.0",
-+        "ordereddict==1.1",
-+        "hg-git==0.4.0-moz2",
-+        "mapper==0.1",
-+        "mercurial==2.6.3",
-+        "mozfile==0.9",
-+        "mozinfo==0.5",
-+        "mozprocess==0.11",
-+        "requests==2.2.1",
-+    ],
-+    "find_links": [
-+        "http://pypi.pub.build.mozilla.org/pub",
-+    ],
-+    "pip_index": False,
-+
-+    "default_notify_from": "developer-services@mozilla.org",
-+    "notify_config": [{
-+        "to": "pmoore@mozilla.com",
-+        "failure_only": False,
-+        "skip_empty_messages": True,
-+    }],
-+
-+    # Disallow sharing, since we want pristine .hg and .git directories.
-+    "vcs_share_base": None,
-+    "hg_share_base": None,
-+
-+    # any hg command line options
-+    "hg_options": (
-+        "--config",
-+        "web.cacerts=/etc/pki/tls/certs/ca-bundle.crt"
-+    ),
-+
-+    "default_actions": [
-+        'list-repos',
-+        'create-virtualenv',
-+        'update-stage-mirror',
-+        'update-work-mirror',
-+        'publish-to-mapper',
-+        'push',
-+        'combine-mapfiles',
-+        'notify',
-+    ],
-+}
diff --git a/www/firefox/patches/patch-toolkit_components_osfile_modules_osfile__unix__back.jsm b/www/firefox/patches/patch-toolkit_components_osfile_modules_osfile__unix__back.jsm
deleted file mode 100644
index 10ef5717325..00000000000
--- a/www/firefox/patches/patch-toolkit_components_osfile_modules_osfile__unix__back.jsm
+++ /dev/null
@@ -1,49 +0,0 @@
-$NetBSD: patch-toolkit_components_osfile_modules_osfile__unix__back.jsm,v 1.6 2014/06/11 00:40:59 ryoon Exp $
-
-Based on martin@'s patch for firefox 27.0
-
-* Use off_t for st_size
-* Use function name for NetBSD
-
---- toolkit/components/osfile/modules/osfile_unix_back.jsm.orig	2014-05-29 23:31:41.000000000 +0000
-+++ toolkit/components/osfile/modules/osfile_unix_back.jsm
-@@ -228,8 +228,8 @@
-          let statvfs = new SharedAll.HollowStructure("statvfs",
-            Const.OSFILE_SIZEOF_STATVFS);
- 
--         statvfs.add_field_at(Const.OSFILE_OFFSETOF_STATVFS_F_BSIZE,
--                        "f_bsize", Type.unsigned_long.implementation);
-+         statvfs.add_field_at(Const.OSFILE_OFFSETOF_STATVFS_F_FRSIZE,
-+                        "f_frsize", Type.unsigned_long.implementation);
-          statvfs.add_field_at(Const.OSFILE_OFFSETOF_STATVFS_F_BAVAIL,
-                         "f_bavail", Type.fsblkcnt_t.implementation);
- 
-@@ -626,21 +626,22 @@
-            return Stat.fxstat(ver, fd, buf);
-          };
-        } else if (OS.Constants.Sys.Name == "NetBSD") {
--         // NetBSD 5.0 and newer
--         libc.declareLazyFFI(SysFile,  "stat",
--                             "__stat50", ctypes.default_abi,
-+         // NetBSD 5.0 uses *30, and netbsd-6 uses *50
-+         let v = OS.Constants.libc.OSFILE_SIZEOF_TIME_T < 8 ? "30" : "50";
-+         libc.declareLazyFFI(SysFile,  "stat", 
-+                             "__stat"+v, ctypes.default_abi,
-                       /*return*/ Type.negativeone_or_nothing,
-                       /*path*/   Type.path,
-                       /*buf*/    Type.stat.out_ptr
-                      );
-          libc.declareLazyFFI(SysFile,  "lstat",
--                             "__lstat50", ctypes.default_abi,
-+                             "__lstat"+v, ctypes.default_abi,
-                       /*return*/ Type.negativeone_or_nothing,
-                       /*path*/   Type.path,
-                       /*buf*/    Type.stat.out_ptr
-                      );
--         libc.declareLazyFFI(SysFile,  "fstat",
--                             "__fstat50", ctypes.default_abi,
-+         libc.declareLazyFFI(SysFile,  "fstat", libc,
-+                             "__fstat"+v, ctypes.default_abi,
-                       /*return*/ Type.negativeone_or_nothing,
-                       /*fd*/     Type.fd,
-                       /*buf*/    Type.stat.out_ptr
diff --git a/www/firefox/patches/patch-toolkit_components_osfile_modules_osfile__unix__front.jsm b/www/firefox/patches/patch-toolkit_components_osfile_modules_osfile__unix__front.jsm
deleted file mode 100644
index f7c135c271a..00000000000
--- a/www/firefox/patches/patch-toolkit_components_osfile_modules_osfile__unix__front.jsm
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-toolkit_components_osfile_modules_osfile__unix__front.jsm,v 1.4 2014/10/05 01:59:08 ryoon Exp $
-
---- toolkit/components/osfile/modules/osfile_unix_front.jsm.orig	2014-09-24 01:05:38.000000000 +0000
-+++ toolkit/components/osfile/modules/osfile_unix_front.jsm
-@@ -399,7 +399,7 @@
-        throw_on_negative("statvfs",  (UnixFile.statvfs || UnixFile.statfs)(sourcePath, fileSystemInfoPtr));
- 
-        let bytes = new Type.uint64_t.implementation(
--                        fileSystemInfo.f_bsize * fileSystemInfo.f_bavail);
-+                        fileSystemInfo.f_frsize * fileSystemInfo.f_bavail);
- 
-        return bytes.value;
-      };