head	1.2;
access;
symbols
	pkgsrc-2013Q2:1.2.0.8
	pkgsrc-2013Q2-base:1.2
	pkgsrc-2012Q4:1.2.0.6
	pkgsrc-2012Q4-base:1.2
	pkgsrc-2011Q4:1.2.0.4
	pkgsrc-2011Q4-base:1.2
	pkgsrc-2011Q2:1.2.0.2
	pkgsrc-2011Q2-base:1.2
	pkgsrc-2010Q1:1.1.1.1.0.4
	pkgsrc-2010Q1-base:1.1.1.1
	pkgsrc-2009Q4:1.1.1.1.0.2
	pkgsrc-2009Q4-base:1.1.1.1
	pkgsrc-base:1.1.1.1
	TNF:1.1.1;
locks; strict;
comment	@# @;


1.2
date	2010.04.21.16.59.29;	author tnn;	state dead;
branches;
next	1.1;

1.1
date	2009.11.28.21.59.55;	author tnn;	state Exp;
branches
	1.1.1.1;
next	;

1.1.1.1
date	2009.11.28.21.59.55;	author tnn;	state Exp;
branches;
next	;


desc
@@


1.2
log
@remove thunderbird2. Mozilla says no more 2.x releases planned.
@
text
@$NetBSD: patch-ak,v 1.1 2009/11/28 21:59:55 tnn Exp $

diff -ru ../Orig/mozilla/gfx/src/freetype/nsFreeType.cpp ./gfx/src/freetype/nsFreeType.cpp
--- ../Orig/mozilla/gfx/src/freetype/nsFreeType.cpp	2004-02-08 00:22:30.000000000 +0900
+++ ./gfx/src/freetype/nsFreeType.cpp	2004-06-15 23:56:01.000000000 +0900
@@@@ -110,11 +110,11 @@@@
   {"FT_New_Face",             NS_FT2_OFFSET(nsFT_New_Face),             PR_TRUE},
   {"FT_Outline_Decompose",    NS_FT2_OFFSET(nsFT_Outline_Decompose),    PR_TRUE},
   {"FT_Set_Charmap",          NS_FT2_OFFSET(nsFT_Set_Charmap),          PR_TRUE},
-  {"FTC_Image_Cache_Lookup",  NS_FT2_OFFSET(nsFTC_Image_Cache_Lookup),  PR_TRUE},
-  {"FTC_Manager_Lookup_Size", NS_FT2_OFFSET(nsFTC_Manager_Lookup_Size), PR_TRUE},
+  {"FTC_ImageCache_Lookup",  NS_FT2_OFFSET(nsFTC_Image_Cache_Lookup),   PR_TRUE},
+  {"FTC_Manager_LookupFace", NS_FT2_OFFSET(nsFTC_Manager_LookupFace),   PR_TRUE},
   {"FTC_Manager_Done",        NS_FT2_OFFSET(nsFTC_Manager_Done),        PR_TRUE},
   {"FTC_Manager_New",         NS_FT2_OFFSET(nsFTC_Manager_New),         PR_TRUE},
-  {"FTC_Image_Cache_New",     NS_FT2_OFFSET(nsFTC_Image_Cache_New),     PR_TRUE},
+  {"FTC_ImageCache_New",     NS_FT2_OFFSET(nsFTC_Image_Cache_New),      PR_TRUE},
 // #ifdef MOZ_SVG
   {"FT_Glyph_Transform",      NS_FT2_OFFSET(nsFT_Glyph_Transform),      PR_TRUE},
   {"FT_Get_Kerning",          NS_FT2_OFFSET(nsFT_Get_Kerning),          PR_TRUE},
@@@@ -282,7 +282,7 @@@@
 } 
  
 NS_IMETHODIMP
-nsFreeType2::ImageCacheLookup(FTC_Image_Cache cache, FTC_Image_Desc *desc,
+nsFreeType2::ImageCacheLookup(FTC_ImageCache cache, FTC_ImageType *desc,
                               FT_UInt glyphID, FT_Glyph *glyph)
 { 
   // call the FreeType2 function via the function pointer
@@@@ -291,11 +291,11 @@@@
 } 
  
 NS_IMETHODIMP
-nsFreeType2::ManagerLookupSize(FTC_Manager manager, FTC_Font font,
-                               FT_Face *face, FT_Size *size)
+nsFreeType2::ManagerLookupFace(FTC_Manager manager, FTC_FaceID face_id,
+                               FT_Face *face)
 { 
   // call the FreeType2 function via the function pointer
-  FT_Error error = nsFTC_Manager_Lookup_Size(manager, font, face, size);
+  FT_Error error = nsFTC_Manager_LookupFace(manager, face_id, face);
   return error ? NS_ERROR_FAILURE : NS_OK;
 } 
  
@@@@ -320,7 +320,7 @@@@
 } 
  
 NS_IMETHODIMP
-nsFreeType2::ImageCacheNew(FTC_Manager manager, FTC_Image_Cache *cache)
+nsFreeType2::ImageCacheNew(FTC_Manager manager, FTC_ImageCache *cache)
 { 
   // call the FreeType2 function via the function pointer
   FT_Error error = nsFTC_Image_Cache_New(manager, cache);
@@@@ -389,7 +389,7 @@@@
 } 
  
 NS_IMETHODIMP
-nsFreeType2::GetImageCache(FTC_Image_Cache *aCache)
+nsFreeType2::GetImageCache(FTC_ImageCache *aCache)
 {
   *aCache = mImageCache;
   return NS_OK;
@


1.1
log
@Initial revision
@
text
@d1 1
a1 1
$NetBSD: patch-ak,v 1.2 2004/06/24 23:09:55 taya Exp $
@


1.1.1.1
log
@Re-import mail/thunderbird as mail/thunderbird2 to let mail/thunderbird
become the natural upgrade path to thunderbird 3.0.
@
text
@@