summaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
authormarkd <markd@pkgsrc.org>2015-06-29 21:27:01 +0000
committermarkd <markd@pkgsrc.org>2015-06-29 21:27:01 +0000
commit5e927c7ba0d5bb0f5c5272423f38944ec63e8c77 (patch)
treebaa037ff4f4482ef6ecc55c8756a1c8d9f3911a0 /www
parent2e32871f79bc78167cc8a25bf054d5a2ee0cf83e (diff)
downloadpkgsrc-5e927c7ba0d5bb0f5c5272423f38944ec63e8c77.tar.gz
More nullptr -> false changes for gcc 5.x
Diffstat (limited to 'www')
-rw-r--r--www/firefox31/distinfo4
-rw-r--r--www/firefox31/patches/patch-js_xpconnect_wrapper_XrayWrapper.cpp13
-rw-r--r--www/firefox31/patches/patch-netwerk_ipc_NeckoParent.cpp13
3 files changed, 29 insertions, 1 deletions
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
+ }
+