head	1.3;
access;
symbols
	pkgsrc-2013Q2:1.3.0.42
	pkgsrc-2013Q2-base:1.3
	pkgsrc-2012Q4:1.3.0.40
	pkgsrc-2012Q4-base:1.3
	pkgsrc-2011Q4:1.3.0.38
	pkgsrc-2011Q4-base:1.3
	pkgsrc-2011Q2:1.3.0.36
	pkgsrc-2011Q2-base:1.3
	pkgsrc-2009Q4:1.3.0.34
	pkgsrc-2009Q4-base:1.3
	pkgsrc-2008Q4:1.3.0.32
	pkgsrc-2008Q4-base:1.3
	pkgsrc-2008Q3:1.3.0.30
	pkgsrc-2008Q3-base:1.3
	cube-native-xorg:1.3.0.28
	cube-native-xorg-base:1.3
	pkgsrc-2008Q2:1.3.0.26
	pkgsrc-2008Q2-base:1.3
	pkgsrc-2008Q1:1.3.0.24
	pkgsrc-2008Q1-base:1.3
	pkgsrc-2007Q4:1.3.0.22
	pkgsrc-2007Q4-base:1.3
	pkgsrc-2007Q3:1.3.0.20
	pkgsrc-2007Q3-base:1.3
	pkgsrc-2007Q2:1.3.0.18
	pkgsrc-2007Q2-base:1.3
	pkgsrc-2007Q1:1.3.0.16
	pkgsrc-2007Q1-base:1.3
	pkgsrc-2006Q4:1.3.0.14
	pkgsrc-2006Q4-base:1.3
	pkgsrc-2006Q3:1.3.0.12
	pkgsrc-2006Q3-base:1.3
	pkgsrc-2006Q2:1.3.0.10
	pkgsrc-2006Q2-base:1.3
	pkgsrc-2006Q1:1.3.0.8
	pkgsrc-2006Q1-base:1.3
	pkgsrc-2005Q4:1.3.0.6
	pkgsrc-2005Q4-base:1.3
	pkgsrc-2005Q3:1.3.0.4
	pkgsrc-2005Q3-base:1.3
	pkgsrc-2005Q2:1.3.0.2
	pkgsrc-2005Q2-base:1.3
	pkgsrc-2005Q1:1.2.0.4
	pkgsrc-2005Q1-base:1.2
	pkgsrc-2004Q4:1.2.0.2
	pkgsrc-2004Q4-base:1.2
	pkgsrc-2004Q3:1.1.0.4
	pkgsrc-2004Q3-base:1.1
	pkgsrc-2004Q2:1.1.0.2
	pkgsrc-2004Q2-base:1.1;
locks; strict;
comment	@# @;


1.3
date	2005.04.18.22.40.36;	author wiz;	state dead;
branches;
next	1.2;

1.2
date	2004.12.04.03.50.40;	author taya;	state Exp;
branches
	1.2.4.1;
next	1.1;

1.1
date	2004.06.05.10.20.55;	author taya;	state Exp;
branches;
next	;

1.2.4.1
date	2005.05.18.03.35.32;	author snj;	state dead;
branches;
next	;


desc
@@


1.3
log
@Remove mozilla-stable; not much difference to the mozilla package
itself. Okayed by the maintainer, taya@@.
@
text
@$NetBSD: patch-ai,v 1.2 2004/12/04 03:50:40 taya Exp $

diff -ru ../Orig/mozilla/gfx/src/ps/nsFontMetricsPS.cpp ./gfx/src/ps/nsFontMetricsPS.cpp
--- ../Orig/mozilla/gfx/src/ps/nsFontMetricsPS.cpp	2004-02-05 10:57:05.000000000 +0900
+++ ./gfx/src/ps/nsFontMetricsPS.cpp	2004-06-10 23:00:08.000000000 +0900
@@@@ -1141,10 +1141,10 @@@@
   
   mPixelSize = NSToIntRound(app2dev * mFont->size);
 
-  mImageDesc.font.face_id    = (void*)mEntry;
-  mImageDesc.font.pix_width  = mPixelSize;
-  mImageDesc.font.pix_height = mPixelSize;
-  mImageDesc.image_type = 0;
+  mImageDesc->face_id = (FTC_FaceID)&mEntry;
+  mImageDesc->width  = mPixelSize;
+  mImageDesc->height = mPixelSize;
+  mImageDesc->flags = 0;
 
   nsresult rv;
   mFt2 = do_GetService(NS_FREETYPE2_CONTRACTID, &rv);
