Re-enable -Werror=char-subscripts and fix the fallout in the code.

Per discussion with ryoon@.
Bump PKGREVISION for this and the previous two commits.

15 files changed, 216 insertions, 55 deletions

diff --git a/www/firefox/Makefile b/www/firefox/Makefile
index f37668c47f1..cc7e78db75f 100644
--- a/www/firefox/Makefile
+++ b/www/firefox/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.193 2015/02/14 07:59:24 martin Exp $
+# $NetBSD: Makefile,v 1.194 2015/02/16 16:16:16 bad Exp $
 
 FIREFOX_VER=	${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
 MOZ_BRANCH=	35.0
@@ -6,7 +6,7 @@ MOZ_BRANCH_MINOR=	.1
 
 DISTNAME=	firefox-${FIREFOX_VER}.source
 PKGNAME=	firefox-${MOZ_BRANCH}${MOZ_BRANCH_MINOR:S/b/beta/:S/esr//}
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/}
 MASTER_SITES+=	${MASTER_SITE_MOZILLA_ALL:=firefox/releases/${FIREFOX_VER}/source/}
diff --git a/www/firefox/distinfo b/www/firefox/distinfo
index 08b4e36e773..6360b1166a8 100644
--- a/www/firefox/distinfo
+++ b/www/firefox/distinfo
@@ -1,13 +1,13 @@
-$NetBSD: distinfo,v 1.186 2015/02/15 02:08:29 ryoon Exp $
+$NetBSD: distinfo,v 1.187 2015/02/16 16:16:16 bad Exp $
 
 SHA1 (firefox-35.0.1.source.tar.bz2) = cf256ee1491ee502eb4432ade5a879104ebceede
 RMD160 (firefox-35.0.1.source.tar.bz2) = ca4dc6f6c5de1e6e69133de3b8b502991d519fa7
 Size (firefox-35.0.1.source.tar.bz2) = 176276361 bytes
-SHA1 (patch-aa) = f493d2eda255a9337487a3ba9b3fd442942a0312
+SHA1 (patch-aa) = 3bdbeb9a11e79ab35ea0f37aeb0a1c55bfd21340
 SHA1 (patch-ak) = ebbb0c0c6e7923acc056f15ebd11307726ec65dc
 SHA1 (patch-al) = cca5df21d018bb9f428ad26d00718f33afe88ec5
 SHA1 (patch-ao) = ca7e6723a10b9f6e3306cd12557e1856727edee9
-SHA1 (patch-as) = 5b360bfa035dd4ce036afc194dd9129ac3b45efd
+SHA1 (patch-as) = 6630ac63a5b0169c47dbc91bdabf7602e3979a8a
 SHA1 (patch-bf) = 75c971043e9f693203d6bd670b2c20c4952a7756
 SHA1 (patch-bg) = d6c02294765265d9e85cf49c22320d88573c2e25
 SHA1 (patch-browser_app_nsBrowserApp.cpp) = 18f29d7a41ba088e332915e7f81b8fcccd95f673
@@ -33,7 +33,7 @@ SHA1 (patch-content_media_moz.build) = d7c41801b9325d7d7eb756e5b0de8c6d78460a4f
 SHA1 (patch-dom_plugins_ipc_PluginModuleChild.cpp) = 69b0a51d733cd52e7d200052362e0faf4ec918f1
 SHA1 (patch-dom_plugins_ipc_PluginModuleChild.h) = 0a7f3167e939822013ae6195406657453578453e
 SHA1 (patch-dom_plugins_ipc_PluginProcessChild.cpp) = 5ab28cc0398b72cb5e1b0586406845495b9f87e4
-SHA1 (patch-dom_system_OSFileConstants.cpp) = fec01c3c2c1b7e1c57abe9ec269067ee98eede3d
+SHA1 (patch-dom_system_OSFileConstants.cpp) = 4fe5d4ecf6116c7163ee6d2322db8b1b783fe5ec
 SHA1 (patch-extensions_spellcheck_hunspell_src_mozHunspell.cpp) = a00f1ec785a47d90367dbdc8bc984e1771f0140e
 SHA1 (patch-gfx_graphite2_moz-gr-update.sh) = b987dad1bd4513b8a04fb280bd1c5280a03af746
 SHA1 (patch-gfx_graphite2_src_Bidi.cpp) = 5e80b4a32a47ae44d237fec69ea87bdd612a76ce
@@ -75,25 +75,36 @@ SHA1 (patch-js_src_asmjs_AsmJSSignalHandlers.cpp) = 4d994e1f6b9a2bfc01204eb96f00
 SHA1 (patch-js_src_ctypes_CTypes.h) = 768a084239f92a424c1c7dc9eaaf9be9456ca9f0
 SHA1 (patch-js_src_frontend_ParseMaps.cpp) = c00117d79b78904bc50a1d664a8fc0e4e339bfbc
 SHA1 (patch-js_src_gc_Memory.cpp) = f2ee54f0a05d870651a3235b95bbb346586f3c3c
+SHA1 (patch-js_src_gc_Statistics.cpp) = 227d047f5befeff2a619e8bec9e98d69a78adf5c
+SHA1 (patch-js_src_jit-LIR.cpp) = 4231ab9271b12ca712492e2cdbd4e1e82e108b68
 SHA1 (patch-js_src_jit_ExecutableAllocator.h) = 24bb91e5be41cc4a7658d633c9f4f7c0dc64fd8a
+SHA1 (patch-js_src_jit_MIR.cpp) = 64071494d1aac905e95d25046f0cf1f9f96b74e9
 SHA1 (patch-js_src_jit_arm_Architecture-arm.cpp) = c1ff7591bd9b8b4a7aea254f674d25b89345f099
+SHA1 (patch-js_src_jsapi.cpp) = 3ef2e22026708d58414061d7054af0d8b797e478
+SHA1 (patch-js_src_jsdate.cpp) = b09c240f3108d4e95a899405d3d301bd4d6879ba
+SHA1 (patch-js_src_jskwgen.cpp) = 34d3b92e13366d4b43ff755ad54f392c116d5c59
 SHA1 (patch-js_src_jsmath.cpp) = 7d4993ae91e9b5e6820358165603819aefb586f9
+SHA1 (patch-js_src_shell_jsoptparse.cpp) = 8e1991fe8a62723bf4dc1457069702a1b5e19f07
 SHA1 (patch-js_xpconnect_src_xpcprivate.h) = 8a15ff542c9d3fce448d9ec63706f7dfb411d926
 SHA1 (patch-media_libcubeb_AUTHORS) = 3db32086f98c2bbe16e9394bb5121d7a95cdb4af
 SHA1 (patch-media_libcubeb_src_cubeb.c) = effe8771e42adddb478ecb302352ef003bdd01db
-SHA1 (patch-media_libcubeb_src_cubeb__alsa.c) = 8c275bf024bf23dc42f82e6a0765ddc8b18bc1a9
+SHA1 (patch-media_libcubeb_src_cubeb__alsa.c) = c1ed44b00bd189e0c847cb4d21db3101f0767753
 SHA1 (patch-media_libcubeb_src_cubeb__oss.c) = 2e178fb158c39660fcb29c1e5818751d7e557a66
 SHA1 (patch-media_libcubeb_src_moz.build) = a793f0dd1bd90d9a9a967dbef8da1183cd909b7c
 SHA1 (patch-media_libpng_pngpriv.h) = c9cefd1b5dd85fbd0c875c3f9bc108975398fe3a
 SHA1 (patch-media_libsoundtouch_src_cpu__detect__x86.cpp) = db61737afa7773e8cbd82976de3a02c917174696
 SHA1 (patch-media_libstagefright_frameworks_av_include_media_stagefright_foundation_AString.h) = 1325f23c87d2bb3fc0071b4cf0054e854dfea689
 SHA1 (patch-media_libstagefright_frameworks_av_media_libstagefright_foundation_AString.cpp) = fdadd8b7e28290aabae4bab78597b4968f63eaf1
+SHA1 (patch-media_libstagefright_system_core_liblog_fake__log__device.c) = b59809a7292d41bdb352bc425dc46273f1c0c270
+SHA1 (patch-media_libstagefright_system_core_liblog_logprint.c) = 56c5590b57caf568e12f8ff7df07daec281855de
 SHA1 (patch-media_libtheora_Makefile.in) = 80ac9cb20760fe4d94047f7cb1c6a16bbdd6b505
 SHA1 (patch-media_libtheora_lib_arm_armcpu.c) = 4b215277f9c81154377d401166023c1bf78a3718
+SHA1 (patch-media_libtheora_lib_info.c) = cb7628134427aaa4d5824c0e0770c30e5111a933
 SHA1 (patch-media_libtheora_moz.build) = 2763d7df258bd41ca776aa7461b0c5be646fa61c
 SHA1 (patch-media_libtremor_Makefile.in) = 497d03646caa721bdd129de365aadea8466043af
 SHA1 (patch-media_libtremor_moz.build) = 994b04e4c344a91c4b474a752ddc4ca0e2732910
 SHA1 (patch-media_libvorbis_Makefile.in) = fd1ce15268eed9c97dd0774398d559cdbed63e53
+SHA1 (patch-media_libvorbis_lib_vorbis_info.c) = 1d85195a5553202b0c38dc8dec6db1f4f0513e5f
 SHA1 (patch-media_libvorbis_moz.build) = 927f7848305eb2341c9efa96800d30b4a1b8eaa4
 SHA1 (patch-media_libyuv_include_libyuv_scale__row.h) = 503b6f2065e9d548a1f01f7158d65874f4886c78
 SHA1 (patch-media_mtransport_third__party_nICEr_src_util_mbslen.c) = 087e8788c72b96d2059ca82ce4282d78aed546da
diff --git a/www/firefox/patches/patch-aa b/www/firefox/patches/patch-aa
index 43b6802a705..91ae74fbbdc 100644
--- a/www/firefox/patches/patch-aa
+++ b/www/firefox/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.33 2015/01/16 22:42:09 ryoon Exp $
+$NetBSD: patch-aa,v 1.34 2015/02/16 16:16:17 bad Exp $
 
 * The profiler does not support Darwin/PPC so don't try to enable it
   on that platform.
@@ -13,18 +13,9 @@ $NetBSD: patch-aa,v 1.33 2015/01/16 22:42:09 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-01-09 04:38:18.000000000 +0000
-+++ configure.in
-@@ -1444,7 +1444,7 @@ if test "$GNU_CC"; then
-     _WARNINGS_CFLAGS="${_WARNINGS_CFLAGS} -Wtype-limits"
- 
-     # Treat some warnings as errors:
--    _WARNINGS_CFLAGS="${_WARNINGS_CFLAGS} -Werror=char-subscripts"
-+    #_WARNINGS_CFLAGS="${_WARNINGS_CFLAGS} -Werror=char-subscripts"
-     _WARNINGS_CFLAGS="${_WARNINGS_CFLAGS} -Werror=comment"
-     _WARNINGS_CFLAGS="${_WARNINGS_CFLAGS} -Werror=endif-labels"
-     _WARNINGS_CFLAGS="${_WARNINGS_CFLAGS} -Werror=enum-compare"
-@@ -1717,7 +1717,13 @@ Linux)
+--- configure.in.orig	2015-01-23 05:59:59.000000000 +0000
++++ configure.in	2015-02-16 12:58:08.000000000 +0000
+@@ -1717,7 +1717,13 @@
          MOZ_ENABLE_PROFILER_SPS=
      esac
      ;;
