mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-12 07:27:57 +00:00
Code Issues Releases Activity

Update to 3.02.

Browse Source 
PR:		ports/110058
Submitted by:	Eric P. Scott <eps+pbug0703 <at> ana.com>
		Jose Garcia Juanino <jjuanino <at> gmail.com>
This commit is contained in:
Norikatsu Shigemura 2007-04-01 13:14:26 +00:00
parent ce5d87fdc2
commit a43acc3732
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=188941
11 changed files with 96 additions and 162 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
graphics/xpdf/Makefile
View File

@ -6,15 +6,15 @@
#
PORTNAME= xpdf
PORTVERSION= 3.01
PORTREVISION= 3
PORTVERSION= 3.02
PORTREVISION= 0
CATEGORIES= graphics print
MASTER_SITES= ftp://ftp.foolabs.com/pub/xpdf/ \
${MASTER_SITE_TEX_CTAN}
MASTER_SITE_SUBDIR= support/xpdf
PATCH_SITES= ftp://ftp.foolabs.com/pub/xpdf/
PATCHFILES= xpdf-3.01pl2.patch
PATCHFILES=
PATCH_DIST_STRIP= -p1
MAINTAINER= nork@FreeBSD.org
@ -30,11 +30,20 @@ USE_AUTOTOOLS= autoconf:259
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
CONFIGURE_ARGS= --with-gzip --enable-opi \
CONFIGURE_ARGS= --enable-opi \
--with-t1-library="${LOCALBASE}/lib" \
--with-t1-includes="${LOCALBASE}/include" \
--with-freetype2-library="${LOCALBASE}/lib" \
--with-freetype2-includes="${LOCALBASE}/include/freetype2"
.if defined(WITH_LIBPAPER)
LIB_DEPENDS+= paper.2:${PORTSDIR}/print/libpaper
CONFIGURE_ARGS+=--with-libpaper-library="${LOCALBASE}/lib" \
--with-libpaper-includes="${LOCALBASE}/include"
.else
CONFIGURE_ARGS+=--without-libpaper-library
.endif
.if defined(A4)
CONFIGURE_ARGS+= --enable-a4-paper
.endif

9
graphics/xpdf/distinfo
View File

@ -1,6 +1,3 @@
MD5 (xpdf-3.01.tar.gz) = e004c69c7dddef165d768b1362b44268
SHA256 (xpdf-3.01.tar.gz) = 7aedfb8cd113b868277c3d894633dd6e0f5a8ed28af12f5d883ae4ed98e9f789
SIZE (xpdf-3.01.tar.gz) = 599778
MD5 (xpdf-3.01pl2.patch) = 8f1f5d37153c7e98f794f18d0b80fc25
SHA256 (xpdf-3.01pl2.patch) = f12ac2aafbe172ddd9d6392b7eab1ece8b5ca079ed3ddf924b4e796157243ab1
SIZE (xpdf-3.01pl2.patch) = 12097
MD5 (xpdf-3.02.tar.gz) = 599dc4cc65a07ee868cf92a667a913d2
SHA256 (xpdf-3.02.tar.gz) = b33a7d56f454c331ae50996f989e86c9166e57af97b74de28cddf3d51ac11f00
SIZE (xpdf-3.02.tar.gz) = 674912

4
graphics/xpdf/files/patch-Makefile.in
View File

@ -1,5 +1,5 @@
--- Makefile.in.orig Thu Dec 1 17:04:10 2005
+++ Makefile.in Thu Dec 1 17:04:31 2005
--- Makefile.in.orig Tue Feb 27 14:05:51 2007
+++ Makefile.in
@@ -82,7 +82,7 @@
$(INSTALL_PROGRAM) xpdf/pdftotext$(EXE) $(DESTDIR)@bindir@/pdftotext$(EXE)
$(INSTALL_PROGRAM) xpdf/pdfinfo$(EXE) $(DESTDIR)@bindir@/pdfinfo$(EXE)

6
graphics/xpdf/files/patch-configure
View File

@ -1,6 +1,6 @@
--- configure.orig Thu Dec 1 17:06:03 2005
+++ configure Thu Dec 1 17:06:25 2005
@@ -11776,8 +11776,8 @@
--- configure.orig Tue Feb 27 14:05:51 2007
+++ configure
@@ -11798,8 +11798,8 @@
{ echo "$as_me:$LINENO: WARNING: Couldn't find FreeType" >&5
echo "$as_me: WARNING: Couldn't find FreeType" >&2;};
fi

6
graphics/xpdf/files/patch-configure.in
View File

