Fix build with clang.

7 files changed, 90 insertions, 9 deletions

diff --git a/www/firefox/distinfo b/www/firefox/distinfo
index fe41fb030c4..2755cf1eae9 100644
--- a/www/firefox/distinfo
+++ b/www/firefox/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.154 2014/06/11 00:40:59 ryoon Exp $
+$NetBSD: distinfo,v 1.155 2014/06/14 16:20:07 joerg Exp $
 
 SHA1 (firefox-30.0.source.tar.bz2) = 21dce1a2d4b8085c5f7f66b5f4f60bc37598285d
 RMD160 (firefox-30.0.source.tar.bz2) = a1fce7102f9dde33c6db7869ebe600d028998875
@@ -30,9 +30,14 @@ SHA1 (patch-config_system-headers) = a582df0242d4347a03e3aa3ca0463bf0e710e654
 SHA1 (patch-config_system__wrappers_unwind.h) = b3bdac0710179b9c8f8eabd824216d0114504491
 SHA1 (patch-content_base_src_moz.build) = fc2660dcc82f11c89d6d5a5772f27c9827f58f44
 SHA1 (patch-content_media_AudioStream.cpp) = 70021dfd1cc86e8999f144b49a23bfb27dd24157
-SHA1 (patch-content_media_AudioStream.h) = ab3f68071f8ee891ccda6c2653f936582b1af58a
+SHA1 (patch-content_media_AudioStream.h) = 101cfc3714e6169753f7c0d21d9c4857d5858180
 SHA1 (patch-content_media_Makefile.in) = 54c8c5e41eb36bae0ce544360ded9f75ba3acc13
 SHA1 (patch-content_media_gstreamer_GStreamerAllocator.cpp) = 524a669e411189926e142912b6d94d3d8dbdb0eb
+SHA1 (patch-content_svg_content_src_SVGComponentTransferFunctionElement.h) = 6fb38a9a110271466f155dc4491810efb9be1dc4
+SHA1 (patch-content_svg_content_src_nsSVGFilters.cpp) = 87438dbd3e74a545e3572a2e5e7ddffcf39ce927
+SHA1 (patch-content_svg_content_src_nsSVGFilters.h) = f7bf7dc7635be2961d4ca5c5f7b35b6c93e627d4
+SHA1 (patch-dom_indexedDB_IDBEvents.cpp) = ce1a8f2449f93fa123d56c58526f5e935d829f2d
+SHA1 (patch-dom_indexedDB_IDBEvents.h) = c1da2b3c39f61c8d2ee0d234d56ca7d1a62ed83a
 SHA1 (patch-dom_plugins_ipc_PluginModuleChild.cpp) = 69b0a51d733cd52e7d200052362e0faf4ec918f1
 SHA1 (patch-dom_plugins_ipc_PluginModuleChild.h) = 0a7f3167e939822013ae6195406657453578453e
 SHA1 (patch-dom_plugins_ipc_PluginProcessChild.cpp) = 5ab28cc0398b72cb5e1b0586406845495b9f87e4
diff --git a/www/firefox/patches/patch-content_media_AudioStream.h b/www/firefox/patches/patch-content_media_AudioStream.h
index 60123f0c79a..54654b26f8a 100644
--- a/www/firefox/patches/patch-content_media_AudioStream.h
+++ b/www/firefox/patches/patch-content_media_AudioStream.h
@@ -1,6 +1,6 @@
-$NetBSD: patch-content_media_AudioStream.h,v 1.2 2014/06/11 00:40:59 ryoon Exp $
+$NetBSD: patch-content_media_AudioStream.h,v 1.3 2014/06/14 16:20:07 joerg Exp $
 
---- content/media/AudioStream.h.orig	2014-05-29 23:30:33.000000000 +0000
+--- content/media/AudioStream.h.orig	2014-06-06 01:15:20.000000000 +0000
 +++ content/media/AudioStream.h
 @@ -15,6 +15,7 @@
  #include "mozilla/StaticMutex.h"
@@ -10,12 +10,14 @@ $NetBSD: patch-content_media_AudioStream.h,v 1.2 2014/06/11 00:40:59 ryoon Exp $
  
  template <>
  class nsAutoRefTraits<cubeb_stream> : public nsPointerRefTraits<cubeb_stream>
-@@ -24,7 +25,7 @@ public:
+@@ -23,10 +24,6 @@ public:
+   static void Release(cubeb_stream* aStream) { cubeb_stream_destroy(aStream); }
  };
  
