From 3ae3263b88514201cffcb2c0cd2c0c369a1b1cc9 Mon Sep 17 00:00:00 2001
From: Joe Marcus Clarke <marcus@FreeBSD.org>
Date: Thu, 26 Feb 2004 09:41:11 +0000
Subject: * 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]
---
 www/seamonkey/Makefile                             |  4 +-
 .../extra-patch-nsSVGLibartGlyphMetricsFT.cpp      | 43 ++++++++++++++++++++++
 2 files changed, 46 insertions(+), 1 deletion(-)
 create mode 100644 www/seamonkey/files/extra-patch-nsSVGLibartGlyphMetricsFT.cpp

(limited to 'www/seamonkey')

diff --git a/www/seamonkey/Makefile b/www/seamonkey/Makefile
index 0fef9580fd96..d5bad320d02e 100644
--- a/www/seamonkey/Makefile
+++ b/www/seamonkey/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME?=	mozilla
 PORTVERSION=	1.7.a
-PORTREVISION?=	0
+PORTREVISION?=	1
 PORTEPOCH?=	2
 CATEGORIES?=	www
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
@@ -223,6 +223,8 @@ post-patch:
 		${WRKSRC}/configure \
 		${WRKSRC}/intl/uconv/native/nsNativeUConvService.cpp \
 		${WRKSRC}/xpcom/io/nsNativeCharsetUtils.cpp
+	@${REINPLACE_CMD} -e 's|libfreetype.so.6|libfreetype.so.9|g' \
+		${WRKSRC}/modules/libpref/src/init/all.js
 	@for pcfile in ${PKGCONFIG_FILES}; do \
 		${REINPLACE_CMD} -e 's|mozilla-xpcom|mozilla-xpcom${MOZ_SUFX}${PKGNAMESUFFIX}|g ; \
 			s|mozilla-nspr|mozilla-nspr${MOZ_SUFX}${PKGNAMESUFFIX}|g' \
diff --git a/www/seamonkey/files/extra-patch-nsSVGLibartGlyphMetricsFT.cpp b/www/seamonkey/files/extra-patch-nsSVGLibartGlyphMetricsFT.cpp
new file mode 100644
index 000000000000..be76e019d074
--- /dev/null
+++ b/www/seamonkey/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) {
-- 
cgit v1.2.3