summaryrefslogtreecommitdiff
path: root/www/firefox/patches/patch-al
diff options
context:
space:
mode:
Diffstat (limited to 'www/firefox/patches/patch-al')
-rw-r--r--www/firefox/patches/patch-al20
1 files changed, 11 insertions, 9 deletions
diff --git a/www/firefox/patches/patch-al b/www/firefox/patches/patch-al
index 0e31e2dc2e1..0d285db22bc 100644
--- a/www/firefox/patches/patch-al
+++ b/www/firefox/patches/patch-al
@@ -1,22 +1,24 @@
-$NetBSD: patch-al,v 1.3 2005/09/22 14:14:04 jlam Exp $
+$NetBSD: patch-al,v 1.4 2005/12/10 13:47:22 taya Exp $
---- gfx/src/ps/nsFontMetricsPS.h.orig 2003-04-22 16:25:09.000000000 +0000
-+++ gfx/src/ps/nsFontMetricsPS.h
-@@ -320,7 +320,7 @@ protected:
+diff -ruN ../Orig/mozilla/gfx/src/ps/nsFontMetricsPS.h ./gfx/src/ps/nsFontMetricsPS.h
+--- ../Orig/mozilla/gfx/src/ps/nsFontMetricsPS.h 2005-06-29 03:29:10.000000000 +0900
++++ ./gfx/src/ps/nsFontMetricsPS.h 2005-12-04 19:07:24.000000000 +0900
+@@ -424,7 +424,8 @@
nsCOMPtr<nsITrueTypeFontCatalogEntry> mFaceID;
nsCOMPtr<nsIFreeType2> mFt2;
PRUint16 mPixelSize;
- FTC_Image_Desc mImageDesc;
+ FTC_ImageType mImageDesc;
++
+ nsCString mFontNameBase; // the base name of type 1 (sub) fonts
+ nscoord mHeight;
-
- static PRBool AddUserPref(nsIAtom *aLang, const nsFont& aFont,
-@@ -363,7 +363,7 @@ public:
+@@ -493,7 +494,7 @@
protected:
nsCOMPtr<nsITrueTypeFontCatalogEntry> mEntry;
nsCOMPtr<nsIFreeType2> mFt2;
- FTC_Image_Desc mImageDesc;
+ FTC_ImageType mImageDesc;
};
- #endif
-
+ #endif // MOZ_ENABLE_FREETYPE2
+ #endif // MOZ_ENABLE_XFT