Be consistent about static class member initialisation.

10 files changed, 110 insertions, 3 deletions

diff --git a/mail/thunderbird/distinfo b/mail/thunderbird/distinfo
index 623c987ce03..6c26d6093f8 100644
--- a/mail/thunderbird/distinfo
+++ b/mail/thunderbird/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.141 2014/05/07 20:26:12 ryoon Exp $
+$NetBSD: distinfo,v 1.142 2014/05/18 21:28:28 joerg Exp $
 
 SHA1 (enigmail-1.6.tar.gz) = 51a7eb7d86ce24d8199f741a0079f0d56ecd6368
 RMD160 (enigmail-1.6.tar.gz) = a854bb37a6a7f298f6cc268110dcb21d00909fa4
@@ -46,6 +46,9 @@ SHA1 (patch-mozilla_config_stl__wrappers_ostream) = 67559c5ab17088680b86dea6b081
 SHA1 (patch-mozilla_config_system-headers) = 26f0b0471fcd60a834bdbbdb44093b166a7755e7
 SHA1 (patch-mozilla_config_system__wrappers_unwind.h) = 32d4ab3fbf80bf19783dab7c4a875a7262f419cf
 SHA1 (patch-mozilla_content_media_gstreamer_GStreamerFormatHelper.cpp) = 0e0f18e19b54e42814207dfdfeb1ea6cacc656d3
+SHA1 (patch-mozilla_content_svg_content_src_SVGComponentTransferFunctionElement.h) = 2ecd1de12b1d1ce885c5ca0bf0e1d7ecdfb9a514
+SHA1 (patch-mozilla_content_svg_content_src_nsSVGFilters.cpp) = 5a75926b80154dadf676e67248b6256c665001fb
+SHA1 (patch-mozilla_content_svg_content_src_nsSVGFilters.h) = a079f72aae20ce6c247c1fa50638bbedde05626e
 SHA1 (patch-mozilla_dom_plugins_ipc_PluginModuleChild.cpp) = b0b42b8790ea22a075e2de711e1881c050ff4c1f
 SHA1 (patch-mozilla_dom_plugins_ipc_PluginModuleChild.h) = ed5bcf926bce86ca73187ac13181c02e2352cc68
 SHA1 (patch-mozilla_extensions_auth_nsAuthGSSAPI.cpp) = 3b997d600f9bc4b537b001fb2efd9eff951d9bae
diff --git a/mail/thunderbird10/distinfo b/mail/thunderbird10/distinfo
index abd9e31558a..92b4930149a 100644
--- a/mail/thunderbird10/distinfo
+++ b/mail/thunderbird10/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.17 2014/01/23 19:12:27 wiz Exp $
+$NetBSD: distinfo,v 1.18 2014/05/18 21:28:28 joerg Exp $
 
 SHA1 (enigmail-1.4.tar.gz) = 1ee4bcd8d38685af44c1aeeea4fbba7bf30513e4
 RMD160 (enigmail-1.4.tar.gz) = b3c717e150c826faae1daa09806e07dd16619c51
@@ -60,6 +60,8 @@ SHA1 (patch-mm) = e9b4e83d4fee0aee0c56f85f0a320587184e2cf4
 SHA1 (patch-mn) = 043ff332b494ddc9dfff3286a4c7e296a9b352f4
 SHA1 (patch-mozilla_build_autoconf_gcc-pr49911.m4) = 84f15ee18c95829b19127b6efa46e57380528315
 SHA1 (patch-mozilla_build_autoconf_nss.m4) = 3344fd1a92508acf627371cebbb43b6f603652d5
+SHA1 (patch-mozilla_content_svg_content_src_nsSVGFilters.cpp) = d751971e2d1237f220501e6ebf4262eb2416c8aa
+SHA1 (patch-mozilla_content_svg_content_src_nsSVGFilters.h) = 948c6c1459196f819a508539b67536763374d089
 SHA1 (patch-mozilla_dom_plugins_ipc_PluginModuleChild.cpp) = 2b8ad715181bd74966dcd941aead2c84658ad8a1
 SHA1 (patch-mozilla_dom_plugins_ipc_PluginModuleChild.h) = d2e60d0809eccb651ec8b17663a524004602c2db
 SHA1 (patch-mozilla_ipc_chromium_Makefile.in) = fc1e445bae48da5b3d4f97bf78b7ef3870032a06
