sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 01:39:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix build on 4.x.

Browse source
This commit is contained in:
Adam Weinberger 2004-07-25 07:21:34 +00:00
parent d3db0fad36
commit 8d88c56a7c
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=114608
6 changed files with 81 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
www/mozilla-devel/files/extra-patch-nsSVGLibartGlyphMetricsFT.cpp
View file

@ -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.orig Sat Jul 24 23:59:16 2004
+++ layout/svg/renderer/src/libart/nsSVGLibartGlyphMetricsFT.cpp Thu Feb 26 03:27:56 2004 +++ layout/svg/renderer/src/libart/nsSVGLibartGlyphMetricsFT.cpp Sun Jul 25 00:04:20 2004
@@ -56,6 +57,13 @@ @@ -56,6 +56,12 @@
#include "nsArray.h" #include "nsArray.h"
#include "nsDataHashtable.h" #include "nsDataHashtable.h"
+
+#ifdef HAVE_CPP_2BYTE_WCHAR_T +#ifdef HAVE_CPP_2BYTE_WCHAR_T
+ typedef nsDependentString nsLiteralString; + typedef nsDependentString nsLiteralString;
+#else +#else
@ -14,30 +13,30 @@
/** /**
* \addtogroup libart_renderer Libart Rendering Engine * \addtogroup libart_renderer Libart Rendering Engine
* @{ * @{
@@ -112,7 +120,7 @@ @@ -112,7 +118,7 @@
nsCOMPtr<nsISVGGlyphMetricsSource> mSource; nsCOMPtr<nsISVGGlyphMetricsSource> mSource;
public: public:
- static nsDataHashtable<nsStringHashKey,nsDependentString*> sFontAliases; - static nsDataHashtable<nsStringHashKey,const nsDependentString*> sFontAliases;
+ static nsDataHashtable<nsStringHashKey,nsLiteralString*> sFontAliases; + static nsDataHashtable<nsStringHashKey,const nsLiteralString*> sFontAliases;
}; };
/** @} */ /** @} */
@@ -120,7 +128,7 @@ @@ -120,7 +126,7 @@
//---------------------------------------------------------------------- //----------------------------------------------------------------------
// nsSVGLibartGlyphMetricsFT implementation: // nsSVGLibartGlyphMetricsFT implementation:
-nsDataHashtable<nsStringHashKey,nsDependentString*> -nsDataHashtable<nsStringHashKey,const nsDependentString*>
+nsDataHashtable<nsStringHashKey,nsLiteralString*> +nsDataHashtable<nsStringHashKey,const nsLiteralString*>
nsSVGLibartGlyphMetricsFT::sFontAliases; nsSVGLibartGlyphMetricsFT::sFontAliases;
@@ -406,7 +414,7 @@ @@ -406,7 +412,7 @@
} }
else { else {
// try alias if there is one: // try alias if there is one:
- nsDependentString *alias = nsnull; - const nsDependentString *alias = nsnull;
+ nsLiteralString *alias = nsnull; + const nsLiteralString *alias = nsnull;
nsSVGLibartGlyphMetricsFT::sFontAliases.Get(NS_ConvertUTF8toUCS2(family_name), nsSVGLibartGlyphMetricsFT::sFontAliases.Get(NS_ConvertUTF8toUCS2(family_name),
&alias); &alias);
if (alias) { if (alias) {

15
www/mozilla-devel/files/patch-modules::plugin::base::public::nptypes.h Normal file
View file

@ -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

25
www/seamonkey/files/extra-patch-nsSVGLibartGlyphMetricsFT.cpp
View file

@ -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.orig Sat Jul 24 23:59:16 2004
+++ layout/svg/renderer/src/libart/nsSVGLibartGlyphMetricsFT.cpp Thu Feb 26 03:27:56 2004 +++ layout/svg/renderer/src/libart/nsSVGLibartGlyphMetricsFT.cpp Sun Jul 25 00:04:20 2004
@@ -56,6 +57,13 @@ @@ -56,6 +56,12 @@
#include "nsArray.h" #include "nsArray.h"
#include "nsDataHashtable.h" #include "nsDataHashtable.h"
+
+#ifdef HAVE_CPP_2BYTE_WCHAR_T +#ifdef HAVE_CPP_2BYTE_WCHAR_T
+ typedef nsDependentString nsLiteralString; + typedef nsDependentString nsLiteralString;
+#else +#else
@ -14,30 +13,30 @@
/** /**
* \addtogroup libart_renderer Libart Rendering Engine * \addtogroup libart_renderer Libart Rendering Engine
* @{ * @{
@@ -112,7 +120,7 @@ @@ -112,7 +118,7 @@
nsCOMPtr<nsISVGGlyphMetricsSource> mSource; nsCOMPtr<nsISVGGlyphMetricsSource> mSource;
public: public:
- static nsDataHashtable<nsStringHashKey,nsDependentString*> sFontAliases; - static nsDataHashtable<nsStringHashKey,const nsDependentString*> sFontAliases;
+ static nsDataHashtable<nsStringHashKey,nsLiteralString*> sFontAliases; + static nsDataHashtable<nsStringHashKey,const nsLiteralString*> sFontAliases;
}; };
/** @} */ /** @} */
@@ -120,7 +128,7 @@ @@ -120,7 +126,7 @@
//---------------------------------------------------------------------- //----------------------------------------------------------------------
// nsSVGLibartGlyphMetricsFT implementation: // nsSVGLibartGlyphMetricsFT implementation:
-nsDataHashtable<nsStringHashKey,nsDependentString*> -nsDataHashtable<nsStringHashKey,const nsDependentString*>
+nsDataHashtable<nsStringHashKey,nsLiteralString*> +nsDataHashtable<nsStringHashKey,const nsLiteralString*>
nsSVGLibartGlyphMetricsFT::sFontAliases; nsSVGLibartGlyphMetricsFT::sFontAliases;
@@ -406,7 +414,7 @@ @@ -406,7 +412,7 @@
} }
else { else {
// try alias if there is one: // try alias if there is one:
- nsDependentString *alias = nsnull; - const nsDependentString *alias = nsnull;
+ nsLiteralString *alias = nsnull; + const nsLiteralString *alias = nsnull;
nsSVGLibartGlyphMetricsFT::sFontAliases.Get(NS_ConvertUTF8toUCS2(family_name), nsSVGLibartGlyphMetricsFT::sFontAliases.Get(NS_ConvertUTF8toUCS2(family_name),
&alias); &alias);
if (alias) { if (alias) {

15
www/seamonkey/files/patch-modules::plugin::base::public::nptypes.h Normal file
View file

@ -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

25
www/seamonkey2/files/extra-patch-nsSVGLibartGlyphMetricsFT.cpp
View file

@ -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.orig Sat Jul 24 23:59:16 2004
+++ layout/svg/renderer/src/libart/nsSVGLibartGlyphMetricsFT.cpp Thu Feb 26 03:27:56 2004 +++ layout/svg/renderer/src/libart/nsSVGLibartGlyphMetricsFT.cpp Sun Jul 25 00:04:20 2004
@@ -56,6 +57,13 @@ @@ -56,6 +56,12 @@
#include "nsArray.h" #include "nsArray.h"
#include "nsDataHashtable.h" #include "nsDataHashtable.h"
+
+#ifdef HAVE_CPP_2BYTE_WCHAR_T +#ifdef HAVE_CPP_2BYTE_WCHAR_T
+ typedef nsDependentString nsLiteralString; + typedef nsDependentString nsLiteralString;
+#else +#else
@ -14,30 +13,30 @@
/** /**
* \addtogroup libart_renderer Libart Rendering Engine * \addtogroup libart_renderer Libart Rendering Engine
* @{ * @{
@@ -112,7 +120,7 @@ @@ -112,7 +118,7 @@
nsCOMPtr<nsISVGGlyphMetricsSource> mSource; nsCOMPtr<nsISVGGlyphMetricsSource> mSource;
public: public:
- static nsDataHashtable<nsStringHashKey,nsDependentString*> sFontAliases; - static nsDataHashtable<nsStringHashKey,const nsDependentString*> sFontAliases;
+ static nsDataHashtable<nsStringHashKey,nsLiteralString*> sFontAliases; + static nsDataHashtable<nsStringHashKey,const nsLiteralString*> sFontAliases;
}; };
/** @} */ /** @} */
@@ -120,7 +128,7 @@ @@ -120,7 +126,7 @@
//---------------------------------------------------------------------- //----------------------------------------------------------------------
// nsSVGLibartGlyphMetricsFT implementation: // nsSVGLibartGlyphMetricsFT implementation:
-nsDataHashtable<nsStringHashKey,nsDependentString*> -nsDataHashtable<nsStringHashKey,const nsDependentString*>
+nsDataHashtable<nsStringHashKey,nsLiteralString*> +nsDataHashtable<nsStringHashKey,const nsLiteralString*>
nsSVGLibartGlyphMetricsFT::sFontAliases; nsSVGLibartGlyphMetricsFT::sFontAliases;
@@ -406,7 +414,7 @@ @@ -406,7 +412,7 @@
} }
else { else {
// try alias if there is one: // try alias if there is one:
- nsDependentString *alias = nsnull; - const nsDependentString *alias = nsnull;
+ nsLiteralString *alias = nsnull; + const nsLiteralString *alias = nsnull;
nsSVGLibartGlyphMetricsFT::sFontAliases.Get(NS_ConvertUTF8toUCS2(family_name), nsSVGLibartGlyphMetricsFT::sFontAliases.Get(NS_ConvertUTF8toUCS2(family_name),
&alias); &alias);
if (alias) { if (alias) {

15
www/seamonkey2/files/patch-modules::plugin::base::public::nptypes.h Normal file
View file

@ -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