@@ -39,7 +30,7 @@ $NetBSD: patch-aa,v 1.33 2015/01/16 22:42:09 ryoon Exp $
  *)
      MOZ_ENABLE_PROFILER_SPS=
      ;;
-@@ -1821,7 +1827,7 @@ case "$host" in
+@@ -1821,7 +1827,7 @@
      ;;
  
  *-darwin*)
@@ -48,7 +39,7 @@ $NetBSD: patch-aa,v 1.33 2015/01/16 22:42:09 ryoon Exp $
      HOST_NSPR_MDCPUCFG='\"md/_darwin.cfg\"'
      HOST_OPTIMIZE_FLAGS="${HOST_OPTIMIZE_FLAGS=-O3}"
      ;;
-@@ -1953,7 +1959,6 @@ case "$target" in
+@@ -1953,7 +1959,6 @@
          AC_DEFINE(XP_DARWIN)
          _PLATFORM_DEFAULT_TOOLKIT='cairo-uikit'
      else
@@ -56,7 +47,7 @@ $NetBSD: patch-aa,v 1.33 2015/01/16 22:42:09 ryoon Exp $
          AC_DEFINE(XP_DARWIN)
          _PLATFORM_DEFAULT_TOOLKIT='cairo-cocoa'
          # The ExceptionHandling framework is needed for Objective-C exception
