Fixes build against freetype-2.2, taken from https://mail-index.netbsd.org/pkgsrc-bugs/2006/06/05/0005.html thanks! --- ./gfx/src/ps/nsType1.cpp.orig 2006-06-05 11:29:08.000000000 +0000 +++ ./gfx/src/ps/nsType1.cpp 2006-06-05 12:05:36.000000000 +0000 @@ -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 @@ 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 @@ } 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 @@ } 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 @@ } 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 @@ } 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 @@ } 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;