@ -1,6 +1,6 @@
--- configure.in.orig Thu Dec 1 17:05:11 2005
+++ configure.in Thu Dec 1 17:05:25 2005
@@ -341,6 +341,6 @@
--- configure.in.orig Tue Feb 27 14:05:51 2007
+++ configure.in
@@ -348,6 +348,6 @@
if test "x$smr_have_freetype2_library" != xyes; then
AC_MSG_WARN([Couldn't find FreeType]);
fi

76
graphics/xpdf/files/patch-gmem
View File

@ -1,79 +1,95 @@
--- goo/gmem.c.orig Fri Sep 30 20:26:50 2005
+++ goo/gmem.c Fri Sep 30 20:28:56 2005
@@ -54,9 +54,9 @@
--- goo/gmem.cc.orig Tue Feb 27 14:05:51 2007
+++ goo/gmem.cc
@@ -47,9 +47,9 @@
#endif /* DEBUG_MEM */
-void *gmalloc(int size) {
+void *gmalloc(size_t size) {
-void *gmalloc(int size) GMEM_EXCEP {
+void *gmalloc(size_t size) GMEM_EXCEP {
#ifdef DEBUG_MEM
- int size1;
+ size_t size1;
char *mem;
GMemHdr *hdr;
void *data;
@@ -96,11 +96,11 @@
@@ -106,11 +106,11 @@
#endif
}
-void *grealloc(void *p, int size) {
+void *grealloc(void *p, size_t size) {
-void *grealloc(void *p, int size) GMEM_EXCEP {
+void *grealloc(void *p, size_t size) GMEM_EXCEP {
#ifdef DEBUG_MEM
GMemHdr *hdr;
void *q;
- int oldSize;
+ size_t oldSize;
if (size == 0) {
if (p)
@@ -137,8 +137,8 @@
if (size <= 0) {
if (p) {
@@ -154,14 +154,14 @@
#endif
}
-void *gmallocn(int nObjs, int objSize) {
-void *gmallocn(int nObjs, int objSize) GMEM_EXCEP {
- int n;
+void *gmallocn(int nObjs, size_t objSize) {
+void *gmallocn(int nObjs, size_t objSize) GMEM_EXCEP {
+ size_t n;
if (nObjs == 0) {
return NULL;
}
n = nObjs * objSize;
if (objSize == 0 || n / objSize != nObjs) {
@@ -148,8 +148,8 @@
- if (objSize <= 0 || nObjs < 0 || nObjs >= INT_MAX / objSize) {
+ if (objSize == 0u || nObjs < 0 || (size_t)nObjs >= INT_MAX / objSize) {
#if USE_EXCEPTIONS
throw GMemException();
#else
@@ -172,8 +172,8 @@
return gmalloc(n);
}
-void *greallocn(void *p, int nObjs, int objSize) {
-void *greallocn(void *p, int nObjs, int objSize) GMEM_EXCEP {
- int n;
+void *greallocn(void *p, int nObjs, size_t objSize) {
+void *greallocn(void *p, int nObjs, size_t objSize) GMEM_EXCEP {
+ size_t n;
if (nObjs == 0) {
if (p) {
@@ -182,7 +182,7 @@
return NULL;
}
n = nObjs * objSize;
if (objSize == 0 || n / objSize != nObjs) {
--- goo/gmem.h.orig Wed Aug 17 01:34:30 2005
+++ goo/gmem.h Fri Sep 30 20:26:38 2005
@@ -19,13 +19,13 @@
- if (objSize <= 0 || nObjs < 0 || nObjs >= INT_MAX / objSize) {
+ if (objSize == 0u || nObjs < 0 || (size_t)nObjs >= INT_MAX / objSize) {
#if USE_EXCEPTIONS
throw GMemException();
#else
--- goo/gmem.h.orig Tue Feb 27 14:05:51 2007
+++ goo/gmem.h
@@ -36,13 +36,13 @@
* Same as malloc, but prints error message and exits if malloc()
* returns NULL.
*/
-extern void *gmalloc(int size);
+extern void *gmalloc(size_t size);
-extern void *gmalloc(int size) GMEM_EXCEP;
+extern void *gmalloc(size_t size) GMEM_EXCEP;
/*
* Same as realloc, but prints error message and exits if realloc()
* returns NULL. If <p> is NULL, calls malloc instead of realloc().
*/
-extern void *grealloc(void *p, int size);
+extern void *grealloc(void *p, size_t size);
-extern void *grealloc(void *p, int size) GMEM_EXCEP;
+extern void *grealloc(void *p, size_t size) GMEM_EXCEP;
/*
* These are similar to gmalloc and grealloc, but take an object count
@@ -33,8 +33,8 @@
@@ -50,8 +50,8 @@
* bytes, but there is an additional error check that the total size
* doesn't overflow an int.
*/
-extern void *gmallocn(int nObjs, int objSize);
-extern void *greallocn(void *p, int nObjs, int objSize);
+extern void *gmallocn(int nObjs, size_t objSize);
+extern void *greallocn(void *p, int nObjs, size_t objSize);
-extern void *gmallocn(int nObjs, int objSize) GMEM_EXCEP;
-extern void *greallocn(void *p, int nObjs, int objSize) GMEM_EXCEP;
+extern void *gmallocn(int nObjs, size_t objSize) GMEM_EXCEP;
+extern void *greallocn(void *p, int nObjs, size_t objSize) GMEM_EXCEP;
/*
* Same as free, but checks for and ignores NULL pointers.

36
graphics/xpdf/files/patch-resize
View File

@ -1,36 +0,0 @@
--- xpdf/XPDFCore.cc 2005-10-10 23:33:08.000000000 +1000
+++ xpdf/XPDFCore.cc 2005-10-10 23:33:44.000000000 +1000
@@ -975,6 +975,9 @@
XPDFCore *core = (XPDFCore *)ptr;
XEvent event;
Widget top;
+ Window rootWin;
+ int x1, y1;
+ Guint w1, h1, bw1, depth1;
Arg args[2];
int n;
Dimension w, h;
@@ -982,15 +985,20 @@
// find the top-most widget which has an associated window, and look
// for a pending ConfigureNotify in the event queue -- if there is
- // one, that means we're still resizing, and we want to skip the
- // current event
+ // one, and it specifies a different width or height, that means
+ // we're still resizing, and we want to skip the current event
for (top = core->parentWidget;
XtParent(top) && XtWindow(XtParent(top));
top = XtParent(top)) ;
if (XCheckTypedWindowEvent(core->display, XtWindow(top),
ConfigureNotify, &event)) {
XPutBackEvent(core->display, &event);
- return;
+ XGetGeometry(core->display, event.xconfigure.window,
+ &rootWin, &x1, &y1, &w1, &h1, &bw1, &depth1);
+ if ((Guint)event.xconfigure.width != w1 ||
+ (Guint)event.xconfigure.height != h1) {
+ return;
+ }
}
n = 0;

14
graphics/xpdf/files/patch-splash_Splash.cc Normal file
View File

@ -0,0 +1,14 @@
--- splash/Splash.cc.orig Tue Feb 27 14:05:52 2007
+++ splash/Splash.cc
@@ -2826,7 +2826,10 @@
void Splash::compositeBackground(SplashColorPtr color) {
SplashColorPtr p;
Guchar *q;
- Guchar alpha, alpha1, c, color0, color1, color2, color3;
+ Guchar alpha, alpha1, c, color0, color1, color2;
+#if SPLASH_CMYK
+ Guchar color3;
+#endif
int x, y, mask;
switch (bitmap->mode) {

78
graphics/xpdf/files/patch-splash_SplashFTFont.cc
View File

@ -1,77 +1,11 @@
--- splash/SplashFTFont.cc.orig 2005-12-23 16:57:18.076514614 +0100
+++ splash/SplashFTFont.cc 2005-12-23 17:33:42.731318339 +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 Tue Feb 27 14:05:52 2007
+++ splash/SplashFTFont.cc
@@ -229,7 +229,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,
#if FREETYPE_MINOR <= 1
(int (*)(FT_Vector *, void *))&glyphPathMoveTo,
(int (*)(FT_Vector *, void *))&glyphPathLineTo,

6
graphics/xpdf/files/patch-xfont
View File

@ -1,6 +1,6 @@
--- xpdf/XPDFViewer.cc.orig 2004-10-12 12:24:57.055068037 +0200
+++ xpdf/XPDFViewer.cc 2004-10-12 12:24:47.707449614 +0200
@@ -1742,7 +1742,7 @@
--- xpdf/XPDFViewer.cc.orig Tue Feb 27 14:05:52 2007
+++ xpdf/XPDFViewer.cc
@@ -2791,7 +2791,7 @@
aboutBigFont =
createFontList("-*-times-bold-i-normal--20-*-*-*-*-*-iso8859-1");
aboutVersionFont =

6
graphics/xpdf/files/patch-xpdf::Makefile.in
View File

@ -1,6 +1,6 @@
--- xpdf/Makefile.in.orig Thu Dec 1 17:10:20 2005
+++ xpdf/Makefile.in Thu Dec 1 17:10:34 2005
@@ -109,7 +109,7 @@
--- xpdf/Makefile.in.orig Tue Feb 27 14:05:52 2007
+++ xpdf/Makefile.in
@@ -110,7 +110,7 @@
pdffonts$(EXE) pdftoppm$(EXE) pdfimages$(EXE)
all-no-x: pdftops$(EXE) pdftotext$(EXE) pdfinfo$(EXE) pdffonts$(EXE) \