-@@ -2569,8 +2574,7 @@ MOZ_CXX11
+@@ -2569,8 +2574,7 @@
  
  AC_LANG_C
  
@@ -66,7 +57,7 @@ $NetBSD: patch-aa,v 1.33 2015/01/16 22:42:09 ryoon Exp $
  dnl ===============================================================
  if test "$GNU_CC" -a "$OS_TARGET" != WINNT; then
    AC_DEFINE(HAVE_VISIBILITY_HIDDEN_ATTRIBUTE)
-@@ -3614,6 +3618,14 @@ if test -n "$YASM"; then
+@@ -3614,6 +3618,14 @@
    _YASM_BUILD=`        echo ${YASM_VERSION} | $AWK -F\. '{ print $4 }'`
  fi
  
@@ -81,7 +72,7 @@ $NetBSD: patch-aa,v 1.33 2015/01/16 22:42:09 ryoon Exp $
  if test -z "$SKIP_LIBRARY_CHECKS"; then
  dnl system JPEG support
  dnl ========================================================
-@@ -3641,11 +3653,7 @@ if test "$MOZ_NATIVE_JPEG" = 1; then
+@@ -3641,11 +3653,7 @@
                       #include <jpeglib.h> ],
                     [ #if JPEG_LIB_VERSION < $MOZJPEG
                       #error "Insufficient JPEG library version ($MOZJPEG required)."
@@ -94,7 +85,7 @@ $NetBSD: patch-aa,v 1.33 2015/01/16 22:42:09 ryoon Exp $
                     MOZ_NATIVE_JPEG=1,
                     AC_MSG_ERROR([Insufficient JPEG library version for --with-system-jpeg]))
  fi
