Bläddra i källkod

fix building with latest freetype library

Ralf S. Engelschall 22 år sedan
förälder
incheckning
79909102de
2 ändrade filer med 26 tillägg och 3 borttagningar
  1. 21 0
      xpdf/xpdf.patch
  2. 5 3
      xpdf/xpdf.spec

+ 21 - 0
xpdf/xpdf.patch

@@ -0,0 +1,21 @@
+Index: xpdf/FTFont.cc
+--- xpdf/FTFont.cc.orig	2003-10-11 22:39:11.000000000 +0200
++++ xpdf/FTFont.cc	2003-11-11 21:21:01.000000000 +0100
+@@ -19,7 +19,7 @@
+ #include "gmem.h"
+ #include "freetype/ftoutln.h"
+ #include "freetype/internal/ftobjs.h"
+-#if 1 //~ cff cid->gid map
++#if 0 //~ cff cid->gid map
+ #include "freetype/internal/cfftypes.h"
+ #include "freetype/internal/tttypes.h"
+ #endif
+@@ -676,7 +676,7 @@
+     }
+     break;
+   case ftFontModeCFFCharset:
+-#if 1 //~ cff cid->gid map
++#if 0 //~ cff cid->gid map
+     {
+ #if FREETYPE_MAJOR == 2 && FREETYPE_MINOR == 0
+       CFF_Font *cff = (CFF_Font *)((TT_Face)fontFile->face)->extra.data;

+ 5 - 3
xpdf/xpdf.spec

@@ -33,16 +33,17 @@ Distribution: OpenPKG [EVAL]
 Group:        Graphics
 License:      GPL
 Version:      2.03
-Release:      20031107
+Release:      20031111
 
 #   list of sources
 Source0:      ftp://ftp.foolabs.com/pub/xpdf/xpdf-%{version}.tar.gz
+Patch0:       xpdf.patch
 
 #   build information
 Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
-BuildPreReq:  OpenPKG, openpkg >= 20030103, X11, freetype, t1lib, xpm, lesstif, gcc
-PreReq:       OpenPKG, openpkg >= 20030103, X11, freetype, t1lib, xpm, lesstif
+BuildPreReq:  OpenPKG, openpkg >= 20030103, X11, freetype >= 2.1.7, t1lib, xpm, lesstif, gcc
+PreReq:       OpenPKG, openpkg >= 20030103, X11, freetype >= 2.1.7, t1lib, xpm, lesstif
 AutoReq:      no
 AutoReqProv:  no
 
@@ -54,6 +55,7 @@ AutoReqProv:  no
 
 %prep
     %setup -q
+    %patch -p0
 
 %build
     CC="%{l_cc}" \