diff --git a/mail/thunderbird10/patches/patch-mozilla_content_svg_content_src_nsSVGFilters.cpp b/mail/thunderbird10/patches/patch-mozilla_content_svg_content_src_nsSVGFilters.cpp
new file mode 100644
index 00000000000..ebd0d79546f
--- /dev/null
+++ b/mail/thunderbird10/patches/patch-mozilla_content_svg_content_src_nsSVGFilters.cpp
@@ -0,0 +1,13 @@
+$NetBSD: patch-mozilla_content_svg_content_src_nsSVGFilters.cpp,v 1.1 2014/05/18 21:28:28 joerg Exp $
+
+--- mozilla/content/svg/content/src/nsSVGFilters.cpp.orig	2013-01-05 14:21:58.000000000 +0000
++++ mozilla/content/svg/content/src/nsSVGFilters.cpp
+@@ -119,7 +119,7 @@ nsSVGElement::LengthInfo nsSVGFE::sLengt
+ NS_IMPL_ADDREF_INHERITED(nsSVGFE,nsSVGFEBase)
+ NS_IMPL_RELEASE_INHERITED(nsSVGFE,nsSVGFEBase)
+ 
+-NS_DEFINE_STATIC_IID_ACCESSOR(nsSVGFE, NS_SVG_FE_CID)
++//NS_DEFINE_STATIC_IID_ACCESSOR(nsSVGFE, NS_SVG_FE_CID)
+ 
+ NS_INTERFACE_MAP_BEGIN(nsSVGFE)
+    // nsISupports is an ambiguous base of nsSVGFE so we have to work
diff --git a/mail/thunderbird10/patches/patch-mozilla_content_svg_content_src_nsSVGFilters.h b/mail/thunderbird10/patches/patch-mozilla_content_svg_content_src_nsSVGFilters.h
new file mode 100644
index 00000000000..cd7a1bcd7e8
--- /dev/null
+++ b/mail/thunderbird10/patches/patch-mozilla_content_svg_content_src_nsSVGFilters.h
@@ -0,0 +1,11 @@
+$NetBSD: patch-mozilla_content_svg_content_src_nsSVGFilters.h,v 1.1 2014/05/18 21:28:28 joerg Exp $
+
+--- mozilla/content/svg/content/src/nsSVGFilters.h.orig	2013-01-05 14:21:58.000000000 +0000
++++ mozilla/content/svg/content/src/nsSVGFilters.h
+@@ -237,4 +237,6 @@ protected:
+   static LengthInfo sLengthInfo[4];
+ };
+ 
++NS_DEFINE_STATIC_IID_ACCESSOR(nsSVGFE, NS_SVG_FE_CID)
++
+ #endif
diff --git a/www/seamonkey/distinfo b/www/seamonkey/distinfo
index 099d9f333e6..ed8462d930a 100644
--- a/www/seamonkey/distinfo
+++ b/www/seamonkey/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.110 2014/03/30 04:13:17 ryoon Exp $
+$NetBSD: distinfo,v 1.111 2014/05/18 21:28:28 joerg Exp $
 
 SHA1 (enigmail-1.6.1_pre20140112.tar.xz) = abb4ce7a5512095c18af7e68f4cbeb52b1e95179
 RMD160 (enigmail-1.6.1_pre20140112.tar.xz) = 617cf51d64458b9e1df332e3759cddd2b2bb34df
@@ -51,6 +51,11 @@ SHA1 (patch-mozilla_content_media_gstreamer_GStreamerReader.cpp) = 0baa576037023
 SHA1 (patch-mozilla_content_media_gstreamer_GStreamerReader.h) = c0813c20d5e64a9f6f72f90fe17be623e9a6cf04
 SHA1 (patch-mozilla_content_media_gstreamer_moz.build) = fa47b7f00063bee5d737c567f0cb0c05abea8afe
 SHA1 (patch-mozilla_content_media_test_manifest.js) = 30de2ee779ca7f3f38a6cffe41eda9d57e3dc9c2
