Don't use dynamic_cast when RTTI is disabled. Don't add default

arguments to friends.

3 files changed, 41 insertions, 1 deletions

diff --git a/www/nvu/distinfo b/www/nvu/distinfo
index 1123ec234be..6267ea59673 100644
--- a/www/nvu/distinfo
+++ b/www/nvu/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2013/03/24 16:45:55 joerg Exp $
+$NetBSD: distinfo,v 1.7 2013/10/15 14:49:35 joerg Exp $
 
 SHA1 (nvu-1.0-sources.tar.bz2) = 438b1633cb820bbede503ef2da90f46d4e96bee8
 RMD160 (nvu-1.0-sources.tar.bz2) = 6d6fdb747d79e8602a4757e8eff8bbb21db6df8c
@@ -11,6 +11,10 @@ SHA1 (patch-al) = 5fe0093d2fa0691e9db035ce224265b438eedd3a
 SHA1 (patch-an) = 090e62c11b8d1f4d6779f5b1e1221efb43f9460e
 SHA1 (patch-ao) = eb220c4c30838216e709179cf953b9cbb9696421
 SHA1 (patch-ap) = 35a193158e43d57a1c31270214140afbb3cebb56
+SHA1 (patch-composer_base_dialogs_EdImageProps.js) = da39a3ee5e6b4b0d3255bfef95601890afd80709
+SHA1 (patch-composer_base_dialogs_EdLinkProps.js) = da39a3ee5e6b4b0d3255bfef95601890afd80709
+SHA1 (patch-editor_libeditor_html_nsHTMLEditRules.cpp) = da39a3ee5e6b4b0d3255bfef95601890afd80709
+SHA1 (patch-layout_xul_base_src_nsStackFrame.h) = 56eda32dd08e90661b5244f64bd078ba55bee61c
 SHA1 (patch-netwerk_protocol_http_src_nshttpconnectionmgr_cpp) = 5b14d68932a3dd2be9e57f130e825150de8cc8dd
 SHA1 (patch-nsprpub_config_Makefile.in) = daf6423b53385c32e658fa5d93e33a0c5f31ca91
 SHA1 (patch-nsprpub_lib_ds_Makefile.in) = 3620eee6be375bfa3afc2008fbe714bbbb670a27
@@ -22,6 +26,7 @@ SHA1 (patch-security_nss_lib_nss_config.mk) = 870321ea256dbb3d5bf187460f7b6b4329
 SHA1 (patch-security_nss_lib_smime_config.mk) = e7b89c537574af70e3e14f334d46a77e1dbc4bc0
 SHA1 (patch-security_nss_lib_softoken_config.mk) = c1110bad9779d241582d14c62a14b564664ecaa3
 SHA1 (patch-security_nss_lib_ssl_config.mk) = 9c428af47fcdd3d879dab41297d2714e40587bb7
+SHA1 (patch-xpcom_base_nsTraceRefcntImpl.cpp) = 5478e0791796dc7639f5cb33f543e565859e3245
 SHA1 (patch-xpcom_ds_nsBaseHashtable.h) = 72af3045b04104fcf9cb8b5e0c278ccbec9680ca
 SHA1 (patch-xpcom_ds_nsClassHashtable.h) = 6ebed99e3ee8709cee2cfd9ed61a2a6197fe8595
 SHA1 (patch-xpcom_ds_nsInterfaceHashtable.h) = a1922d87d364e2b8f592ac49098b23ab744e8930
diff --git a/www/nvu/patches/patch-layout_xul_base_src_nsStackFrame.h b/www/nvu/patches/patch-layout_xul_base_src_nsStackFrame.h
new file mode 100644
index 00000000000..4fd07e724c5
--- /dev/null
+++ b/www/nvu/patches/patch-layout_xul_base_src_nsStackFrame.h
@@ -0,0 +1,13 @@
+$NetBSD: patch-layout_xul_base_src_nsStackFrame.h,v 1.1 2013/10/15 14:49:35 joerg Exp $
+
+--- layout/xul/base/src/nsStackFrame.h.orig	2013-10-14 22:38:42.000000000 +0000
++++ layout/xul/base/src/nsStackFrame.h
+@@ -52,7 +52,7 @@ class nsStackFrame : public nsBoxFrame
+ {
+ public:
+ 
+-  friend nsresult NS_NewStackFrame(nsIPresShell* aPresShell, nsIFrame** aNewFrame, nsIBoxLayout* aLayout = nsnull);
++  friend nsresult NS_NewStackFrame(nsIPresShell* aPresShell, nsIFrame** aNewFrame, nsIBoxLayout* aLayout);
+ 
+ #ifdef NS_DEBUG
+   NS_IMETHOD GetFrameName(nsAString& aResult) const
diff --git a/www/nvu/patches/patch-xpcom_base_nsTraceRefcntImpl.cpp b/www/nvu/patches/patch-xpcom_base_nsTraceRefcntImpl.cpp
new file mode 100644
index 00000000000..6dd96753412
--- /dev/null
+++ b/www/nvu/patches/patch-xpcom_base_nsTraceRefcntImpl.cpp
@@ -0,0 +1,22 @@
+$NetBSD: patch-xpcom_base_nsTraceRefcntImpl.cpp,v 1.1 2013/10/15 14:49:35 joerg Exp $
+
+--- xpcom/base/nsTraceRefcntImpl.cpp.orig	2004-02-11 07:16:10.000000000 +0000
++++ xpcom/base/nsTraceRefcntImpl.cpp
+@@ -1304,7 +1304,7 @@ nsTraceRefcntImpl::LogAddCOMPtr(void* aC
+ {
+ #if defined(NS_BUILD_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,
+@@ -1347,7 +1347,7 @@ nsTraceRefcntImpl::LogReleaseCOMPtr(void
+ {
+ #if defined(NS_BUILD_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,