Add patch provided by the FreeType2 maintaines to make this package

build with version 2.2.1 and newer of the "freetype2" package.
Bump package revision because of this fix.

3 files changed, 83 insertions, 2 deletions

diff --git a/print/xpdf/Makefile b/print/xpdf/Makefile
index 0912d76d563..ecdd61020d3 100644
--- a/print/xpdf/Makefile
+++ b/print/xpdf/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.55 2006/03/29 17:20:09 joerg Exp $
+# $NetBSD: Makefile,v 1.56 2006/05/30 20:03:28 tron Exp $
 
 DISTNAME=	xpdf-3.01
 PKGNAME=	${DISTNAME}pl2
+PKGREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	ftp://ftp.foolabs.com/pub/xpdf/ \
 		${MASTER_SITE_SUNSITE:=apps/graphics/viewers/X/xpdf/} \
diff --git a/print/xpdf/distinfo b/print/xpdf/distinfo
index b4de9253806..f34694a63d5 100644
--- a/print/xpdf/distinfo
+++ b/print/xpdf/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.26 2006/03/29 17:20:09 joerg Exp $
+$NetBSD: distinfo,v 1.27 2006/05/30 20:03:28 tron Exp $
 
 SHA1 (xpdf-3.01.tar.gz) = 472cbf0f3df4e20a3ab7ada2e704b4e10d1d385b
 RMD160 (xpdf-3.01.tar.gz) = d734065ce12db8d0c37d9d0ac0ca7c287be59442
@@ -21,5 +21,6 @@ SHA1 (patch-al) = b6e958b0592ac285b3ade90079c83da30db8a8b6
 SHA1 (patch-am) = 794ff952c749c8dab6f575d55602cdc7e7157fef
 SHA1 (patch-an) = 94ea208c43f4df1ac3a9bf01cc874d488ae49a9a
 SHA1 (patch-ao) = 3bd1be205e87cdbe3f2329e932c540185a7c3d09
+SHA1 (patch-ap) = e2782308f544d4589590e833897823f4dc1b6315
 SHA1 (patch-ar) = f3d320991e189a21244acd31ca5cc6cfdb18bd96
 SHA1 (patch-au) = af765089ee88369da0afef534f46ec50c5cc6d4f
diff --git a/print/xpdf/patches/patch-ap b/print/xpdf/patches/patch-ap
new file mode 100644
index 00000000000..3562bf9adb9
--- /dev/null
+++ b/print/xpdf/patches/patch-ap
@@ -0,0 +1,79 @@
+$NetBSD: patch-ap,v 1.3 2006/05/30 20:03:28 tron Exp $
+
+--- splash/SplashFTFont.cc.orig	2005-08-17 06:34:31.000000000 +0100
++++ splash/SplashFTFont.cc	2006-05-30 20:29:49.000000000 +0100
+@@ -14,7 +14,8 @@
+ 
+ #include <ft2build.h>
+ #include FT_OUTLINE_H
+-#include FT_INTERNAL_OBJECTS_H // needed for FT_New_Size decl
++#include FT_SIZES_H // needed for FT_New_Size decl
++#include FT_GLYPH_H
+ #include "gmem.h"
+ #include "SplashMath.h"
+ #include "SplashGlyphBitmap.h"
+@@ -25,11 +26,12 @@
+ 
+ //------------------------------------------------------------------------
+ 
+-static int glyphPathMoveTo(FT_Vector *pt, void *path);
+-static int glyphPathLineTo(FT_Vector *pt, void *path);
+-static int glyphPathConicTo(FT_Vector *ctrl, FT_Vector *pt, void *path);
+-static int glyphPathCubicTo(FT_Vector *ctrl1, FT_Vector *ctrl2,
+-			    FT_Vector *pt, void *path);
++static int glyphPathMoveTo( const FT_Vector *pt, void *path);
++static int glyphPathLineTo( const FT_Vector *pt, void *path);
++static int glyphPathConicTo( const FT_Vector *ctrl, const FT_Vector *pt,
++                             void* path );
++static int glyphPathCubicTo( const FT_Vector *ctrl1, const FT_Vector *ctrl2,
++			     const FT_Vector *pt, void *path);
+ 
+ //------------------------------------------------------------------------
+ // SplashFTFont
+@@ -210,7 +212,7 @@
+ };
+ 
+ SplashPath *SplashFTFont::getGlyphPath(int c) {
+-  static FT_Outline_Funcs outlineFuncs = {
++  static const FT_Outline_Funcs outlineFuncs = {
+     &glyphPathMoveTo,
+     &glyphPathLineTo,
+     &glyphPathConicTo,
+@@ -249,7 +251,7 @@
+   return path.path;
+ }
+ 
+-static int glyphPathMoveTo(FT_Vector *pt, void *path) {
++static int glyphPathMoveTo( const FT_Vector *pt, void *path) {
+   SplashFTFontPath *p = (SplashFTFontPath *)path;
+ 
+   if (p->needClose) {
+@@ -260,7 +262,7 @@
+   return 0;
+ }
+ 
+-static int glyphPathLineTo(FT_Vector *pt, void *path) {
++static int glyphPathLineTo(const FT_Vector *pt, void *path) {
+   SplashFTFontPath *p = (SplashFTFontPath *)path;
+ 
+   p->path->lineTo(pt->x / 64.0, -pt->y / 64.0);
+@@ -268,7 +270,7 @@
+   return 0;
+ }
+ 
+-static int glyphPathConicTo(FT_Vector *ctrl, FT_Vector *pt, void *path) {
++static int glyphPathConicTo(const FT_Vector *ctrl, const FT_Vector *pt, void *path) {
+   SplashFTFontPath *p = (SplashFTFontPath *)path;
+   SplashCoord x0, y0, x1, y1, x2, y2, x3, y3, xc, yc;
+ 
+@@ -306,8 +308,8 @@
+   return 0;
+ }
+ 
+-static int glyphPathCubicTo(FT_Vector *ctrl1, FT_Vector *ctrl2,
+-			    FT_Vector *pt, void *path) {
++static int glyphPathCubicTo(const FT_Vector *ctrl1, const FT_Vector *ctrl2,
++			    const FT_Vector *pt, void *path) {
+   SplashFTFontPath *p = (SplashFTFontPath *)path;
+ 
+   p->path->curveTo(ctrl1->x / 64.0, -ctrl1->y / 64.0,