diff options
Diffstat (limited to 'print/xpdf')
-rw-r--r-- | print/xpdf/Makefile | 10 | ||||
-rw-r--r-- | print/xpdf/distinfo | 18 | ||||
-rw-r--r-- | print/xpdf/patches/patch-ap | 80 |
3 files changed, 14 insertions, 94 deletions
diff --git a/print/xpdf/Makefile b/print/xpdf/Makefile index 5a3cd894841..9befbf966e8 100644 --- a/print/xpdf/Makefile +++ b/print/xpdf/Makefile @@ -1,17 +1,11 @@ -# $NetBSD: Makefile,v 1.60 2007/01/17 17:38:05 drochner Exp $ +# $NetBSD: Makefile,v 1.61 2007/03/13 11:06:04 drochner Exp $ -DISTNAME= xpdf-3.01 -PKGNAME= ${DISTNAME}pl2 -PKGREVISION= 2 +DISTNAME= xpdf-3.02 CATEGORIES= print MASTER_SITES= ftp://ftp.foolabs.com/pub/xpdf/ \ ${MASTER_SITE_SUNSITE:=apps/graphics/viewers/X/xpdf/} \ http://gd.tuwien.ac.at/publishing/xpdf/ -PATCH_SITES= ${MASTER_SITES} -PATCHFILES= xpdf-3.01pl2.patch -PATCH_DIST_STRIP= -p1 - MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.foolabs.com/xpdf/ COMMENT= Display tool for PDF files diff --git a/print/xpdf/distinfo b/print/xpdf/distinfo index 8ba25565b2c..3ec55ac8cc8 100644 --- a/print/xpdf/distinfo +++ b/print/xpdf/distinfo @@ -1,11 +1,8 @@ -$NetBSD: distinfo,v 1.28 2007/01/17 17:38:05 drochner Exp $ +$NetBSD: distinfo,v 1.29 2007/03/13 11:06:04 drochner Exp $ -SHA1 (xpdf-3.01.tar.gz) = 472cbf0f3df4e20a3ab7ada2e704b4e10d1d385b -RMD160 (xpdf-3.01.tar.gz) = d734065ce12db8d0c37d9d0ac0ca7c287be59442 -Size (xpdf-3.01.tar.gz) = 599778 bytes -SHA1 (xpdf-3.01pl2.patch) = c04ce1cc5ef30aa47ea528124d2ffbd840d22472 -RMD160 (xpdf-3.01pl2.patch) = 5425c78f300b6e6eadf7a68327849c7f91b42b9f -Size (xpdf-3.01pl2.patch) = 12097 bytes +SHA1 (xpdf-3.02.tar.gz) = f9940698840c8a8045677e8be68ab8580903e20a +RMD160 (xpdf-3.02.tar.gz) = e900cb8670b8c430beaa45895fb474411cb1958d +Size (xpdf-3.02.tar.gz) = 674912 bytes SHA1 (patch-aa) = 6664207f59076a2612cf4141b7ab4b072b404e3a SHA1 (patch-ab) = fd4205c477ee4ac7660b8c1a707ea7b528ac4f90 SHA1 (patch-ac) = 6fa74df05e01510c792eb2b20f670e6903f30aa2 @@ -20,9 +17,4 @@ SHA1 (patch-ak) = ed9506fd0cba7e350608cd40b1f794253f30e917 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 -SHA1 (patch-av) = c4110136862eae9dba84c4abf387c2e580d3e8e0 -SHA1 (patch-aw) = 0aae65012380a0c75596ae260713fdc41b35f9ce +SHA1 (patch-ap) = 5961dfe22ac087a7df0311235b4fab27d7554c58 diff --git a/print/xpdf/patches/patch-ap b/print/xpdf/patches/patch-ap index 3562bf9adb9..c712c972ff5 100644 --- a/print/xpdf/patches/patch-ap +++ b/print/xpdf/patches/patch-ap @@ -1,79 +1,13 @@ -$NetBSD: patch-ap,v 1.3 2006/05/30 20:03:28 tron Exp $ +$NetBSD: patch-ap,v 1.4 2007/03/13 11:06:04 drochner 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 @@ +--- splash/SplashFTFont.cc.orig 2007-02-27 23:05:52.000000000 +0100 ++++ splash/SplashFTFont.cc +@@ -229,7 +229,7 @@ struct SplashFTFontPath { }; 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, + #if FREETYPE_MINOR <= 1 + (int (*)(FT_Vector *, void *))&glyphPathMoveTo, + (int (*)(FT_Vector *, void *))&glyphPathLineTo, |