- namespace soundtouch {
+-namespace soundtouch {
 -class SoundTouch;
-+class MOZ_IMPORT_API SoundTouch;
- }
- 
+-}
+-
  namespace mozilla {
+ 
+ class AudioStream;
diff --git a/www/firefox/patches/patch-content_svg_content_src_SVGComponentTransferFunctionElement.h b/www/firefox/patches/patch-content_svg_content_src_SVGComponentTransferFunctionElement.h
new file mode 100644
index 00000000000..8008e296813
--- /dev/null
+++ b/www/firefox/patches/patch-content_svg_content_src_SVGComponentTransferFunctionElement.h
@@ -0,0 +1,13 @@
+$NetBSD: patch-content_svg_content_src_SVGComponentTransferFunctionElement.h,v 1.3 2014/06/14 16:20:07 joerg Exp $
+
+--- content/svg/content/src/SVGComponentTransferFunctionElement.h.orig	2014-06-06 01:15:20.000000000 +0000
++++ content/svg/content/src/SVGComponentTransferFunctionElement.h
+@@ -77,6 +77,8 @@ protected:
+   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/firefox/patches/patch-content_svg_content_src_nsSVGFilters.cpp b/www/firefox/patches/patch-content_svg_content_src_nsSVGFilters.cpp
new file mode 100644
index 00000000000..4a1ec96c542
--- /dev/null
+++ b/www/firefox/patches/patch-content_svg_content_src_nsSVGFilters.cpp
@@ -0,0 +1,22 @@
+$NetBSD: patch-content_svg_content_src_nsSVGFilters.cpp,v 1.3 2014/06/14 16:20:07 joerg Exp $
+
+--- content/svg/content/src/nsSVGFilters.cpp.orig	2014-06-06 01:15:20.000000000 +0000
++++ content/svg/content/src/nsSVGFilters.cpp
+@@ -67,7 +67,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
+@@ -248,8 +248,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/firefox/patches/patch-content_svg_content_src_nsSVGFilters.h b/www/firefox/patches/patch-content_svg_content_src_nsSVGFilters.h
new file mode 100644
index 00000000000..e45b347c978
--- /dev/null
+++ b/www/firefox/patches/patch-content_svg_content_src_nsSVGFilters.h
@@ -0,0 +1,13 @@
+$NetBSD: patch-content_svg_content_src_nsSVGFilters.h,v 1.3 2014/06/14 16:20:07 joerg Exp $
+
+--- content/svg/content/src/nsSVGFilters.h.orig	2014-06-06 01:15:20.000000000 +0000
++++ content/svg/content/src/nsSVGFilters.h
+@@ -148,6 +148,8 @@ protected:
+   static LengthInfo sLengthInfo[4];
+ };
+ 
++NS_DEFINE_STATIC_IID_ACCESSOR(nsSVGFE, NS_SVG_FE_CID)
++
+ typedef nsSVGElement SVGFEUnstyledElementBase;
+ 
+ class SVGFEUnstyledElement : public SVGFEUnstyledElementBase
diff --git a/www/firefox/patches/patch-dom_indexedDB_IDBEvents.cpp b/www/firefox/patches/patch-dom_indexedDB_IDBEvents.cpp
new file mode 100644
index 00000000000..1395ae74c5e
--- /dev/null
+++ b/www/firefox/patches/patch-dom_indexedDB_IDBEvents.cpp
@@ -0,0 +1,13 @@
+$NetBSD: patch-dom_indexedDB_IDBEvents.cpp,v 1.3 2014/06/14 16:20:07 joerg Exp $
+
+--- dom/indexedDB/IDBEvents.cpp.orig	2014-06-14 15:18:52.000000000 +0000
++++ 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/firefox/patches/patch-dom_indexedDB_IDBEvents.h b/www/firefox/patches/patch-dom_indexedDB_IDBEvents.h
new file mode 100644
index 00000000000..3393783998b
--- /dev/null
+++ b/www/firefox/patches/patch-dom_indexedDB_IDBEvents.h
@@ -0,0 +1,13 @@
+$NetBSD: patch-dom_indexedDB_IDBEvents.h,v 1.3 2014/06/14 16:20:07 joerg Exp $
+
+--- dom/indexedDB/IDBEvents.h.orig	2014-06-14 15:18:50.000000000 +0000
++++ 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__