- fix build with new FT (thx to Szymon Siwek /sls monkey poczta dot wp dot pl/.

Changed files:
    xpdf-noftinternals.patch -> 1.1
    xpdf.spec -> 1.101

diff --git a/xpdf-noftinternals.patch b/xpdf-noftinternals.patch
new file mode 100644 (file)
index 0000000..86c2d16
--- /dev/null
+++ b/xpdf-noftinternals.patch
@@ -0,0 +1,78 @@
+diff -urN xpdf-3.01-org/splash/SplashFTFont.cc xpdf-3.01/splash/SplashFTFont.cc
+--- xpdf-3.01-org/splash/SplashFTFont.cc       2005-12-23 16:57:18.076514614 +0100
++++ xpdf-3.01/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 @@
+ };
+ 
+ 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,

diff --git a/xpdf.spec b/xpdf.spec
index 528c16426dac7a3c6c627d8fab3813ec7242e0f1..fe6fc230f53f2ee25e25734370880a1bf6de59e8 100644 (file)
--- a/xpdf.spec
+++ b/xpdf.spec
@@ -29,6 +29,7 @@ Patch1:               %{name}-fontdirs.patch
 Patch2:                %{name}-nonumericlocale.patch
 Patch3:                %{name}-%{version}pl2.patch
 Patch4:                %{name}-cve-2006-0301.patch
+Patch5:                %{name}-noftinternals.patch
 URL:           http://www.foolabs.com/xpdf/
 %{?with_x:BuildRequires:       xorg-lib-libX11-devel}
 BuildRequires: autoconf
@@ -107,6 +108,7 @@ pdftops, pdftotext).
 %patch1 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 %build
 %{__autoconf}