More nullptr -> false changes for gcc 5.x

6 files changed, 58 insertions, 2 deletions

diff --git a/mail/thunderbird/distinfo b/mail/thunderbird/distinfo
index 2ebae322cc6..150c6970286 100644
--- a/mail/thunderbird/distinfo
+++ b/mail/thunderbird/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.159 2015/06/08 13:40:58 joerg Exp $
+$NetBSD: distinfo,v 1.160 2015/06/29 21:27:01 markd 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_ParseMaps.cpp) = d7f45bde1f819786c4522560069
 SHA1 (patch-mozilla_js_src_gc_Memory.cpp) = b09074af9f08c142ba83a634a9c93672c1d9252d
 SHA1 (patch-mozilla_js_src_jsmath.cpp) = b02ecb4a64c6b486645ffdf0446430db9e2dcd71
 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
 SHA1 (patch-mozilla_media_libcubeb_src_cubeb__alsa.c) = db2a16f6a7d19bca54bd71a488ee95a0db932a46
 SHA1 (patch-mozilla_media_libcubeb_src_moz.build) = 7058656f387417a2c22de882a9f2405a0685c2ab
@@ -125,6 +126,7 @@ SHA1 (patch-mozilla_mobile_android_installer_Makefile.in) = c2f9f4dcac0c870b64e0
 SHA1 (patch-mozilla_mobile_android_installer_package-manifest.in) = 3ed532efccca911bb70182527651d534d5146dcc
 SHA1 (patch-mozilla_modules_libjar_nsZipArchive.cpp) = c906441ba5d7f391f5e37edcf88bfdf8586d5a84
 SHA1 (patch-mozilla_netwerk_dns_Makefile.in) = b439f2a5da18fc3f3fb65118d4e99048381b26d9
+SHA1 (patch-mozilla_netwerk_ipc_NeckoParent.cpp) = 7d6c84fc8de5ce93e439c644e79e556be0b8cb75
 SHA1 (patch-mozilla_ostream) = 97351e78803053e561343e429f5eb12252b0290d
 SHA1 (patch-mozilla_probes_Makefile.in) = 2f942dadf56add19653a1995fc6ea68e491dd1c5
 SHA1 (patch-mozilla_security_manager_ssl_src_nsNSSComponent.cpp) = a881012bf1b40685fbc5f48bf5eaed50cef89f72
diff --git a/mail/thunderbird/patches/patch-mozilla_js_xpconnect_wrapper_XrayWrapper.cpp b/mail/thunderbird/patches/patch-mozilla_js_xpconnect_wrapper_XrayWrapper.cpp
new file mode 100644
index 00000000000..c41ee4e9ca8
--- /dev/null
+++ b/mail/thunderbird/patches/patch-mozilla_js_xpconnect_wrapper_XrayWrapper.cpp
@@ -0,0 +1,13 @@
+$NetBSD: patch-mozilla_js_xpconnect_wrapper_XrayWrapper.cpp,v 1.1 2015/06/29 21:27:01 markd Exp $
+
+--- mozilla/js/xpconnect/wrappers/XrayWrapper.cpp.orig	2015-05-07 18:53:42.000000000 +0000
++++ mozilla/js/xpconnect/wrappers/XrayWrapper.cpp
+@@ -351,7 +351,7 @@ public:
+         {
+             JSAutoCompartment ac(cx, target);
+             if (!JS_GetClassPrototype(cx, key, protop))
+-                return nullptr;
++                return false;
+         }
+         return JS_WrapObject(cx, protop);
+     }
diff --git a/mail/thunderbird/patches/patch-mozilla_netwerk_ipc_NeckoParent.cpp b/mail/thunderbird/patches/patch-mozilla_netwerk_ipc_NeckoParent.cpp
new file mode 100644
index 00000000000..267313d72bd
--- /dev/null
+++ b/mail/thunderbird/patches/patch-mozilla_netwerk_ipc_NeckoParent.cpp
@@ -0,0 +1,13 @@
+$NetBSD: patch-mozilla_netwerk_ipc_NeckoParent.cpp,v 1.1 2015/06/29 21:27:01 markd Exp $
+
+--- mozilla/netwerk/ipc/NeckoParent.cpp.orig	2015-05-07 18:53:46.000000000 +0000
++++ mozilla/netwerk/ipc/NeckoParent.cpp
+@@ -359,7 +359,7 @@ NeckoParent::RecvPRtspChannelConstructor
+   RtspChannelParent* p = static_cast<RtspChannelParent*>(aActor);
+   return p->Init(aConnectArgs);
+ #else
+-  return nullptr;
++  return false;
+ #endif
+ }
+ 
diff --git a/www/firefox31/distinfo b/www/firefox31/distinfo
index 8b7deb0f74f..0d80a1d9ac6 100644
--- a/www/firefox31/distinfo
+++ b/www/firefox31/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.13 2015/06/02 20:04:43 joerg Exp $
+$NetBSD: distinfo,v 1.14 2015/06/29 21:31:43 markd Exp $
 
 SHA1 (firefox-31.7.0esr.source.tar.bz2) = d8c79d4228c15ff903e79362d2392401329e027f
 RMD160 (firefox-31.7.0esr.source.tar.bz2) = 1f04f235a3b2b0f2ac5d33951ae04e2131e5fff7
