Fix build on 4.x.

6 files changed, 81 insertions, 39 deletions

diff --git a/www/mozilla-devel/files/extra-patch-nsSVGLibartGlyphMetricsFT.cpp b/www/mozilla-devel/files/extra-patch-nsSVGLibartGlyphMetricsFT.cpp
index be76e019d074..a1c0265f14b6 100644
--- a/www/mozilla-devel/files/extra-patch-nsSVGLibartGlyphMetricsFT.cpp
+++ b/www/mozilla-devel/files/extra-patch-nsSVGLibartGlyphMetricsFT.cpp
@@ -1,10 +1,9 @@
---- layout/svg/renderer/src/libart/nsSVGLibartGlyphMetricsFT.cpp.orig	Thu Feb 26 02:13:35 2004
-+++ layout/svg/renderer/src/libart/nsSVGLibartGlyphMetricsFT.cpp	Thu Feb 26 03:27:56 2004
-@@ -56,6 +57,13 @@
+--- layout/svg/renderer/src/libart/nsSVGLibartGlyphMetricsFT.cpp.orig	Sat Jul 24 23:59:16 2004
++++ layout/svg/renderer/src/libart/nsSVGLibartGlyphMetricsFT.cpp	Sun Jul 25 00:04:20 2004
+@@ -56,6 +56,12 @@
  #include "nsArray.h"
  #include "nsDataHashtable.h"
  
-+
 +#ifdef HAVE_CPP_2BYTE_WCHAR_T
 +  typedef nsDependentString nsLiteralString;
 +#else
@@ -14,30 +13,30 @@
  /**
   * \addtogroup libart_renderer Libart Rendering Engine
   * @{
-@@ -112,7 +120,7 @@
+@@ -112,7 +118,7 @@
    nsCOMPtr<nsISVGGlyphMetricsSource> mSource;
      
  public:
--  static nsDataHashtable<nsStringHashKey,nsDependentString*> sFontAliases;  
-+  static nsDataHashtable<nsStringHashKey,nsLiteralString*> sFontAliases;  
+-  static nsDataHashtable<nsStringHashKey,const nsDependentString*> sFontAliases;  
++  static nsDataHashtable<nsStringHashKey,const nsLiteralString*> sFontAliases;  
  };
  
  /** @} */
-@@ -120,7 +128,7 @@
+@@ -120,7 +126,7 @@
  //----------------------------------------------------------------------
  // nsSVGLibartGlyphMetricsFT implementation:
  
--nsDataHashtable<nsStringHashKey,nsDependentString*>
-+nsDataHashtable<nsStringHashKey,nsLiteralString*>
+-nsDataHashtable<nsStringHashKey,const nsDependentString*>
++nsDataHashtable<nsStringHashKey,const nsLiteralString*>
  nsSVGLibartGlyphMetricsFT::sFontAliases;
  
  