+SHA1 (patch-mozilla_content_svg_content_src_SVGComponentTransferFunctionElement.h) = abf88990874c6a4cfc3f5dd48b1b08f9bb124f12
+SHA1 (patch-mozilla_content_svg_content_src_nsSVGFilters.cpp) = 8db7cdd6957b6d17e6e3a70edc1699e19dfa0a8b
+SHA1 (patch-mozilla_content_svg_content_src_nsSVGFilters.h) = 2f2ce2ddf9efe500c52d05898b6d81f604904393
+SHA1 (patch-mozilla_dom_indexedDB_IDBEvents.cpp) = 64646179f2182a550d20b13b2c5155e455a1874f
+SHA1 (patch-mozilla_dom_indexedDB_IDBEvents.h) = 4e6ec294dc35a54058ccd9d2ff718fa3aba3e40e
 SHA1 (patch-mozilla_dom_plugins_ipc_PluginModuleChild.cpp) = 400a5af9988d4392d92e493c73bbe61cd1915edb
 SHA1 (patch-mozilla_dom_plugins_ipc_PluginModuleChild.h) = 14038ce0ee2b38db6c7952056a97a65839a2c1a9
 SHA1 (patch-mozilla_dom_system_OSFileConstants.cpp) = d58a3f97b1cd6775e4ad531409f0f92a44563f66