-@@ -4348,6 +4356,10 @@ cairo-gonk)
+@@ -4348,6 +4356,10 @@
  
  esac
  
@@ -105,7 +96,7 @@ $NetBSD: patch-aa,v 1.33 2015/01/16 22:42:09 ryoon Exp $
  AC_SUBST(MOZ_PDF_PRINTING)
  if test "$MOZ_PDF_PRINTING"; then
     PDF_SURFACE_FEATURE="#define CAIRO_HAS_PDF_SURFACE 1"
-@@ -5088,6 +5100,9 @@ if test -n "$MOZ_WEBRTC"; then
+@@ -5088,6 +5100,9 @@
      MOZ_VPX=1
      MOZ_VPX_ERROR_CONCEALMENT=1
  
@@ -115,7 +106,7 @@ $NetBSD: patch-aa,v 1.33 2015/01/16 22:42:09 ryoon Exp $
  dnl enable once Signaling lands
      MOZ_WEBRTC_SIGNALING=1
      AC_DEFINE(MOZ_WEBRTC_SIGNALING)
-@@ -5191,6 +5206,57 @@ if test "${ac_cv_c_attribute_aligned}" !
+@@ -5191,6 +5206,57 @@
  fi
  
  dnl ========================================================
@@ -173,7 +164,7 @@ $NetBSD: patch-aa,v 1.33 2015/01/16 22:42:09 ryoon Exp $
  dnl = Disable Opus audio codec support
  dnl ========================================================
  MOZ_ARG_DISABLE_BOOL(opus,
-@@ -5199,6 +5265,89 @@ MOZ_ARG_DISABLE_BOOL(opus,
+@@ -5199,6 +5265,89 @@
      MOZ_OPUS=1)
  
  dnl ========================================================
@@ -263,7 +254,7 @@ $NetBSD: patch-aa,v 1.33 2015/01/16 22:42:09 ryoon Exp $
  dnl = Disable VP8 decoder support
  dnl ========================================================
  MOZ_ARG_DISABLE_BOOL(webm,
-@@ -5557,6 +5706,60 @@ fi
+@@ -5557,6 +5706,60 @@
  AC_SUBST(MOZ_WEBM_ENCODER)
  
  dnl ==================================
@@ -324,7 +315,7 @@ $NetBSD: patch-aa,v 1.33 2015/01/16 22:42:09 ryoon Exp $
  dnl = Check alsa availability on Linux
  dnl ==================================
  
-@@ -5570,12 +5773,23 @@ MOZ_ARG_ENABLE_BOOL(alsa,
+@@ -5570,12 +5773,23 @@
     MOZ_ALSA=1,
     MOZ_ALSA=)
  
@@ -348,7 +339,7 @@ $NetBSD: patch-aa,v 1.33 2015/01/16 22:42:09 ryoon Exp $
  AC_SUBST(MOZ_ALSA)
  
  dnl ========================================================
-@@ -5999,7 +6213,9 @@ MOZ_ARG_DISABLE_BOOL(gamepad,
+@@ -5999,7 +6213,9 @@
  if test "$MOZ_GAMEPAD"; then
      case "$OS_TARGET" in
      Darwin)
@@ -359,7 +350,7 @@ $NetBSD: patch-aa,v 1.33 2015/01/16 22:42:09 ryoon Exp $
          ;;
      WINNT)
          case "$MOZ_WINSDK_MAXVER" in
-@@ -8123,6 +8339,49 @@ if test "$USE_FC_FREETYPE"; then
+@@ -8123,6 +8339,49 @@
  fi
  
  dnl ========================================================
@@ -409,7 +400,7 @@ $NetBSD: patch-aa,v 1.33 2015/01/16 22:42:09 ryoon Exp $
  dnl Check for pixman and cairo
  dnl ========================================================
  
-@@ -8378,7 +8637,7 @@ case "$OS_TARGET" in
+@@ -8378,7 +8637,7 @@
        NECKO_WIFI=1
      fi
      ;;
diff --git a/www/firefox/patches/patch-as b/www/firefox/patches/patch-as
index 7288a565054..cdc6d24582e 100644
--- a/www/firefox/patches/patch-as
+++ b/www/firefox/patches/patch-as
@@ -1,26 +1,10 @@
-$NetBSD: patch-as,v 1.15 2015/02/15 02:08:29 ryoon Exp $
+$NetBSD: patch-as,v 1.16 2015/02/16 16:16:17 bad Exp $
 
 Treat DragonFly like FreeBSD.
 
 --- js/src/configure.in.orig	2015-01-23 05:59:58.000000000 +0000
-+++ js/src/configure.in
-@@ -1200,7 +1200,6 @@ if test "$GNU_CC"; then
- 
-     # Treat some warnings as errors:
-     _WARNINGS_CFLAGS="${_WARNINGS_CFLAGS} -Werror=address"
--    _WARNINGS_CFLAGS="${_WARNINGS_CFLAGS} -Werror=char-subscripts"
-     _WARNINGS_CFLAGS="${_WARNINGS_CFLAGS} -Werror=comment"
-     _WARNINGS_CFLAGS="${_WARNINGS_CFLAGS} -Werror=empty-body"
-     _WARNINGS_CFLAGS="${_WARNINGS_CFLAGS} -Werror=endif-labels"
-@@ -1299,7 +1298,6 @@ if test "$GNU_CXX"; then
-     _WARNINGS_CXXFLAGS="${_WARNINGS_CXXFLAGS} -Wtype-limits"
- 
-     # Treat some warnings as errors:
--    _WARNINGS_CXXFLAGS="${_WARNINGS_CXXFLAGS} -Werror=char-subscripts"
-     _WARNINGS_CXXFLAGS="${_WARNINGS_CXXFLAGS} -Werror=comment"
-     _WARNINGS_CXXFLAGS="${_WARNINGS_CXXFLAGS} -Werror=empty-body"
-     _WARNINGS_CXXFLAGS="${_WARNINGS_CXXFLAGS} -Werror=endif-labels"
-@@ -2180,8 +2178,7 @@ AC_LANG_CPLUSPLUS
++++ js/src/configure.in	2015-02-16 11:09:33.000000000 +0000
+@@ -2180,8 +2180,7 @@
  
  MOZ_CXX11
  
@@ -30,7 +14,7 @@ Treat DragonFly like FreeBSD.
  dnl ===============================================================
  if test "$GNU_CC" -a "$OS_TARGET" != WINNT; then
    AC_DEFINE(HAVE_VISIBILITY_HIDDEN_ATTRIBUTE)
-@@ -3095,7 +3092,7 @@ if test "$MOZ_MEMORY"; then
+@@ -3095,7 +3094,7 @@
    *-darwin*)
      AC_DEFINE(MOZ_MEMORY_DARWIN)
      ;;
