diff options
Diffstat (limited to 'www/mozilla')
| -rw-r--r-- | www/mozilla/distinfo | 3 | ||||
| -rw-r--r-- | www/mozilla/patches/patch-co | 73 |
2 files changed, 75 insertions, 1 deletions
diff --git a/www/mozilla/distinfo b/www/mozilla/distinfo index 18c2bea8a5e..f89ec1c58cd 100644 --- a/www/mozilla/distinfo +++ b/www/mozilla/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.89 2006/04/24 16:52:58 veego Exp $ +$NetBSD: distinfo,v 1.90 2006/06/06 18:28:45 ghen Exp $ SHA1 (mozilla-1.7.13/mozilla-1.7.13-source.tar.bz2) = c506df44c18cd8a481fdd65328bf8abeba2e423e RMD160 (mozilla-1.7.13/mozilla-1.7.13-source.tar.bz2) = 4360b48c8930dc427f6010c57abb8b2d0c855761 @@ -46,3 +46,4 @@ SHA1 (patch-ck) = 5db42f8047046e10f388bdaf299c35c415a50f8d SHA1 (patch-cl) = 1450e99f5e5f31f0e8d01b68bb50494f84eed068 SHA1 (patch-cm) = 2a347bcf5814816539835caf65dd888f71ceea20 SHA1 (patch-cn) = e9cb26ee724c044491cc1b02d6eeb59b50769edf +SHA1 (patch-co) = 2d0c80d7f6df59c5c12f559f1c409a82e057959d diff --git a/www/mozilla/patches/patch-co b/www/mozilla/patches/patch-co new file mode 100644 index 00000000000..a449c1cade8 --- /dev/null +++ b/www/mozilla/patches/patch-co @@ -0,0 +1,73 @@ +$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; |