Define initialisers in the headers like most cases already did,

otherwise they might not get emitted correctly. Deal with the freetype
header move.

4 files changed, 52 insertions, 1 deletions

diff --git a/www/firefox24/distinfo b/www/firefox24/distinfo
index 36f8268de05..ef22c1b872b 100644
--- a/www/firefox24/distinfo
+++ b/www/firefox24/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2014/05/07 20:23:22 ryoon Exp $
+$NetBSD: distinfo,v 1.12 2014/05/15 21:16:16 joerg Exp $
 
 SHA1 (firefox-24.5.0esr.source.tar.bz2) = 1b549d6dce80faec1c23f11b95122e607d2ed1bb
 RMD160 (firefox-24.5.0esr.source.tar.bz2) = 38a987d7c1283c3dd6476685eb025c308fb2f185
@@ -25,6 +25,9 @@ SHA1 (patch-config_stl__wrappers_ostream) = 7be7fe36704ffbdc070a113b46b4f391a598
 SHA1 (patch-config_system-headers) = 0da7f04309f7540a0038079568cf54d981f0d3f5
 SHA1 (patch-config_system__wrappers_unwind.h) = b3bdac0710179b9c8f8eabd824216d0114504491
 SHA1 (patch-content_media_gstreamer_GStreamerFormatHelper.cpp) = 450d8202977ef30e75166372fe405c0908450641
+SHA1 (patch-content_svg_content_src_SVGComponentTransferFunctionElement.h) = 071420d63fa106da305c8c1c3fa18899e011254e
+SHA1 (patch-content_svg_content_src_nsSVGFilters.cpp) = f5c52c32418044c99d00c73ede33ecfe631d3a8c
+SHA1 (patch-content_svg_content_src_nsSVGFilters.h) = 1091187361c8b49eadcd12f8b776dac8a645826f
 SHA1 (patch-dom_plugins_ipc_PluginModuleChild.cpp) = 69b0a51d733cd52e7d200052362e0faf4ec918f1
 SHA1 (patch-dom_plugins_ipc_PluginModuleChild.h) = 0a7f3167e939822013ae6195406657453578453e
 SHA1 (patch-extensions_auth_nsAuthGSSAPI.cpp) = 548886fc4a86a988f3f91650061ddc04f37653a8
diff --git a/www/firefox24/patches/patch-content_svg_content_src_SVGComponentTransferFunctionElement.h b/www/firefox24/patches/patch-content_svg_content_src_SVGComponentTransferFunctionElement.h
new file mode 100644
index 00000000000..096df5a19e6
--- /dev/null
+++ b/www/firefox24/patches/patch-content_svg_content_src_SVGComponentTransferFunctionElement.h
@@ -0,0 +1,13 @@
+$NetBSD: patch-content_svg_content_src_SVGComponentTransferFunctionElement.h,v 1.1 2014/05/15 21:16:16 joerg Exp $
+
+--- content/svg/content/src/SVGComponentTransferFunctionElement.h.orig	2014-05-14 23:29:58.000000000 +0000
++++ content/svg/content/src/SVGComponentTransferFunctionElement.h
+@@ -74,6 +74,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/firefox24/patches/patch-content_svg_content_src_nsSVGFilters.cpp b/www/firefox24/patches/patch-content_svg_content_src_nsSVGFilters.cpp
new file mode 100644
index 00000000000..1ee72fa8680
--- /dev/null
+++ b/www/firefox24/patches/patch-content_svg_content_src_nsSVGFilters.cpp
@@ -0,0 +1,22 @@
+$NetBSD: patch-content_svg_content_src_nsSVGFilters.cpp,v 1.1 2014/05/15 21:16:16 joerg Exp $
+
+--- content/svg/content/src/nsSVGFilters.cpp.orig	2014-04-21 23:43:57.000000000 +0000
++++ content/svg/content/src/nsSVGFilters.cpp
+@@ -95,7 +95,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
+@@ -357,8 +357,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/firefox24/patches/patch-content_svg_content_src_nsSVGFilters.h b/www/firefox24/patches/patch-content_svg_content_src_nsSVGFilters.h
new file mode 100644
index 00000000000..0749f9f3d39
--- /dev/null
+++ b/www/firefox24/patches/patch-content_svg_content_src_nsSVGFilters.h
@@ -0,0 +1,13 @@
+$NetBSD: patch-content_svg_content_src_nsSVGFilters.h,v 1.1 2014/05/15 21:16:16 joerg Exp $
+
+--- content/svg/content/src/nsSVGFilters.h.orig	2014-04-21 23:43:57.000000000 +0000
++++ content/svg/content/src/nsSVGFilters.h
+@@ -233,6 +233,8 @@ protected:
+   static LengthInfo sLengthInfo[4];
+ };
+ 
++NS_DEFINE_STATIC_IID_ACCESSOR(nsSVGFE, NS_SVG_FE_CID)
++
+ typedef nsSVGElement SVGFEUnstyledElementBase;
+ 
+ class SVGFEUnstyledElement : public SVGFEUnstyledElementBase