@@ -39,7 +23,7 @@ Treat DragonFly like FreeBSD.
      AC_DEFINE(MOZ_MEMORY_BSD)
      ;;
    *-android*|*-linuxandroid*)
-@@ -3989,6 +3986,16 @@ MOZ_SUBCONFIGURE_ICU()
+@@ -3989,6 +3988,16 @@
  dnl ========================================================
  dnl JavaScript shell
  dnl ========================================================
diff --git a/www/firefox/patches/patch-js_src_gc_Statistics.cpp b/www/firefox/patches/patch-js_src_gc_Statistics.cpp
new file mode 100644
index 00000000000..baddfa8dbf6
--- /dev/null
+++ b/www/firefox/patches/patch-js_src_gc_Statistics.cpp
@@ -0,0 +1,15 @@
+$NetBSD: patch-js_src_gc_Statistics.cpp,v 1.1 2015/02/16 16:16:17 bad Exp $
+
+--- js/src/gc/Statistics.cpp.orig	2015-02-05 11:52:40.000000000 +0000
++++ js/src/gc/Statistics.cpp	2015-02-05 11:52:28.000000000 +0000
+@@ -221,8 +221,8 @@
+         while (*c) {
+             if (*c == ' ' || *c == '\t')
+                 p('_');
+-            else if (isupper(*c))
+-                p(tolower(*c));
++            else if (isupper((unsigned char)*c))
++                p(tolower((unsigned char)*c));
+             else if (*c == '+')
+                 p("added_");
+             else if (*c == '-')
diff --git a/www/firefox/patches/patch-js_src_jit-LIR.cpp b/www/firefox/patches/patch-js_src_jit-LIR.cpp
new file mode 100644
index 00000000000..7d7222f642b
--- /dev/null
+++ b/www/firefox/patches/patch-js_src_jit-LIR.cpp
@@ -0,0 +1,13 @@
+$NetBSD: patch-js_src_jit-LIR.cpp,v 1.1 2015/02/16 16:16:17 bad Exp $
+
+--- js/src/jit/LIR.cpp.orig	2015-01-23 06:00:01.000000000 +0000
++++ js/src/jit/LIR.cpp	2015-02-05 12:03:55.000000000 +0000
+@@ -314,7 +314,7 @@
+     const char *name = names[op];
+     size_t len = strlen(name);
+     for (size_t i = 0; i < len; i++)
+-        fprintf(fp, "%c", tolower(name[i]));
++        fprintf(fp, "%c", tolower(((unsigned char)name[i])));
+ }
+ 
+ void
diff --git a/www/firefox/patches/patch-js_src_jit_MIR.cpp b/www/firefox/patches/patch-js_src_jit_MIR.cpp
new file mode 100644
index 00000000000..46e1bf287d6
--- /dev/null
+++ b/www/firefox/patches/patch-js_src_jit_MIR.cpp
@@ -0,0 +1,13 @@
+$NetBSD: patch-js_src_jit_MIR.cpp,v 1.1 2015/02/16 16:16:17 bad Exp $
+
+--- js/src/jit/MIR.cpp.orig	2015-01-23 06:00:01.000000000 +0000
++++ js/src/jit/MIR.cpp	2015-02-05 12:06:56.000000000 +0000
+@@ -68,7 +68,7 @@
+     const char *name = names[op];
+     size_t len = strlen(name);
+     for (size_t i = 0; i < len; i++)
+-        fprintf(fp, "%c", tolower(name[i]));
++        fprintf(fp, "%c", tolower(((unsigned char)name[i])));
+ }
+ 
+ static MConstant *
diff --git a/www/firefox/patches/patch-js_src_jsapi.cpp b/www/firefox/patches/patch-js_src_jsapi.cpp
new file mode 100644
index 00000000000..0fec6d83c77
--- /dev/null
+++ b/www/firefox/patches/patch-js_src_jsapi.cpp
@@ -0,0 +1,13 @@
+$NetBSD: patch-js_src_jsapi.cpp,v 1.1 2015/02/16 16:16:17 bad Exp $
+
+--- js/src/jsapi.cpp.orig	2015-01-23 06:00:01.000000000 +0000
++++ js/src/jsapi.cpp	2015-02-05 12:13:20.000000000 +0000
+@@ -236,7 +236,7 @@
+     assertSameCompartment(cx, args);
+     required = true;
+     while ((c = *format++) != '\0') {
+-        if (isspace(c))
++        if (isspace(((unsigned char)c)))
+             continue;
+         if (c == '/') {
+             required = false;
diff --git a/www/firefox/patches/patch-js_src_jsdate.cpp b/www/firefox/patches/patch-js_src_jsdate.cpp
new file mode 100644
index 00000000000..63ec2589569
--- /dev/null
+++ b/www/firefox/patches/patch-js_src_jsdate.cpp
@@ -0,0 +1,20 @@
+$NetBSD: patch-js_src_jsdate.cpp,v 1.1 2015/02/16 16:16:17 bad Exp $
+
+--- js/src/jsdate.cpp.orig	2015-01-23 06:00:01.000000000 +0000
++++ js/src/jsdate.cpp	2015-02-05 12:54:32.000000000 +0000
+@@ -2651,11 +2651,11 @@
+         if (strcmp(format, "%x") == 0 && result_len >= 6 &&
+             /* Format %x means use OS settings, which may have 2-digit yr, so
+                hack end of 3/11/22 or 11.03.22 or 11Mar22 to use 4-digit yr...*/
+-            !isdigit(buf[result_len - 3]) &&
+-            isdigit(buf[result_len - 2]) && isdigit(buf[result_len - 1]) &&
++            !isdigit(((unsigned char)buf[result_len - 3])) &&
++            isdigit(((unsigned char)buf[result_len - 2])) && isdigit(((unsigned char)buf[result_len - 1])) &&
+             /* ...but not if starts with 4-digit year, like 2022/3/11. */
+-            !(isdigit(buf[0]) && isdigit(buf[1]) &&
+-              isdigit(buf[2]) && isdigit(buf[3]))) {
++            !(isdigit(((unsigned char)buf[0])) && isdigit(((unsigned char)buf[1])) &&
++              isdigit(((unsigned char)buf[2])) && isdigit(((unsigned char)buf[3])))) {
+             JS_snprintf(buf + (result_len - 2), (sizeof buf) - (result_len - 2),
+                         "%d", js_DateGetYear(cx, obj));
+         }
diff --git a/www/firefox/patches/patch-js_src_jskwgen.cpp b/www/firefox/patches/patch-js_src_jskwgen.cpp
new file mode 100644
index 00000000000..c76209501bf
--- /dev/null
+++ b/www/firefox/patches/patch-js_src_jskwgen.cpp
@@ -0,0 +1,13 @@
+$NetBSD: patch-js_src_jskwgen.cpp,v 1.1 2015/02/16 16:16:17 bad Exp $
+
+--- js/src/jskwgen.cpp.orig	2015-01-23 06:00:01.000000000 +0000
++++ js/src/jskwgen.cpp	2015-02-05 11:42:30.000000000 +0000
+@@ -181,7 +181,7 @@
+         *s++ = '\\';
+         break;
+       default:
+-        if (!isprint(c)) {
++        if (!isprint(((unsigned char)c))) {
+             *s++ = '\\';
+             *s++ = (char)('0' + (0x3 & (((unsigned char)c) >> 6)));
+             *s++ = (char)('0' + (0x7 & (((unsigned char)c) >> 3)));
diff --git a/www/firefox/patches/patch-js_src_shell_jsoptparse.cpp b/www/firefox/patches/patch-js_src_shell_jsoptparse.cpp
new file mode 100644
index 00000000000..2390a8d0dfc
--- /dev/null
+++ b/www/firefox/patches/patch-js_src_shell_jsoptparse.cpp
@@ -0,0 +1,13 @@
+$NetBSD: patch-js_src_shell_jsoptparse.cpp,v 1.1 2015/02/16 16:16:17 bad Exp $
+
+--- js/src/shell/jsoptparse.cpp.orig	2015-01-23 06:00:02.000000000 +0000
++++ js/src/shell/jsoptparse.cpp	2015-02-05 13:10:47.000000000 +0000
+@@ -94,7 +94,7 @@
+ 
+         /* Delimit the current token. */
+         const char *limit = it;
+-        while (!isspace(*limit) && *limit != '\0')
++        while (!isspace(((unsigned char)*limit)) && *limit != '\0')
+             ++limit;
+ 
+         /*
diff --git a/www/firefox/patches/patch-media_libstagefright_system_core_liblog_fake__log__device.c b/www/firefox/patches/patch-media_libstagefright_system_core_liblog_fake__log__device.c
new file mode 100644
index 00000000000..4d760b2e3d5
--- /dev/null
+++ b/www/firefox/patches/patch-media_libstagefright_system_core_liblog_fake__log__device.c
@@ -0,0 +1,27 @@
+$NetBSD: patch-media_libstagefright_system_core_liblog_fake__log__device.c,v 1.1 2015/02/16 16:16:17 bad Exp $
+
+--- media/libstagefright/system/core/liblog/fake_log_device.c.orig	2015-01-23 05:59:59.000000000 +0000
++++ media/libstagefright/system/core/liblog/fake_log_device.c	2015-02-16 14:09:00.000000000 +0000
+@@ -229,11 +229,11 @@
+             char tagName[kMaxTagLen];
+             int i, minPrio;
+ 
+-            while (isspace(*tags))
++            while (isspace((unsigned char)*tags))
+                 tags++;
+ 
+             i = 0;
+-            while (*tags != '\0' && !isspace(*tags) && *tags != ':' &&
++            while (*tags != '\0' && !isspace((unsigned char)*tags) && *tags != ':' &&
+                 i < kMaxTagLen)
+             {
+                 tagName[i++] = *tags++;
+@@ -272,7 +272,7 @@
+                 }
+ 
+                 tags++;
+-                if (*tags != '\0' && !isspace(*tags)) {
++                if (*tags != '\0' && !isspace((unsigned char)*tags)) {
+                     TRACE("ERROR: garbage in tag env; expected whitespace\n");
+                     TRACE("       env='%s'\n", tags);
+                     return;
diff --git a/www/firefox/patches/patch-media_libstagefright_system_core_liblog_logprint.c b/www/firefox/patches/patch-media_libstagefright_system_core_liblog_logprint.c
new file mode 100644
index 00000000000..bd7b544df2b
--- /dev/null
+++ b/www/firefox/patches/patch-media_libstagefright_system_core_liblog_logprint.c
@@ -0,0 +1,22 @@
+$NetBSD: patch-media_libstagefright_system_core_liblog_logprint.c,v 1.1 2015/02/16 16:16:17 bad Exp $
+
+--- media/libstagefright/system/core/liblog/logprint.c.orig	2015-01-23 05:59:59.000000000 +0000
++++ media/libstagefright/system/core/liblog/logprint.c	2015-02-16 14:12:46.000000000 +0000
+@@ -101,7 +101,7 @@
+ {
+     android_LogPriority pri;
+ 
+-    c = tolower(c);
++    c = tolower((unsigned char)c);
+ 
+     if (c >= '0' && c <= '9') {
+         if (c >= ('0'+ANDROID_LOG_SILENT)) {
+@@ -370,7 +370,7 @@
+ {
+     char *end = str + strlen(str) - 1;
+ 
+-    while (end >= str && isspace(*end))
++    while (end >= str && isspace((unsigned char)*end))
+         *end-- = '\0';
+     return str;
+ }
diff --git a/www/firefox/patches/patch-media_libtheora_lib_info.c b/www/firefox/patches/patch-media_libtheora_lib_info.c
new file mode 100644
index 00000000000..7477bef5a82
--- /dev/null
+++ b/www/firefox/patches/patch-media_libtheora_lib_info.c
@@ -0,0 +1,13 @@
+$NetBSD: patch-media_libtheora_lib_info.c,v 1.1 2015/02/16 16:16:17 bad Exp $
+
+--- media/libtheora/lib/info.c.orig	2015-01-23 05:59:59.000000000 +0000
++++ media/libtheora/lib/info.c	2015-02-16 14:49:17.000000000 +0000
+@@ -29,7 +29,7 @@
+ static int oc_tagcompare(const char *_s1,const char *_s2,int _n){
+   int c;
+   for(c=0;c<_n;c++){
+-    if(toupper(_s1[c])!=toupper(_s2[c]))return !0;
++    if(toupper((unsigned char)_s1[c])!=toupper((unsigned char)_s2[c]))return !0;
+   }
+   return _s1[c]!='=';
+ }
diff --git a/www/firefox/patches/patch-media_libvorbis_lib_vorbis_info.c b/www/firefox/patches/patch-media_libvorbis_lib_vorbis_info.c
new file mode 100644
index 00000000000..c16a814af99
--- /dev/null
+++ b/www/firefox/patches/patch-media_libvorbis_lib_vorbis_info.c
@@ -0,0 +1,13 @@
+$NetBSD: patch-media_libvorbis_lib_vorbis_info.c,v 1.1 2015/02/16 16:16:17 bad Exp $
+
+--- media/libvorbis/lib/vorbis_info.c.orig	2015-01-23 05:59:59.000000000 +0000
++++ media/libvorbis/lib/vorbis_info.c	2015-02-16 14:36:05.000000000 +0000
+@@ -87,7 +87,7 @@
+ static int tagcompare(const char *s1, const char *s2, int n){
+   int c=0;
+   while(c < n){
+-    if(toupper(s1[c]) != toupper(s2[c]))
++    if(toupper((unsigned char)s1[c]) != toupper((unsigned char)s2[c]))
+       return !0;
+     c++;
+   }