diff --git a/www/seamonkey/patches/patch-mozilla_content_svg_content_src_SVGComponentTransferFunctionElement.h b/www/seamonkey/patches/patch-mozilla_content_svg_content_src_SVGComponentTransferFunctionElement.h
new file mode 100644
index 00000000000..976fc93fb32
--- /dev/null
+++ b/www/seamonkey/patches/patch-mozilla_content_svg_content_src_SVGComponentTransferFunctionElement.h
@@ -0,0 +1,12 @@
+$NetBSD: patch-mozilla_content_svg_content_src_SVGComponentTransferFunctionElement.h,v 1.1 2014/05/18 21:28:28 joerg Exp $
+
+--- mozilla/content/svg/content/src/SVGComponentTransferFunctionElement.h.orig	2014-05-17 22:38:37.000000000 +0000
++++ mozilla/content/svg/content/src/SVGComponentTransferFunctionElement.h
+@@ -76,6 +76,7 @@ protected:
+   static nsSVGEnumMapping sTypeMap[];
+   static EnumInfo sEnumInfo[1];
+ };
++NS_DEFINE_STATIC_IID_ACCESSOR(SVGComponentTransferFunctionElement, NS_SVG_FE_COMPONENT_TRANSFER_FUNCTION_ELEMENT_CID)
+ 
+ } // namespace dom
+ } // namespace mozilla
diff --git a/www/seamonkey/patches/patch-mozilla_content_svg_content_src_nsSVGFilters.cpp b/www/seamonkey/patches/patch-mozilla_content_svg_content_src_nsSVGFilters.cpp
new file mode 100644
index 00000000000..a7856af4fdf
--- /dev/null
+++ b/www/seamonkey/patches/patch-mozilla_content_svg_content_src_nsSVGFilters.cpp
@@ -0,0 +1,22 @@
+$NetBSD: patch-mozilla_content_svg_content_src_nsSVGFilters.cpp,v 1.1 2014/05/18 21:28:28 joerg Exp $
+
+--- mozilla/content/svg/content/src/nsSVGFilters.cpp.orig	2014-03-19 01:41:48.000000000 +0000
++++ mozilla/content/svg/content/src/nsSVGFilters.cpp
+@@ -67,8 +67,6 @@ nsSVGElement::LengthInfo nsSVGFE::sLengt
+ NS_IMPL_ADDREF_INHERITED(nsSVGFE,nsSVGFEBase)
+ NS_IMPL_RELEASE_INHERITED(nsSVGFE,nsSVGFEBase)
+ 
+-NS_DEFINE_STATIC_IID_ACCESSOR(nsSVGFE, NS_SVG_FE_CID)
+-
+ NS_INTERFACE_MAP_BEGIN(nsSVGFE)
+    // nsISupports is an ambiguous base of nsSVGFE so we have to work
+    // around that
+@@ -248,8 +246,6 @@ nsSVGElement::EnumInfo SVGComponentTrans
+ NS_IMPL_ADDREF_INHERITED(SVGComponentTransferFunctionElement,SVGComponentTransferFunctionElementBase)
+ NS_IMPL_RELEASE_INHERITED(SVGComponentTransferFunctionElement,SVGComponentTransferFunctionElementBase)
+ 
+-NS_DEFINE_STATIC_IID_ACCESSOR(SVGComponentTransferFunctionElement, NS_SVG_FE_COMPONENT_TRANSFER_FUNCTION_ELEMENT_CID)
+-
+ NS_INTERFACE_MAP_BEGIN(SVGComponentTransferFunctionElement)
+    // nsISupports is an ambiguous base of nsSVGFE so we have to work
+    // around that
diff --git a/www/seamonkey/patches/patch-mozilla_content_svg_content_src_nsSVGFilters.h b/www/seamonkey/patches/patch-mozilla_content_svg_content_src_nsSVGFilters.h
new file mode 100644
index 00000000000..b199ca04b51
--- /dev/null
+++ b/www/seamonkey/patches/patch-mozilla_content_svg_content_src_nsSVGFilters.h
@@ -0,0 +1,13 @@
+$NetBSD: patch-mozilla_content_svg_content_src_nsSVGFilters.h,v 1.1 2014/05/18 21:28:28 joerg Exp $
+
+--- mozilla/content/svg/content/src/nsSVGFilters.h.orig	2014-03-19 01:41:48.000000000 +0000
++++ mozilla/content/svg/content/src/nsSVGFilters.h
+@@ -213,6 +213,8 @@ protected:
+   static StringInfo sStringInfo[2];
+ };
+ 
++NS_DEFINE_STATIC_IID_ACCESSOR(nsSVGFE, NS_SVG_FE_CID)
++
+ namespace mozilla {
+ namespace dom {
+ 
diff --git a/www/seamonkey/patches/patch-mozilla_dom_indexedDB_IDBEvents.cpp b/www/seamonkey/patches/patch-mozilla_dom_indexedDB_IDBEvents.cpp
new file mode 100644
index 00000000000..0b5afb57871
--- /dev/null
+++ b/www/seamonkey/patches/patch-mozilla_dom_indexedDB_IDBEvents.cpp
@@ -0,0 +1,13 @@
+$NetBSD: patch-mozilla_dom_indexedDB_IDBEvents.cpp,v 1.1 2014/05/18 21:28:28 joerg Exp $
+
+--- mozilla/dom/indexedDB/IDBEvents.cpp.orig	2014-05-17 22:33:17.000000000 +0000
++++ mozilla/dom/indexedDB/IDBEvents.cpp
+@@ -15,8 +15,6 @@
+ USING_INDEXEDDB_NAMESPACE
+ using namespace mozilla::dom;
+ 
+-NS_DEFINE_STATIC_IID_ACCESSOR(IDBVersionChangeEvent, IDBVERSIONCHANGEEVENT_IID)
+-
+ namespace {
+ 
+ class EventFiringRunnable : public nsRunnable
diff --git a/www/seamonkey/patches/patch-mozilla_dom_indexedDB_IDBEvents.h b/www/seamonkey/patches/patch-mozilla_dom_indexedDB_IDBEvents.h
new file mode 100644
index 00000000000..7c34700f304
--- /dev/null
+++ b/www/seamonkey/patches/patch-mozilla_dom_indexedDB_IDBEvents.h
@@ -0,0 +1,13 @@
+$NetBSD: patch-mozilla_dom_indexedDB_IDBEvents.h,v 1.1 2014/05/18 21:28:28 joerg Exp $
+
+--- mozilla/dom/indexedDB/IDBEvents.h.orig	2014-05-17 22:33:14.000000000 +0000
++++ mozilla/dom/indexedDB/IDBEvents.h
+@@ -158,6 +158,8 @@ protected:
+   uint64_t mNewVersion;
+ };
+ 
++NS_DEFINE_STATIC_IID_ACCESSOR(IDBVersionChangeEvent, IDBVERSIONCHANGEEVENT_IID)
++
+ END_INDEXEDDB_NAMESPACE
+ 
+ #endif // mozilla_dom_indexeddb_idbevents_h__