OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 06-Jun-2006 13:11:00
Branch: HEAD Handle: 2006060612105900
Added files:
openpkg-src/xpdf xpdf.patch
Modified files:
openpkg-src/xpdf xpdf.spec
Log:
upgrade to vendor patchlevel 2 and fix building against latest
FreeType
Summary:
Revision Changes Path
1.5 +68 -0 openpkg-src/xpdf/xpdf.patch
1.21 +9 -5 openpkg-src/xpdf/xpdf.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/xpdf/xpdf.patch
============================================================================
$ cvs diff -u -r0 -r1.5 xpdf.patch
--- /dev/null 2006-06-06 13:10:54 +0200
+++ xpdf.patch 2006-06-06 13:11:00 +0200
@@ -0,0 +1,68 @@
+Index: splash/SplashFTFont.cc
+--- splash/SplashFTFont.cc.orig 2005-08-17 07:34:31 +0200
++++ splash/SplashFTFont.cc 2006-06-06 12:55:31 +0200
+@@ -14,7 +14,8 @@
+
+ #include <ft2build.h>
+ #include FT_OUTLINE_H
+-#include FT_INTERNAL_OBJECTS_H // needed for FT_New_Size decl
++#include <freetype/ftsizes.h>
++#include <freetype/ftglyph.h>
+ #include "gmem.h"
+ #include "SplashMath.h"
+ #include "SplashGlyphBitmap.h"
+@@ -25,11 +26,11 @@
+
+ //------------------------------------------------------------------------
+
+-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
+@@ -249,7 +250,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 +261,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 +269,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 +307,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,
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/xpdf/xpdf.spec
============================================================================
$ cvs diff -u -r1.20 -r1.21 xpdf.spec
--- openpkg-src/xpdf/xpdf.spec 16 Feb 2006 18:03:43 -0000 1.20
+++ openpkg-src/xpdf/xpdf.spec 6 Jun 2006 11:10:59 -0000 1.21
@@ -37,17 +37,20 @@
Group: Graphics
License: GPL
Version: %{V_base}pl%{V_patchlevel}
-Release: 20060216
+Release: 20060606
# list of sources
Source0: ftp://ftp.foolabs.com/pub/xpdf/xpdf-%{V_base}.tar.gz
-Patch0: ftp://ftp.foolabs.com/pub/xpdf/xpdf-%{V_base}pl1.patch
+Patch0: xpdf.patch
+Patch1:
ftp://ftp.foolabs.com/pub/xpdf/xpdf-%{V_base}pl%{V_patchlevel}.patch
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20040130, X11, freetype >= 2.1.7, t1lib,
xpm, lesstif, gcc
-PreReq: OpenPKG, openpkg >= 20040130, X11, freetype >= 2.1.7, t1lib,
xpm, lesstif
+BuildPreReq: OpenPKG, openpkg >= 20040130, gcc
+PreReq: OpenPKG, openpkg >= 20040130
+BuildPreReq: X11, freetype >= 2.2, t1lib, xpm, lesstif
+PreReq: X11, freetype >= 2.2, t1lib, xpm, lesstif
AutoReq: no
AutoReqProv: no
@@ -71,7 +74,8 @@
%prep
%setup -q -n xpdf-%{V_base}
- %patch -p1
+ %patch -p0
+ %patch -p1 -P 1
%build
CC="%{l_cc}" \
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