@@ -93,6 +93,7 @@ SHA1 (patch-js_src_jit_arm_BaselineIC-arm.cpp) = 57ed2516904c17b7a037bb39e2d2ac2
 SHA1 (patch-js_src_jit_arm_CodeGenerator-arm.cpp) = 57c98ed86ec1544f9476138b9c1a6ef0064e69cf
 SHA1 (patch-js_src_jsmath.cpp) = 7d4993ae91e9b5e6820358165603819aefb586f9
 SHA1 (patch-js_src_vm_NumericConversions.h) = 6c2fcc21f3bf90a9305d15339442c3ed3ad8a60b
+SHA1 (patch-js_xpconnect_wrapper_XrayWrapper.cpp) = 3470a36d8d2ed35df1fcb96bd1003567c093e46e
 SHA1 (patch-mb) = b661abce429a88554fca6c930b4dbf71ba6bb5cb
 SHA1 (patch-media_libcubeb_src_Makefile.in) = fe880774789b0be54dec6fd83b89457fc8c2cabc
 SHA1 (patch-media_libcubeb_src_cubeb__alsa.c) = 5ef0de0ac875334e959ff0d4bfa43a2e5ab087b9
@@ -128,6 +129,7 @@ SHA1 (patch-mobile_android_installer_package-manifest.in) = 9664858fe3b4593eb29d
 SHA1 (patch-modules_libjar_nsZipArchive.cpp) = 6aff0f8ed42575d8ca36a524e12e9a1f7351004a
 SHA1 (patch-mozglue_build_Makefile.in) = 2383acdb12470dc4166ff433d5f121ac5dd2b6fc
 SHA1 (patch-netwerk_dns_Makefile.in) = b6bd9814d909dd6f7cff10dbeac3bedd79c2508e
+SHA1 (patch-netwerk_ipc_NeckoParent.cpp) = a27ab07df808518d3e6c6e00d0bdf93cd4e8347e
 SHA1 (patch-pb) = 97c9b2e4cefd524dc6ba825f71c3da2a761aa1f4
 SHA1 (patch-pc) = 8b2baa88f0983a2fef4f801cf6b1ae425f6c813a
 SHA1 (patch-probes_Makefile.in) = 9a8d48556daaaa17996133a6183b1d27f0510361
diff --git a/www/firefox31/patches/patch-js_xpconnect_wrapper_XrayWrapper.cpp b/www/firefox31/patches/patch-js_xpconnect_wrapper_XrayWrapper.cpp
new file mode 100644
index 00000000000..575c923bda9
--- /dev/null
+++ b/www/firefox31/patches/patch-js_xpconnect_wrapper_XrayWrapper.cpp
@@ -0,0 +1,13 @@
+$NetBSD: patch-js_xpconnect_wrapper_XrayWrapper.cpp,v 1.1 2015/06/29 21:31:43 markd Exp $
+
+--- js/xpconnect/wrappers/XrayWrapper.cpp.orig	2015-05-07 18:53:42.000000000 +0000
++++ js/xpconnect/wrappers/XrayWrapper.cpp
+@@ -351,7 +351,7 @@ public:
+         {
+             JSAutoCompartment ac(cx, target);
+             if (!JS_GetClassPrototype(cx, key, protop))
+-                return nullptr;
++                return false;
+         }
+         return JS_WrapObject(cx, protop);
+     }
diff --git a/www/firefox31/patches/patch-netwerk_ipc_NeckoParent.cpp b/www/firefox31/patches/patch-netwerk_ipc_NeckoParent.cpp
new file mode 100644
index 00000000000..63a05f12eb9
--- /dev/null
+++ b/www/firefox31/patches/patch-netwerk_ipc_NeckoParent.cpp
@@ -0,0 +1,13 @@
+$NetBSD: patch-netwerk_ipc_NeckoParent.cpp,v 1.1 2015/06/29 21:31:43 markd Exp $
+
+--- netwerk/ipc/NeckoParent.cpp.orig	2015-05-07 18:53:46.000000000 +0000
++++ netwerk/ipc/NeckoParent.cpp
+@@ -359,7 +359,7 @@ NeckoParent::RecvPRtspChannelConstructor
+   RtspChannelParent* p = static_cast<RtspChannelParent*>(aActor);
+   return p->Init(aConnectArgs);
+ #else
+-  return nullptr;
++  return false;
+ #endif
+ }
+