-@@ -406,7 +414,7 @@
+@@ -406,7 +412,7 @@
    }
    else {
      // try alias if there is one:
--    nsDependentString *alias = nsnull;
-+    nsLiteralString *alias = nsnull;
+-    const nsDependentString *alias = nsnull;
++    const nsLiteralString *alias = nsnull;
      nsSVGLibartGlyphMetricsFT::sFontAliases.Get(NS_ConvertUTF8toUCS2(family_name),
                                                  &alias);
      if (alias) {
diff --git a/www/mozilla-devel/files/patch-modules::plugin::base::public::nptypes.h b/www/mozilla-devel/files/patch-modules::plugin::base::public::nptypes.h
new file mode 100644
index 000000000000..34b7e2b304e7
--- /dev/null
+++ b/www/mozilla-devel/files/patch-modules::plugin::base::public::nptypes.h
@@ -0,0 +1,15 @@
+--- modules/plugin/base/public/nptypes.h.orig	Tue Jul 13 18:15:51 2004
++++ modules/plugin/base/public/nptypes.h	Sun Jul 25 03:11:09 2004
+@@ -70,6 +70,12 @@
+   #if !defined(__cplusplus)
+     typedef int bool;
+   #endif
++#elif defined(__FreeBSD__)
++  #include <sys/types.h>
++
++  #if !defined(__cplusplus)
++    typedef int bool;
++  #endif
+ #else
+   /*
+    * For those that ship a standard C99 stdint.h header file, include
diff --git a/www/seamonkey/files/extra-patch-nsSVGLibartGlyphMetricsFT.cpp b/www/seamonkey/files/extra-patch-nsSVGLibartGlyphMetricsFT.cpp
index be76e019d074..a1c0265f14b6 100644
--- a/www/seamonkey/files/extra-patch-nsSVGLibartGlyphMetricsFT.cpp
+++ b/www/seamonkey/files/extra-patch-nsSVGLibartGlyphMetricsFT.cpp
@@ -1,10 +1,9 @@
---- layout/svg/renderer/src/libart/nsSVGLibartGlyphMetricsFT.cpp.orig	Thu Feb 26 02:13:35 2004
-+++ layout/svg/renderer/src/libart/nsSVGLibartGlyphMetricsFT.cpp	Thu Feb 26 03:27:56 2004
-@@ -56,6 +57,13 @@
+--- layout/svg/renderer/src/libart/nsSVGLibartGlyphMetricsFT.cpp.orig	Sat Jul 24 23:59:16 2004
++++ layout/svg/renderer/src/libart/nsSVGLibartGlyphMetricsFT.cpp	Sun Jul 25 00:04:20 2004
+@@ -56,6 +56,12 @@
  #include "nsArray.h"
  #include "nsDataHashtable.h"
  
-+
 +#ifdef HAVE_CPP_2BYTE_WCHAR_T
 +  typedef nsDependentString nsLiteralString;
 +#else
@@ -14,30 +13,30 @@
  /**
   * \addtogroup libart_renderer Libart Rendering Engine
   * @{
-@@ -112,7 +120,7 @@
+@@ -112,7 +118,7 @@
    nsCOMPtr<nsISVGGlyphMetricsSource> mSource;
      
  public:
--  static nsDataHashtable<nsStringHashKey,nsDependentString*> sFontAliases;  
-+  static nsDataHashtable<nsStringHashKey,nsLiteralString*> sFontAliases;  
+-  static nsDataHashtable<nsStringHashKey,const nsDependentString*> sFontAliases;  
++  static nsDataHashtable<nsStringHashKey,const nsLiteralString*> sFontAliases;  
  };
  
  /** @} */
-@@ -120,7 +128,7 @@
+@@ -120,7 +126,7 @@
  //----------------------------------------------------------------------
  // nsSVGLibartGlyphMetricsFT implementation:
  
--nsDataHashtable<nsStringHashKey,nsDependentString*>
-+nsDataHashtable<nsStringHashKey,nsLiteralString*>
+-nsDataHashtable<nsStringHashKey,const nsDependentString*>
++nsDataHashtable<nsStringHashKey,const nsLiteralString*>
  nsSVGLibartGlyphMetricsFT::sFontAliases;
  
  
-@@ -406,7 +414,7 @@
+@@ -406,7 +412,7 @@
    }
    else {
      // try alias if there is one:
--    nsDependentString *alias = nsnull;
-+    nsLiteralString *alias = nsnull;
+-    const nsDependentString *alias = nsnull;
++    const nsLiteralString *alias = nsnull;
      nsSVGLibartGlyphMetricsFT::sFontAliases.Get(NS_ConvertUTF8toUCS2(family_name),
                                                  &alias);
      if (alias) {
diff --git a/www/seamonkey/files/patch-modules::plugin::base::public::nptypes.h b/www/seamonkey/files/patch-modules::plugin::base::public::nptypes.h
new file mode 100644
index 000000000000..34b7e2b304e7
--- /dev/null
+++ b/www/seamonkey/files/patch-modules::plugin::base::public::nptypes.h
@@ -0,0 +1,15 @@
+--- modules/plugin/base/public/nptypes.h.orig	Tue Jul 13 18:15:51 2004
++++ modules/plugin/base/public/nptypes.h	Sun Jul 25 03:11:09 2004
+@@ -70,6 +70,12 @@
+   #if !defined(__cplusplus)
+     typedef int bool;
+   #endif
++#elif defined(__FreeBSD__)
++  #include <sys/types.h>
++
++  #if !defined(__cplusplus)
++    typedef int bool;
++  #endif
+ #else
+   /*
+    * For those that ship a standard C99 stdint.h header file, include
diff --git a/www/seamonkey2/files/extra-patch-nsSVGLibartGlyphMetricsFT.cpp b/www/seamonkey2/files/extra-patch-nsSVGLibartGlyphMetricsFT.cpp
index be76e019d074..a1c0265f14b6 100644
--- a/www/seamonkey2/files/extra-patch-nsSVGLibartGlyphMetricsFT.cpp
+++ b/www/seamonkey2/files/extra-patch-nsSVGLibartGlyphMetricsFT.cpp
@@ -1,10 +1,9 @@
---- layout/svg/renderer/src/libart/nsSVGLibartGlyphMetricsFT.cpp.orig	Thu Feb 26 02:13:35 2004
-+++ layout/svg/renderer/src/libart/nsSVGLibartGlyphMetricsFT.cpp	Thu Feb 26 03:27:56 2004
-@@ -56,6 +57,13 @@
+--- layout/svg/renderer/src/libart/nsSVGLibartGlyphMetricsFT.cpp.orig	Sat Jul 24 23:59:16 2004
++++ layout/svg/renderer/src/libart/nsSVGLibartGlyphMetricsFT.cpp	Sun Jul 25 00:04:20 2004
+@@ -56,6 +56,12 @@
  #include "nsArray.h"
  #include "nsDataHashtable.h"
  
-+
 +#ifdef HAVE_CPP_2BYTE_WCHAR_T
 +  typedef nsDependentString nsLiteralString;
 +#else
@@ -14,30 +13,30 @@
  /**
   * \addtogroup libart_renderer Libart Rendering Engine
   * @{
-@@ -112,7 +120,7 @@
+@@ -112,7 +118,7 @@
    nsCOMPtr<nsISVGGlyphMetricsSource> mSource;
      
  public:
--  static nsDataHashtable<nsStringHashKey,nsDependentString*> sFontAliases;  
-+  static nsDataHashtable<nsStringHashKey,nsLiteralString*> sFontAliases;  
+-  static nsDataHashtable<nsStringHashKey,const nsDependentString*> sFontAliases;  
++  static nsDataHashtable<nsStringHashKey,const nsLiteralString*> sFontAliases;  
  };
  
  /** @} */
-@@ -120,7 +128,7 @@
+@@ -120,7 +126,7 @@
  //----------------------------------------------------------------------
  // nsSVGLibartGlyphMetricsFT implementation:
  
--nsDataHashtable<nsStringHashKey,nsDependentString*>
-+nsDataHashtable<nsStringHashKey,nsLiteralString*>
+-nsDataHashtable<nsStringHashKey,const nsDependentString*>
++nsDataHashtable<nsStringHashKey,const nsLiteralString*>
  nsSVGLibartGlyphMetricsFT::sFontAliases;
  
  
-@@ -406,7 +414,7 @@
+@@ -406,7 +412,7 @@
    }
    else {
      // try alias if there is one:
--    nsDependentString *alias = nsnull;
-+    nsLiteralString *alias = nsnull;
+-    const nsDependentString *alias = nsnull;
++    const nsLiteralString *alias = nsnull;
      nsSVGLibartGlyphMetricsFT::sFontAliases.Get(NS_ConvertUTF8toUCS2(family_name),
                                                  &alias);
      if (alias) {
diff --git a/www/seamonkey2/files/patch-modules::plugin::base::public::nptypes.h b/www/seamonkey2/files/patch-modules::plugin::base::public::nptypes.h
new file mode 100644
index 000000000000..34b7e2b304e7
--- /dev/null
+++ b/www/seamonkey2/files/patch-modules::plugin::base::public::nptypes.h
@@ -0,0 +1,15 @@
+--- modules/plugin/base/public/nptypes.h.orig	Tue Jul 13 18:15:51 2004
++++ modules/plugin/base/public/nptypes.h	Sun Jul 25 03:11:09 2004
+@@ -70,6 +70,12 @@
+   #if !defined(__cplusplus)
+     typedef int bool;
+   #endif
++#elif defined(__FreeBSD__)
++  #include <sys/types.h>
++
++  #if !defined(__cplusplus)
++    typedef int bool;
++  #endif
+ #else
+   /*
+    * For those that ship a standard C99 stdint.h header file, include