From 8314b8d23194779fc4c9b4943568112da252ae05 Mon Sep 17 00:00:00 2001 From: joerg Date: Sat, 28 Jun 2014 22:51:38 +0000 Subject: Restore patches for fixing the clang build. --- www/seamonkey/distinfo | 7 ++++++- ...ntent_src_SVGComponentTransferFunctionElement.h | 12 ++++++++++++ ...ozilla_content_svg_content_src_nsSVGFilters.cpp | 22 ++++++++++++++++++++++ ...-mozilla_content_svg_content_src_nsSVGFilters.h | 13 +++++++++++++ .../patch-mozilla_dom_indexedDB_IDBEvents.cpp | 13 +++++++++++++ .../patch-mozilla_dom_indexedDB_IDBEvents.h | 13 +++++++++++++ 6 files changed, 79 insertions(+), 1 deletion(-) create mode 100644 www/seamonkey/patches/patch-mozilla_content_svg_content_src_SVGComponentTransferFunctionElement.h create mode 100644 www/seamonkey/patches/patch-mozilla_content_svg_content_src_nsSVGFilters.cpp create mode 100644 www/seamonkey/patches/patch-mozilla_content_svg_content_src_nsSVGFilters.h create mode 100644 www/seamonkey/patches/patch-mozilla_dom_indexedDB_IDBEvents.cpp create mode 100644 www/seamonkey/patches/patch-mozilla_dom_indexedDB_IDBEvents.h diff --git a/www/seamonkey/distinfo b/www/seamonkey/distinfo index 4611c4dc624..950fa981ee5 100644 --- a/www/seamonkey/distinfo +++ b/www/seamonkey/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.112 2014/06/22 08:54:39 ryoon Exp $ +$NetBSD: distinfo,v 1.113 2014/06/28 22:51:38 joerg Exp $ SHA1 (enigmail-1.6.1_pre20140112.tar.xz) = abb4ce7a5512095c18af7e68f4cbeb52b1e95179 RMD160 (enigmail-1.6.1_pre20140112.tar.xz) = 617cf51d64458b9e1df332e3759cddd2b2bb34df @@ -53,6 +53,11 @@ SHA1 (patch-mozilla_content_media_gstreamer_GStreamerReader.cpp) = e2e4826c87752 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) = b6fea8dee6df0b1ede7d7b4393c180bd4070081e +SHA1 (patch-mozilla_content_svg_content_src_nsSVGFilters.cpp) = 14ac1ccb7266bb069e540eaf07dd55213d3c5466 +SHA1 (patch-mozilla_content_svg_content_src_nsSVGFilters.h) = 188c804e459c9389f0862bc47ed6a943b7a9c7d5 +SHA1 (patch-mozilla_dom_indexedDB_IDBEvents.cpp) = 24bc14e0c573a686df718ae0fecd6eb0fcd79b58 +SHA1 (patch-mozilla_dom_indexedDB_IDBEvents.h) = 16014a04e30027025dff96756c5ba6ad28cbcca8 SHA1 (patch-mozilla_dom_plugins_ipc_PluginModuleChild.cpp) = 400a5af9988d4392d92e493c73bbe61cd1915edb SHA1 (patch-mozilla_dom_plugins_ipc_PluginModuleChild.h) = 14038ce0ee2b38db6c7952056a97a65839a2c1a9 SHA1 (patch-mozilla_dom_plugins_ipc_PluginProcessChild.cpp) = f29ed121d90a6fc4c02e36da8d440d6c3337e63a 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..2f56a32ffb9 --- /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.3 2014/06/28 22:51:38 joerg Exp $ + +--- mozilla/content/svg/content/src/SVGComponentTransferFunctionElement.h.orig 2014-06-13 00:46:04.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..3aa3abbb84c --- /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.3 2014/06/28 22:51:38 joerg Exp $ + +--- mozilla/content/svg/content/src/nsSVGFilters.cpp.orig 2014-06-13 00:45:21.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..4e5827838f0 --- /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.3 2014/06/28 22:51:38 joerg Exp $ + +--- mozilla/content/svg/content/src/nsSVGFilters.h.orig 2014-06-13 00:46:04.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..a4ddc621a4f --- /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.3 2014/06/28 22:51:38 joerg Exp $ + +--- mozilla/dom/indexedDB/IDBEvents.cpp.orig 2014-06-13 00:46:05.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..8365681e2d8 --- /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.3 2014/06/28 22:51:38 joerg Exp $ + +--- mozilla/dom/indexedDB/IDBEvents.h.orig 2014-06-13 00:46:05.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__ -- cgit v1.2.3