summaryrefslogtreecommitdiffstats
path: root/www/seamonkey2/files
diff options
context:
space:
mode:
authormarcus <marcus@FreeBSD.org>2004-02-26 09:41:11 +0000
committermarcus <marcus@FreeBSD.org>2004-02-26 09:41:11 +0000
commit57014111aa63a12acceea0f84c4f00e7352e45d5 (patch)
treebf30e8de5c40cf64373b74e647096e2455a8894f /www/seamonkey2/files
parent2c53f1f0924a7b1d3b9c96d3dd9dd79ae5a6df03 (diff)
downloadFreeBSD-ports-57014111aa63a12acceea0f84c4f00e7352e45d5.zip
FreeBSD-ports-57014111aa63a12acceea0f84c4f00e7352e45d5.tar.gz
* Fix a compilation issue on -STABLE [1]
* Correct the path to libfreetype to fix an initialization error in the SVG renderer Reported by: adamw [1]
Diffstat (limited to 'www/seamonkey2/files')
-rw-r--r--www/seamonkey2/files/extra-patch-nsSVGLibartGlyphMetricsFT.cpp43
1 files changed, 43 insertions, 0 deletions
diff --git a/www/seamonkey2/files/extra-patch-nsSVGLibartGlyphMetricsFT.cpp b/www/seamonkey2/files/extra-patch-nsSVGLibartGlyphMetricsFT.cpp
new file mode 100644
index 0000000..be76e01
--- /dev/null
+++ b/www/seamonkey2/files/extra-patch-nsSVGLibartGlyphMetricsFT.cpp
@@ -0,0 +1,43 @@
+--- 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 @@
+ #include "nsArray.h"
+ #include "nsDataHashtable.h"
+
++
++#ifdef HAVE_CPP_2BYTE_WCHAR_T
++ typedef nsDependentString nsLiteralString;
++#else
++ typedef NS_ConvertASCIItoUTF16 nsLiteralString;
++#endif
++
+ /**
+ * \addtogroup libart_renderer Libart Rendering Engine
+ * @{
+@@ -112,7 +120,7 @@
+ nsCOMPtr<nsISVGGlyphMetricsSource> mSource;
+
+ public:
+- static nsDataHashtable<nsStringHashKey,nsDependentString*> sFontAliases;
++ static nsDataHashtable<nsStringHashKey,nsLiteralString*> sFontAliases;
+ };
+
+ /** @} */
+@@ -120,7 +128,7 @@
+ //----------------------------------------------------------------------
+ // nsSVGLibartGlyphMetricsFT implementation:
+
+-nsDataHashtable<nsStringHashKey,nsDependentString*>
++nsDataHashtable<nsStringHashKey,nsLiteralString*>
+ nsSVGLibartGlyphMetricsFT::sFontAliases;
+
+
+@@ -406,7 +414,7 @@
+ }
+ else {
+ // try alias if there is one:
+- nsDependentString *alias = nsnull;
++ nsLiteralString *alias = nsnull;
+ nsSVGLibartGlyphMetricsFT::sFontAliases.Get(NS_ConvertUTF8toUCS2(family_name),
+ &alias);
+ if (alias) {
OpenPOWER on IntegriCloud