Pointers do not have an order relative to 0, don't try to use that.

4 files changed, 30 insertions, 2 deletions

diff --git a/mail/thunderbird24/distinfo b/mail/thunderbird24/distinfo
index e45d3348db2..d423f6ebbd9 100644
--- a/mail/thunderbird24/distinfo
+++ b/mail/thunderbird24/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2016/01/20 22:14:13 ryoon Exp $
+$NetBSD: distinfo,v 1.6 2016/12/23 22:29:59 joerg Exp $
 
 SHA1 (enigmail-1.7.2.tar.gz) = e72eeff5a47491267981090129b0b2594b5dc96f
 RMD160 (enigmail-1.7.2.tar.gz) = 1dcd10e758321846eb20ac7f1d3ae6465c47bfe7
@@ -82,6 +82,7 @@ SHA1 (patch-mozilla_js_src_jit_AsmJSSignalHandlers.cpp) = b269cc99cf2a432ea3511b
 SHA1 (patch-mozilla_js_src_jsapi-tests_Makefile.in) = 040808720c8fdd82e99893dd2b9fe348a026104b
 SHA1 (patch-mozilla_js_src_jscompartment.h) = 0d51fc8b33130eb47c96e73852318ddb57cabc79
 SHA1 (patch-mozilla_js_src_jsmath.cpp) = b02ecb4a64c6b486645ffdf0446430db9e2dcd71
+SHA1 (patch-mozilla_js_src_jsopcode.cpp) = 7a1c093c365de47d11da3326012c3cc55e4a2b67
 SHA1 (patch-mozilla_js_src_shell_Makefile.in) = c417ab32d5793b7a5167b172b2073087a7d4c638
 SHA1 (patch-mozilla_js_src_vm_ObjectImpl-inl.h) = 266dbcfaef9381cbe8491e2f0f5585c139f58fab
 SHA1 (patch-mozilla_js_src_vm_SPSProfiler.cpp) = be1917d701527106ff9e7c9779542d8c08cd4e50
diff --git a/mail/thunderbird24/patches/patch-mozilla_js_src_jsopcode.cpp b/mail/thunderbird24/patches/patch-mozilla_js_src_jsopcode.cpp
new file mode 100644
index 00000000000..247569dffdc
--- /dev/null
+++ b/mail/thunderbird24/patches/patch-mozilla_js_src_jsopcode.cpp
@@ -0,0 +1,13 @@
+$NetBSD: patch-mozilla_js_src_jsopcode.cpp,v 1.1 2016/12/23 22:29:59 joerg Exp $
+
+--- mozilla/js/src/jsopcode.cpp.orig	2014-09-24 05:25:05.000000000 +0000
++++ mozilla/js/src/jsopcode.cpp
+@@ -1391,7 +1391,7 @@ ExpressionDecompiler::write(JSString *st
+ bool
+ ExpressionDecompiler::quote(JSString *s, uint32_t quote)
+ {
+-    return QuoteString(&sprinter, s, quote) >= 0;
++    return QuoteString(&sprinter, s, quote);
+ }
+ 
+ JSAtom *
diff --git a/mail/thunderbird31/distinfo b/mail/thunderbird31/distinfo
index 82d3921fe54..df5d25614ea 100644
--- a/mail/thunderbird31/distinfo
+++ b/mail/thunderbird31/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2016/01/31 23:43:48 joerg Exp $
+$NetBSD: distinfo,v 1.6 2016/12/23 22:29:59 joerg Exp $
 
 SHA1 (enigmail-1.7.2.tar.gz) = e72eeff5a47491267981090129b0b2594b5dc96f
 RMD160 (enigmail-1.7.2.tar.gz) = 1dcd10e758321846eb20ac7f1d3ae6465c47bfe7
@@ -98,6 +98,7 @@ SHA1 (patch-mozilla_js_src_frontend_BytecodeCompiler.cpp) = 876d1438194becc19a01
 SHA1 (patch-mozilla_js_src_frontend_ParseMaps.cpp) = d7f45bde1f819786c45225600697f14769bed946
 SHA1 (patch-mozilla_js_src_gc_Memory.cpp) = b09074af9f08c142ba83a634a9c93672c1d9252d
 SHA1 (patch-mozilla_js_src_jsmath.cpp) = b02ecb4a64c6b486645ffdf0446430db9e2dcd71
+SHA1 (patch-mozilla_js_src_jsopcode.cpp) = e5ff69b8e370dc78d94d817bf4bf53bceea67fca
 SHA1 (patch-mozilla_js_src_vm_SPSProfiler.cpp) = 35df0beb0c2f7d233d21c4214281002412b7d5dd
 SHA1 (patch-mozilla_js_xpconnect_wrapper_XrayWrapper.cpp) = 374f7236c6c141489d699edc7368bc5ec3ded2f8
 SHA1 (patch-mozilla_media_libcubeb_src_Makefile.in) = 8c809178a1f427302d58fc8776a9371b78a7ca7e
diff --git a/mail/thunderbird31/patches/patch-mozilla_js_src_jsopcode.cpp b/mail/thunderbird31/patches/patch-mozilla_js_src_jsopcode.cpp
new file mode 100644
index 00000000000..b2133830e52
--- /dev/null
+++ b/mail/thunderbird31/patches/patch-mozilla_js_src_jsopcode.cpp
@@ -0,0 +1,13 @@
+$NetBSD: patch-mozilla_js_src_jsopcode.cpp,v 1.1 2016/12/23 22:29:59 joerg Exp $
+
+--- mozilla/js/src/jsopcode.cpp.orig	2015-05-07 18:53:52.000000000 +0000
++++ mozilla/js/src/jsopcode.cpp
+@@ -1609,7 +1609,7 @@ ExpressionDecompiler::write(JSString* st
+ bool
+ ExpressionDecompiler::quote(JSString* s, uint32_t quote)
+ {
+-    return QuoteString(&sprinter, s, quote) >= 0;
++    return QuoteString(&sprinter, s, quote);
+ }
+ 
+ JSAtom*