head	1.2;
access;
symbols
	pkgsrc-2013Q2:1.2.0.32
	pkgsrc-2013Q2-base:1.2
	pkgsrc-2012Q4:1.2.0.30
	pkgsrc-2012Q4-base:1.2
	pkgsrc-2011Q4:1.2.0.28
	pkgsrc-2011Q4-base:1.2
	pkgsrc-2011Q2:1.2.0.26
	pkgsrc-2011Q2-base:1.2
	pkgsrc-2009Q4:1.2.0.24
	pkgsrc-2009Q4-base:1.2
	pkgsrc-2008Q4:1.2.0.22
	pkgsrc-2008Q4-base:1.2
	pkgsrc-2008Q3:1.2.0.20
	pkgsrc-2008Q3-base:1.2
	cube-native-xorg:1.2.0.18
	cube-native-xorg-base:1.2
	pkgsrc-2008Q2:1.2.0.16
	pkgsrc-2008Q2-base:1.2
	pkgsrc-2008Q1:1.2.0.14
	pkgsrc-2008Q1-base:1.2
	pkgsrc-2007Q4:1.2.0.12
	pkgsrc-2007Q4-base:1.2
	pkgsrc-2007Q3:1.2.0.10
	pkgsrc-2007Q3-base:1.2
	pkgsrc-2007Q2:1.2.0.8
	pkgsrc-2007Q2-base:1.2
	pkgsrc-2007Q1:1.2.0.6
	pkgsrc-2007Q1-base:1.2
	pkgsrc-2006Q4:1.2.0.4
	pkgsrc-2006Q4-base:1.2
	pkgsrc-2006Q3:1.2.0.2
	pkgsrc-2006Q3-base:1.2
	pkgsrc-2006Q2:1.1.0.2
	pkgsrc-2006Q2-base:1.1;
locks; strict;
comment	@# @;


1.2
date	2006.09.24.16.46.29;	author salo;	state dead;
branches;
next	1.1;

1.1
date	2006.06.06.18.28.45;	author ghen;	state Exp;
branches;
next	;


desc
@@


1.2
log
@Remove Mozilla Suite and friends.
No longer maintained upstream, replaced by SeaMonkey.
@
text
@$NetBSD: patch-co,v 1.1 2006/06/06 18:28:45 ghen Exp $

--- gfx/src/ps/nsType1.cpp.orig	2006-06-06 19:05:42.000000000 +0200
+++ gfx/src/ps/nsType1.cpp
@@@@ -67,6 +67,12 @@@@
 
 #include "nsType1.h"
 
+#if FREETYPE_MAJOR > 2 || (FREETYPE_MAJOR == 2 && FREETYPE_MINOR > 1)
+#define constFT_Vector const FT_Vector
+#else
+#define constFT_Vector FT_Vector
+#endif
+
 static const PRUint16 type1_encryption_c1 = TYPE1_ENCRYPTION_C1;
 static const PRUint16 type1_encryption_c2 = TYPE1_ENCRYPTION_C2;
 
@@@@ -81,8 +87,8 @@@@ typedef struct {
   int            wmode;
 } FT2PT1_info;
 
-static int cubicto(FT_Vector *aControlPt1, FT_Vector *aControlPt2, 
-                   FT_Vector *aEndPt, void *aClosure);
+static int cubicto(constFT_Vector *aControlPt1, constFT_Vector *aControlPt2, 
+                   constFT_Vector *aEndPt, void *aClosure);
 static int Type1CharStringCommand(unsigned char **aBufPtrPtr, int aCmd);
 static int Type1EncodeCharStringInt(unsigned char **aBufPtrPtr, int aValue);
 
@@@@ -173,7 +179,7 @@@@ Type1EncryptString(unsigned char *aInBuf
 }
 
 static PRBool
-sideWidthAndBearing(FT_Vector *aEndPt, FT2PT1_info *aFti)
+sideWidthAndBearing(constFT_Vector *aEndPt, FT2PT1_info *aFti)
 {
   int aw = 0;
   int ah = 0;
@@@@ -216,7 +222,7 @@@@ sideWidthAndBearing(FT_Vector *aEndPt, F
 }
 
 static int
-moveto(FT_Vector *aEndPt, void *aClosure)
+moveto(constFT_Vector *aEndPt, void *aClosure)
 {
   FT2PT1_info *fti = (FT2PT1_info *)aClosure;
   FT_UShort upm = fti->face->units_per_EM;
@@@@ -253,7 +259,7 @@@@ moveto(FT_Vector *aEndPt, void *aClosure
 }
 
 static int
-lineto(FT_Vector *aEndPt, void *aClosure)
+lineto(constFT_Vector *aEndPt, void *aClosure)
 {
   FT2PT1_info *fti = (FT2PT1_info *)aClosure;
   FT_UShort upm = fti->face->units_per_EM;
@@@@ -279,7 +285,7 @@@@ lineto(FT_Vector *aEndPt, void *aClosure
 }
 
 static int
-conicto(FT_Vector *aControlPt, FT_Vector *aEndPt, void *aClosure)
+conicto(constFT_Vector *aControlPt, constFT_Vector *aEndPt, void *aClosure)
 {
   FT2PT1_info *ftinfo = (FT2PT1_info *)aClosure;
   FT_UShort upm = ftinfo->face->units_per_EM;
@@@@ -311,7 +317,7 @@@@ conicto(FT_Vector *aControlPt, FT_Vector
 }
 
 static int
-cubicto(FT_Vector *aControlPt1, FT_Vector *aControlPt2, FT_Vector *aEndPt,
+cubicto(constFT_Vector *aControlPt1, constFT_Vector *aControlPt2, constFT_Vector *aEndPt,
         void *aClosure)
 {
   FT2PT1_info *ftinfo = (FT2PT1_info *)aClosure;
@


1.1
log
@Add patch to make mozilla build with freetype2-2.2.1, from PR pkg/33647.
@
text
@d1 1
a1 1
$NetBSD$
@