@@@@ -1190,7 +1190,7 @@@@
   if (!face)
     return 0;
 
-  FTC_Image_Cache iCache;
+  FTC_ImageCache iCache;
   nsresult rv = mFt2->GetImageCache(&iCache);
   if (NS_FAILED(rv)) {
     NS_ERROR("Failed to get Image Cache");
@@@@ -1228,8 +1228,8 @@@@
   
   FTC_Manager cManager;
   mFt2->GetFTCacheManager(&cManager);
-  nsresult rv = mFt2->ManagerLookupSize(cManager, &mImageDesc.font,
-                                        &face, nsnull);
+  nsresult rv = mFt2->ManagerLookupFace(cManager, mImageDesc->face_id,
+                                        &face);
   NS_ASSERTION(rv==0, "failed to get face/size");
   if (rv)
     return nsnull;
@@@@ -1622,16 +1622,16 @@@@
   mEntry->GetFamilyName(fontName);
   mEntry->GetStyleName(styleName);
   
-  mImageDesc.font.face_id    = (void*)mEntry;
+  mImageDesc->face_id = (FTC_FaceID)&mEntry;
   // TT glyph has no relation to size
-  mImageDesc.font.pix_width  = 16;
-  mImageDesc.font.pix_height = 16;
-  mImageDesc.image_type = 0;
+  mImageDesc->width  = 16;
+  mImageDesc->height = 16;
+  mImageDesc->flags = 0;
   FT_Face face = nsnull;
   FTC_Manager cManager;
   mFt2->GetFTCacheManager(&cManager);
-  nsresult rv = mFt2->ManagerLookupSize(cManager, &mImageDesc.font,
-                                        &face, nsnull);
+  nsresult rv = mFt2->ManagerLookupFace(cManager, mImageDesc->face_id,
+                                        &face);
   if (NS_FAILED(rv))
     return;
  
@


1.2
log
@
update mozilla-stable to 1.7.3
stable branch of mozilla was switched to 1.7-branch

mostly copied from www/mozilla
@
text
@d1 1
a1 1
$NetBSD: patch-ai,v 1.9 2004/06/21 14:14:00 taya Exp $
@


1.2.4.1
log
@Pullup ticket 508 - requested by Lubomir Sedlacik
remove mozilla-stable

  Module Name:    pkgsrc
  Committed By:   wiz
  Date:           Mon Apr 18 22:40:36 UTC 2005

  Modified Files:
          pkgsrc/www: Makefile
  Removed Files:
          pkgsrc/www/mozilla-stable: DESCR Makefile PLIST buildlink3.mk distinfo
          pkgsrc/www/mozilla-stable/files: moz-install mozilla-ELF.in
              mozilla-Mach-O.in mozilla-a.out.in xptcinvoke_asm_sparc64_netbsd.s
              xptcinvoke_sparc64_netbsd.cpp xptcstubs_asm_sparc64_netbsd.s
              xptcstubs_sparc64_netbsd.cpp
          pkgsrc/www/mozilla-stable/patches: patch-aa patch-ab patch-ac patch-ad
              patch-ae patch-af patch-ag patch-ah patch-ai patch-aj patch-ak
              patch-al patch-an patch-ao patch-aw patch-ax patch-ba patch-bb
              patch-bm patch-bo patch-bq patch-br patch-bs patch-bt patch-bu
              patch-bv patch-bw patch-bx patch-by patch-bz patch-ca patch-cb
              patch-cc

  Log Message:
  Remove mozilla-stable; not much difference to the mozilla package
  itself. Okayed by the maintainer, taya@@.
@
text
@d1 1
a1 1
$NetBSD: patch-ai,v 1.2 2004/12/04 03:50:40 taya Exp $
@


1.1
log
@
adopt new freetype api.
fix PR pkg/25815.
@
text
@d1 1
a1 1
$NetBSD$
d4 3
a6 3
--- ../Orig/mozilla/gfx/src/ps/nsFontMetricsPS.cpp	2003-04-23 01:25:08.000000000 +0900
+++ ./gfx/src/ps/nsFontMetricsPS.cpp	2004-06-05 15:49:03.000000000 +0900
@@@@ -1110,10 +1110,10 @@@@
d21 1
a21 1
@@@@ -1159,7 +1159,7 @@@@
d30 1
a30 1
@@@@ -1197,8 +1197,8 @@@@
d41 1
a41 1
@@@@ -1593,16 +1593,16 @@@@
@