diff options
author | joerg <joerg@pkgsrc.org> | 2013-08-29 12:56:15 +0000 |
---|---|---|
committer | joerg <joerg@pkgsrc.org> | 2013-08-29 12:56:15 +0000 |
commit | c50c20e093b1ed45216b7bbd3de8bef3c79ecfbb (patch) | |
tree | 45e3e6bdfe924de144bf38309f80563a1fa51900 /devel/xulrunner10 | |
parent | 5b2378226307febc666fc96313a7d21d6716b2be (diff) | |
download | pkgsrc-c50c20e093b1ed45216b7bbd3de8bef3c79ecfbb.tar.gz |
Do not use dynamic_cast without RTTI, reinterpret_cast is better here
anyway. Don't use false as pointer literal.
Diffstat (limited to 'devel/xulrunner10')
16 files changed, 293 insertions, 4 deletions
diff --git a/devel/xulrunner10/distinfo b/devel/xulrunner10/distinfo index 057a4592858..82d5cd7d011 100644 --- a/devel/xulrunner10/distinfo +++ b/devel/xulrunner10/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.15 2013/05/09 13:56:11 joerg Exp $ +$NetBSD: distinfo,v 1.16 2013/08/29 12:56:15 joerg Exp $ SHA1 (firefox-10.0.12esr.source.tar.bz2) = d9086cabf06e04ef5200a8731288c0df27eb84d7 RMD160 (firefox-10.0.12esr.source.tar.bz2) = b112325fa37435d62e5e2737f2e87caf58f25b3c @@ -6,6 +6,7 @@ Size (firefox-10.0.12esr.source.tar.bz2) = 75510903 bytes SHA1 (patch-aa) = 9e353d7fb8c8be593bfccf41da6260c91e336986 SHA1 (patch-ab) = b1efa63d3f9e0dca0247037696839dbce756f88c SHA1 (patch-ac) = 4194776ef3978f261cdade72617c05c08bd33aa6 +SHA1 (patch-accessible_src_base_nsDocAccessible.h) = 1e7c3686b3462ee6a7c6b1929145cd53f607c1f3 SHA1 (patch-ad) = c5589daa0a2ec33bab17e1b6994b43313e3ba8e3 SHA1 (patch-ae) = ca217066945938eece33a6ee41ca8b8d2ccbf6f0 SHA1 (patch-af) = 57bb4796db6e039ece84641c07f18b27e372f650 @@ -32,17 +33,25 @@ SHA1 (patch-bg) = 669ca920b137d5fdd10b621013a7a02f78bfba6b SHA1 (patch-bi) = 9e76596ab9a48abdab0bfbcd9f8bb3d067c6f7bd SHA1 (patch-build_autoconf_gcc-pr49911.m4) = d994d058116875255af451c4bf411929caf8c1a9 SHA1 (patch-build_autoconf_nss.m4) = a4519ad6274102512f73eabce1c4821801aa7e77 +SHA1 (patch-content_svg_content_src_SVGNumberList.cpp) = e0541b67954f8e49c98302dccd74e63a22d579c4 +SHA1 (patch-dom_base_nsGlobalWindow.cpp) = 662c5c731d9b7fcc87d91962dad5e86c80347e32 SHA1 (patch-dom_plugins_ipc_PluginModuleChild.cpp) = ac6bd27d98b25ebe393d40ec607a152e12783e6b SHA1 (patch-dom_plugins_ipc_PluginModuleChild.h) = 927c08622eae442bcf0bb40253d801b3fb2902db +SHA1 (patch-dom_workers_XMLHttpRequestPrivate.cpp) = eb3b8891af8b353968a08dadf4272290834a1a47 +SHA1 (patch-editor_libeditor_html_nsHTMLEditor.cpp) = 1789fdd890ba0b6638f40eb88515842942eee3ee +SHA1 (patch-intl_locale_src_unix_nsDateTimeFormatUnix.cpp) = 1a5c347337ea61cb22ceb5ef00535d013441a50f +SHA1 (patch-intl_strres_src_nsStringBundleTextOverride.cpp) = d622b705180f5932a0540aab61f4c9568b4385c8 SHA1 (patch-ipc_chromium_Makefile.in) = 0bdad52dfb4ef6d4440147395c70f75b2a990a1c SHA1 (patch-ipc_chromium_chromium-config.mk) = ef9eb54c84b3b88818b136dc7ce4f67bf057c079 SHA1 (patch-ipc_chromium_src_base_base__paths.h) = 99f2ed0597e8b1fd2b791f54948eecc8bd712260 SHA1 (patch-ipc_chromium_src_base_debug__util__posic.cc) = 7e17052441aef7997ae3c4bef3a26538a334fed4 +SHA1 (patch-ipc_chromium_src_base_file__util.cc) = 1e21e18d6b6a471de8243867f1ac362a735b8732 SHA1 (patch-ipc_chromium_src_base_file__util.h) = e84b723a4a6965c6e7e3867a147841269287fb1d SHA1 (patch-ipc_chromium_src_base_file__util__bsd.cc) = b95296b23151b27a564d089fc4fd9592b75e597e -SHA1 (patch-ipc_chromium_src_base_file__util__posix.cc) = 39b5d75daedc20e2074946d68df9606d5da85b7a +SHA1 (patch-ipc_chromium_src_base_file__util__posix.cc) = 5dbb2af57571e2e00a3aee7f8211ec1e5e41b810 SHA1 (patch-ipc_chromium_src_base_message__loop.cc) = a74e738aabf54ef6241274a94ea6cbaa33ae4528 SHA1 (patch-ipc_chromium_src_base_message__pump__libevent.cc) = 77735f622c8c634c41277a183d408c6863cac23a +SHA1 (patch-ipc_chromium_src_base_pickle.cc) = a03defe19dfacc786ab3e2d9b5705f92946d0e9c SHA1 (patch-ipc_chromium_src_base_platform__file__posix.cc) = b94143682aefa761d7bb862194f3731a2945ff27 SHA1 (patch-ipc_chromium_src_base_platform__thread.h) = e4cc75547773b908da1cded05a5dd3b49670f844 SHA1 (patch-ipc_chromium_src_base_platform__thread__posix.cc) = 1c524bc9834ffec2c0d7960f9205d573a79b47fc @@ -59,10 +68,13 @@ SHA1 (patch-ipc_chromium_src_chrome_common_ipc__channel__posix.h) = b8a0af0702c5 SHA1 (patch-ipc_chromium_src_chrome_common_ipc__message__utils.h) = 6842aff28b61ac82aceb18950ec6e1cb73437415 SHA1 (patch-ipc_chromium_src_chrome_common_transport__dib.h) = 15bdec3149290a55703fbdc3d774918baed73c02 SHA1 (patch-ipc_glue_GeckoChildProcessHost.cpp) = 000666ae35b12b0351a63be0015af9ff786c8eb0 +SHA1 (patch-ipc_ipdl_ipdl_lower.py) = 8db905216e3266ba5d7cfacde1b53f790348a98e SHA1 (patch-js_src_build_autoconf_gcc-pr49911.m4) = b625b2aa7fc999ecbefcc463594776ab8a74b8db SHA1 (patch-js_src_jscpucfg.h) = 0fa443569f912497f7843012545e75b61081db7e SHA1 (patch-js_src_methodjit_MethodJIT.cpp) = 7fd28a1ae4d12b8466fbda2c04c6a2a13b78a089 SHA1 (patch-js_src_yarr_pcre_pcre.h) = 5f40ac1bddf47039f589d02d703446acd214daf6 +SHA1 (patch-js_xpconnect_src_XPCQuickStubs.cpp) = 8fdf70b20fc547096ed120cd6ac27b7fb67ad940 +SHA1 (patch-layout_generic_nsSelection.cpp) = bbb5edf60f5ed4eb7ab3d8010d9502839eb82797 SHA1 (patch-ma) = 247368e8cd2a2ce6cb2d21a2ebd942dc5b410e7a SHA1 (patch-mb) = e2a63c095399de1f1dbd6abad08df09bbec446d7 SHA1 (patch-md) = aa4edf887d1b2cfb29e845fa514dd0867f78d6bb @@ -92,6 +104,7 @@ SHA1 (patch-pd) = abdae11149b58df9aeae7444ebd149d87a1bd50d SHA1 (patch-pg) = 95bf904a5dae1d467a26210aaed7b4a96ae0e4b5 SHA1 (patch-rc) = 20986f3bafbbd76394ae3ab89de9bb95f68f590c SHA1 (patch-security_nss_cmd_shlibsign_sign.sh) = 279914123d88ad9f24236ffc33aac0f303018479 +SHA1 (patch-toolkit_components_places_nsNavHistoryResult.h) = d55dec77eb79450fd13cc2d88fda18809f64b20c SHA1 (patch-toolkit_toolkit-tiers.mk) = 2a1a47f188ef2bb263c8078315b8355f2461e878 SHA1 (patch-xa) = 56f8576c29a3187505e9de966ec3c5f22389f051 SHA1 (patch-xb) = d85e5bb9c4112a075916638b845d6cf45b891906 @@ -107,6 +120,7 @@ SHA1 (patch-xm) = af9046ec4fdb090f454bd6f42f00a18f7ee169a1 SHA1 (patch-xn) = 2e68c2974d4ffeb92669856a7fe24d9e5d250844 SHA1 (patch-xo) = 61a08cc990e670721b369c29c47172f36b0e215c SHA1 (patch-xpcom_Makefile.in) = 7d68f648cef974b47a2e6427e835b1f29ffbca72 +SHA1 (patch-xpcom_base_nsTraceRefcntImpl.cpp) = e0462db64fdf89b54024298376b48c21a0a4e0c7 SHA1 (patch-xpcom_idl-parser_header.py) = a14340cf20f74fde392df881a4f680d3d4825943 SHA1 (patch-xulrunner_app_Makefile.in) = b2d7146d8a71716db2b08c4ec0b5dcccbb348089 SHA1 (patch-xulrunner_installer_Makefile.in) = 1635515cf5930b0900a0cbb0275d7943235ab773 diff --git a/devel/xulrunner10/patches/patch-accessible_src_base_nsDocAccessible.h b/devel/xulrunner10/patches/patch-accessible_src_base_nsDocAccessible.h new file mode 100644 index 00000000000..09c07e56a84 --- /dev/null +++ b/devel/xulrunner10/patches/patch-accessible_src_base_nsDocAccessible.h @@ -0,0 +1,13 @@ +$NetBSD: patch-accessible_src_base_nsDocAccessible.h,v 1.1 2013/08/29 12:56:15 joerg Exp $ + +--- accessible/src/base/nsDocAccessible.h.orig 2013-08-28 19:31:28.000000000 +0000 ++++ accessible/src/base/nsDocAccessible.h +@@ -262,7 +262,7 @@ public: + while (acc && !acc->IsPrimaryForNode()) + acc = acc->Parent(); + +- return acc ? mNodeToAccessibleMap.Get(acc->GetNode()) : false; ++ return acc ? mNodeToAccessibleMap.Get(acc->GetNode()) != nsnull : false; + } + + /** diff --git a/devel/xulrunner10/patches/patch-content_svg_content_src_SVGNumberList.cpp b/devel/xulrunner10/patches/patch-content_svg_content_src_SVGNumberList.cpp new file mode 100644 index 00000000000..2505b104fc1 --- /dev/null +++ b/devel/xulrunner10/patches/patch-content_svg_content_src_SVGNumberList.cpp @@ -0,0 +1,13 @@ +$NetBSD: patch-content_svg_content_src_SVGNumberList.cpp,v 1.1 2013/08/29 12:56:15 joerg Exp $ + +--- content/svg/content/src/SVGNumberList.cpp.orig 2013-08-28 16:16:27.000000000 +0000 ++++ content/svg/content/src/SVGNumberList.cpp +@@ -94,7 +94,7 @@ SVGNumberList::SetValueFromString(const + while (tokenizer.hasMoreTokens()) { + CopyUTF16toUTF8(tokenizer.nextToken(), str); // NS_ConvertUTF16toUTF8 + const char *token = str.get(); +- if (token == '\0') { ++ if (token == 0) { + return NS_ERROR_DOM_SYNTAX_ERR; // nothing between commas + } + char *end; diff --git a/devel/xulrunner10/patches/patch-dom_base_nsGlobalWindow.cpp b/devel/xulrunner10/patches/patch-dom_base_nsGlobalWindow.cpp new file mode 100644 index 00000000000..ff13ba64efa --- /dev/null +++ b/devel/xulrunner10/patches/patch-dom_base_nsGlobalWindow.cpp @@ -0,0 +1,13 @@ +$NetBSD: patch-dom_base_nsGlobalWindow.cpp,v 1.1 2013/08/29 12:56:15 joerg Exp $ + +--- dom/base/nsGlobalWindow.cpp.orig 2013-08-28 16:01:56.000000000 +0000 ++++ dom/base/nsGlobalWindow.cpp +@@ -6093,7 +6093,7 @@ PostMessageReadStructuredClone(JSContext + return runtimeCallbacks->read(cx, reader, tag, data, nsnull); + } + +- return JS_FALSE; ++ return 0; + } + + static JSBool diff --git a/devel/xulrunner10/patches/patch-dom_workers_XMLHttpRequestPrivate.cpp b/devel/xulrunner10/patches/patch-dom_workers_XMLHttpRequestPrivate.cpp new file mode 100644 index 00000000000..5c0d424456f --- /dev/null +++ b/devel/xulrunner10/patches/patch-dom_workers_XMLHttpRequestPrivate.cpp @@ -0,0 +1,57 @@ +$NetBSD: patch-dom_workers_XMLHttpRequestPrivate.cpp,v 1.1 2013/08/29 12:56:15 joerg Exp $ + +--- dom/workers/XMLHttpRequestPrivate.cpp.orig 2013-08-28 16:06:26.000000000 +0000 ++++ dom/workers/XMLHttpRequestPrivate.cpp +@@ -1553,19 +1553,19 @@ XMLHttpRequestPrivate::GetAllResponseHea + mWorkerPrivate->AssertIsOnWorkerThread(); + + if (mCanceled) { +- return false; ++ return 0; + } + + if (!mProxy) { + ThrowDOMExceptionForCode(aCx, INVALID_STATE_ERR); +- return false; ++ return 0; + } + + nsCString responseHeaders; + nsRefPtr<GetAllResponseHeadersRunnable> runnable = + new GetAllResponseHeadersRunnable(mWorkerPrivate, mProxy, responseHeaders); + if (!runnable->Dispatch(aCx)) { +- return false; ++ return 0; + } + + return JS_NewStringCopyN(aCx, responseHeaders.get(), +@@ -1578,17 +1578,17 @@ XMLHttpRequestPrivate::GetResponseHeader + mWorkerPrivate->AssertIsOnWorkerThread(); + + if (mCanceled) { +- return false; ++ return 0; + } + + if (!mProxy) { + ThrowDOMExceptionForCode(aCx, INVALID_STATE_ERR); +- return false; ++ return 0; + } + + nsDependentJSString header; + if (!header.init(aCx, aHeader)) { +- return false; ++ return 0; + } + + nsCString value; +@@ -1596,7 +1596,7 @@ XMLHttpRequestPrivate::GetResponseHeader + new GetResponseHeaderRunnable(mWorkerPrivate, mProxy, + NS_ConvertUTF16toUTF8(header), value); + if (!runnable->Dispatch(aCx)) { +- return false; ++ return 0; + } + + return JS_NewStringCopyN(aCx, value.get(), value.Length()); diff --git a/devel/xulrunner10/patches/patch-editor_libeditor_html_nsHTMLEditor.cpp b/devel/xulrunner10/patches/patch-editor_libeditor_html_nsHTMLEditor.cpp new file mode 100644 index 00000000000..bd5ec7587b5 --- /dev/null +++ b/devel/xulrunner10/patches/patch-editor_libeditor_html_nsHTMLEditor.cpp @@ -0,0 +1,22 @@ +$NetBSD: patch-editor_libeditor_html_nsHTMLEditor.cpp,v 1.1 2013/08/29 12:56:15 joerg Exp $ + +--- editor/libeditor/html/nsHTMLEditor.cpp.orig 2013-08-28 16:32:03.000000000 +0000 ++++ editor/libeditor/html/nsHTMLEditor.cpp +@@ -935,7 +935,7 @@ nsHTMLEditor::GetBlockNodeParent(nsIDOMN + if (!aNode) + { + NS_NOTREACHED("null node passed to GetBlockNodeParent()"); +- return false; ++ return nsnull; + } + + nsCOMPtr<nsIDOMNode> p; +@@ -5838,7 +5838,7 @@ nsHTMLEditor::IsActiveInDOMWindow() + nsIContent* + nsHTMLEditor::GetActiveEditingHost() + { +- NS_ENSURE_TRUE(mDocWeak, false); ++ NS_ENSURE_TRUE(mDocWeak, nsnull); + + nsCOMPtr<nsIDocument> doc = do_QueryReferent(mDocWeak); + NS_ENSURE_TRUE(doc, nsnull); diff --git a/devel/xulrunner10/patches/patch-intl_locale_src_unix_nsDateTimeFormatUnix.cpp b/devel/xulrunner10/patches/patch-intl_locale_src_unix_nsDateTimeFormatUnix.cpp new file mode 100644 index 00000000000..420a3fb9a1a --- /dev/null +++ b/devel/xulrunner10/patches/patch-intl_locale_src_unix_nsDateTimeFormatUnix.cpp @@ -0,0 +1,13 @@ +$NetBSD: patch-intl_locale_src_unix_nsDateTimeFormatUnix.cpp,v 1.1 2013/08/29 12:56:15 joerg Exp $ + +--- intl/locale/src/unix/nsDateTimeFormatUnix.cpp.orig 2013-07-14 14:38:11.000000000 +0000 ++++ intl/locale/src/unix/nsDateTimeFormatUnix.cpp +@@ -133,7 +133,7 @@ void nsDateTimeFormatUnix::LocalePreferr + struct tm *tmc; + int i; + +- tt = time((time_t)NULL); ++ tt = time((time_t *)NULL); + tmc = localtime(&tt); + + tmc->tm_hour=22; // put the test sample hour to 22:00 which is 10PM diff --git a/devel/xulrunner10/patches/patch-intl_strres_src_nsStringBundleTextOverride.cpp b/devel/xulrunner10/patches/patch-intl_strres_src_nsStringBundleTextOverride.cpp new file mode 100644 index 00000000000..39f08d31112 --- /dev/null +++ b/devel/xulrunner10/patches/patch-intl_strres_src_nsStringBundleTextOverride.cpp @@ -0,0 +1,13 @@ +$NetBSD: patch-intl_strres_src_nsStringBundleTextOverride.cpp,v 1.1 2013/08/29 12:56:15 joerg Exp $ + +--- intl/strres/src/nsStringBundleTextOverride.cpp.orig 2013-07-14 14:46:54.000000000 +0000 ++++ intl/strres/src/nsStringBundleTextOverride.cpp +@@ -302,7 +302,7 @@ nsPropertyEnumeratorByURL::HasMoreElemen + } + + if (!hasMore) +- mCurrent = false; ++ mCurrent = NULL; + + *aResult = mCurrent ? true : false; + diff --git a/devel/xulrunner10/patches/patch-ipc_chromium_src_base_file__util.cc b/devel/xulrunner10/patches/patch-ipc_chromium_src_base_file__util.cc new file mode 100644 index 00000000000..cebf48b40ab --- /dev/null +++ b/devel/xulrunner10/patches/patch-ipc_chromium_src_base_file__util.cc @@ -0,0 +1,13 @@ +$NetBSD: patch-ipc_chromium_src_base_file__util.cc,v 1.1 2013/08/29 12:56:15 joerg Exp $ + +--- ipc/chromium/src/base/file_util.cc.orig 2013-01-03 17:43:14.000000000 +0000 ++++ ipc/chromium/src/base/file_util.cc +@@ -194,7 +194,7 @@ bool ReadFileToString(const FilePath& pa + FILE* CreateAndOpenTemporaryFile(FilePath* path) { + FilePath directory; + if (!GetTempDir(&directory)) +- return false; ++ return NULL; + + return CreateAndOpenTemporaryFileInDir(directory, path); + } diff --git a/devel/xulrunner10/patches/patch-ipc_chromium_src_base_file__util__posix.cc b/devel/xulrunner10/patches/patch-ipc_chromium_src_base_file__util__posix.cc index 7c63a184ccc..a4956a67743 100644 --- a/devel/xulrunner10/patches/patch-ipc_chromium_src_base_file__util__posix.cc +++ b/devel/xulrunner10/patches/patch-ipc_chromium_src_base_file__util__posix.cc @@ -1,6 +1,6 @@ -$NetBSD: patch-ipc_chromium_src_base_file__util__posix.cc,v 1.1.1.1 2012/03/15 08:58:28 ryoon Exp $ +$NetBSD: patch-ipc_chromium_src_base_file__util__posix.cc,v 1.2 2013/08/29 12:56:15 joerg Exp $ ---- ipc/chromium/src/base/file_util_posix.cc.orig 2012-03-09 22:20:16.000000000 +0000 +--- ipc/chromium/src/base/file_util_posix.cc.orig 2013-01-03 17:43:14.000000000 +0000 +++ ipc/chromium/src/base/file_util_posix.cc @@ -31,7 +31,7 @@ #include "base/time.h" @@ -11,3 +11,12 @@ $NetBSD: patch-ipc_chromium_src_base_file__util__posix.cc,v 1.1.1.1 2012/03/15 0 #define stat64 stat #endif +@@ -390,7 +390,7 @@ bool CreateTemporaryFileName(FilePath* p + FILE* CreateAndOpenTemporaryShmemFile(FilePath* path) { + FilePath directory; + if (!GetShmemTempDir(&directory)) +- return false; ++ return NULL; + + return CreateAndOpenTemporaryFileInDir(directory, path); + } diff --git a/devel/xulrunner10/patches/patch-ipc_chromium_src_base_pickle.cc b/devel/xulrunner10/patches/patch-ipc_chromium_src_base_pickle.cc new file mode 100644 index 00000000000..9954600722e --- /dev/null +++ b/devel/xulrunner10/patches/patch-ipc_chromium_src_base_pickle.cc @@ -0,0 +1,13 @@ +$NetBSD: patch-ipc_chromium_src_base_pickle.cc,v 1.1 2013/08/29 12:56:15 joerg Exp $ + +--- ipc/chromium/src/base/pickle.cc.orig 2013-01-03 17:43:14.000000000 +0000 ++++ ipc/chromium/src/base/pickle.cc +@@ -456,7 +456,7 @@ char* Pickle::BeginWriteData(int length) + "There can only be one variable buffer in a Pickle"; + + if (!WriteInt(length)) +- return false; ++ return NULL; + + char *data_ptr = BeginWrite(length); + if (!data_ptr) diff --git a/devel/xulrunner10/patches/patch-ipc_ipdl_ipdl_lower.py b/devel/xulrunner10/patches/patch-ipc_ipdl_ipdl_lower.py new file mode 100644 index 00000000000..94a64a28b9b --- /dev/null +++ b/devel/xulrunner10/patches/patch-ipc_ipdl_ipdl_lower.py @@ -0,0 +1,22 @@ +$NetBSD: patch-ipc_ipdl_ipdl_lower.py,v 1.1 2013/08/29 12:56:15 joerg Exp $ + +--- ipc/ipdl/ipdl/lower.py.orig 2013-08-28 14:34:56.000000000 +0000 ++++ ipc/ipdl/ipdl/lower.py +@@ -3367,7 +3367,7 @@ class _GenerateProtocolActorCode(ipdl.as + # SharedMemory* CreateSharedMemory(size, type, bool, id_t*): + # nsAutoPtr<SharedMemory> seg(Shmem::Alloc(size, type, unsafe)); + # if (!shmem) +- # return false ++ # return null; + # Shmem s(seg, [nextshmemid]); + # Message descriptor; + # if (!s->ShareTo(subprocess, mId, descriptor) || +@@ -3395,7 +3395,7 @@ class _GenerateProtocolActorCode(ipdl.as + p.routingId())) + ]) + failif = StmtIf(ExprNot(descriptorvar)) +- failif.addifstmt(StmtReturn.FALSE) ++ failif.addifstmt(StmtReturn(ExprLiteral.NULL)) + createshmem.addstmt(failif) + + failif = StmtIf(ExprNot(ExprCall( diff --git a/devel/xulrunner10/patches/patch-js_xpconnect_src_XPCQuickStubs.cpp b/devel/xulrunner10/patches/patch-js_xpconnect_src_XPCQuickStubs.cpp new file mode 100644 index 00000000000..4db610f28bb --- /dev/null +++ b/devel/xulrunner10/patches/patch-js_xpconnect_src_XPCQuickStubs.cpp @@ -0,0 +1,26 @@ +$NetBSD: patch-js_xpconnect_src_XPCQuickStubs.cpp,v 1.1 2013/08/29 12:56:15 joerg Exp $ + +--- js/xpconnect/src/XPCQuickStubs.cpp.orig 2013-08-28 15:54:22.000000000 +0000 ++++ js/xpconnect/src/XPCQuickStubs.cpp +@@ -190,7 +190,7 @@ GeneratePropertyOp(JSContext *cx, JSObje + JSFunction *fun = + JS_NewFunctionById(cx, PropertyOpForwarder<Op>, argc, 0, obj, id); + if (!fun) +- return JS_FALSE; ++ return 0; + + JSObject *funobj = JS_GetFunctionObject(fun); + +@@ -200,10 +200,10 @@ GeneratePropertyOp(JSContext *cx, JSObje + // second object to work around this. + JSObject *ptrobj = JS_NewObject(cx, &PointerHolderClass, nsnull, funobj); + if (!ptrobj) +- return JS_FALSE; ++ return 0; + Op *popp = new Op; + if (!popp) +- return JS_FALSE; ++ return 0; + *popp = pop; + JS_SetPrivate(cx, ptrobj, popp); + diff --git a/devel/xulrunner10/patches/patch-layout_generic_nsSelection.cpp b/devel/xulrunner10/patches/patch-layout_generic_nsSelection.cpp new file mode 100644 index 00000000000..bd709cf27a6 --- /dev/null +++ b/devel/xulrunner10/patches/patch-layout_generic_nsSelection.cpp @@ -0,0 +1,13 @@ +$NetBSD: patch-layout_generic_nsSelection.cpp,v 1.1 2013/08/29 12:56:15 joerg Exp $ + +--- layout/generic/nsSelection.cpp.orig 2013-08-28 16:44:50.000000000 +0000 ++++ layout/generic/nsSelection.cpp +@@ -3057,7 +3057,7 @@ nsIContent* + nsFrameSelection::IsInSameTable(nsIContent *aContent1, + nsIContent *aContent2) const + { +- if (!aContent1 || !aContent2) return false; ++ if (!aContent1 || !aContent2) return nsnull; + + nsIContent* tableNode1 = GetParentTable(aContent1); + nsIContent* tableNode2 = GetParentTable(aContent2); diff --git a/devel/xulrunner10/patches/patch-toolkit_components_places_nsNavHistoryResult.h b/devel/xulrunner10/patches/patch-toolkit_components_places_nsNavHistoryResult.h new file mode 100644 index 00000000000..5455885c210 --- /dev/null +++ b/devel/xulrunner10/patches/patch-toolkit_components_places_nsNavHistoryResult.h @@ -0,0 +1,13 @@ +$NetBSD: patch-toolkit_components_places_nsNavHistoryResult.h,v 1.1 2013/08/29 12:56:15 joerg Exp $ + +--- toolkit/components/places/nsNavHistoryResult.h.orig 2013-08-28 19:35:17.000000000 +0000 ++++ toolkit/components/places/nsNavHistoryResult.h +@@ -668,7 +668,7 @@ public: + { + nsCAutoString spec; + if (NS_FAILED(aURI->GetSpec(spec))) +- return false; ++ return nsnull; + return FindChildURI(spec, aNodeIndex); + } + nsNavHistoryResultNode* FindChildURI(const nsACString& aSpec, diff --git a/devel/xulrunner10/patches/patch-xpcom_base_nsTraceRefcntImpl.cpp b/devel/xulrunner10/patches/patch-xpcom_base_nsTraceRefcntImpl.cpp new file mode 100644 index 00000000000..e387cb130e3 --- /dev/null +++ b/devel/xulrunner10/patches/patch-xpcom_base_nsTraceRefcntImpl.cpp @@ -0,0 +1,22 @@ +$NetBSD: patch-xpcom_base_nsTraceRefcntImpl.cpp,v 1.1 2013/08/29 12:56:15 joerg Exp $ + +--- xpcom/base/nsTraceRefcntImpl.cpp.orig 2013-08-28 12:34:21.000000000 +0000 ++++ xpcom/base/nsTraceRefcntImpl.cpp +@@ -1187,7 +1187,7 @@ NS_LogCOMPtrAddRef(void* aCOMPtr, nsISup + { + #if defined(NS_IMPL_REFCNT_LOGGING) && defined(HAVE_CPP_DYNAMIC_CAST_TO_VOID_PTR) + // Get the most-derived object. +- void *object = dynamic_cast<void *>(aObject); ++ void *object = reinterpret_cast<void *>(aObject); + + // This is a very indirect way of finding out what the class is + // of the object being logged. If we're logging a specific type, +@@ -1228,7 +1228,7 @@ NS_LogCOMPtrRelease(void* aCOMPtr, nsISu + { + #if defined(NS_IMPL_REFCNT_LOGGING) && defined(HAVE_CPP_DYNAMIC_CAST_TO_VOID_PTR) + // Get the most-derived object. +- void *object = dynamic_cast<void *>(aObject); ++ void *object = reinterpret_cast<void *>(aObject); + + // This is a very indirect way of finding out what the class is + // of the object being logged. If we're logging a specific type, |