OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 11-Nov-2003 21:25:26
Branch: HEAD Handle: 2003111120252401
Added files:
openpkg-src/xpdf xpdf.patch
Modified files:
openpkg-src/xpdf xpdf.spec
openpkg-web news.txt
Log:
fix building with latest freetype library
Summary:
Revision Changes Path
1.1 +21 -0 openpkg-src/xpdf/xpdf.patch
1.4 +5 -3 openpkg-src/xpdf/xpdf.spec
1.7371 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/xpdf/xpdf.patch
============================================================================
$ cvs diff -u -r0 -r1.1 xpdf.patch
--- /dev/null 2003-11-11 21:25:25.000000000 +0100
+++ xpdf.patch 2003-11-11 21:25:25.000000000 +0100
@@ -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;
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/xpdf/xpdf.spec
============================================================================
$ cvs diff -u -r1.3 -r1.4 xpdf.spec
--- openpkg-src/xpdf/xpdf.spec 7 Nov 2003 20:25:28 -0000 1.3
+++ openpkg-src/xpdf/xpdf.spec 11 Nov 2003 20:25:25 -0000 1.4
@@ -33,16 +33,17 @@
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 @@
%prep
%setup -q
+ %patch -p0
%build
CC="%{l_cc}" \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.7370 -r1.7371 news.txt
--- openpkg-web/news.txt 11 Nov 2003 20:21:58 -0000 1.7370
+++ openpkg-web/news.txt 11 Nov 2003 20:25:24 -0000 1.7371
@@ -1,3 +1,4 @@
+11-Nov-2003: Upgraded package: P<xpdf-2.03-20031111>
11-Nov-2003: Upgraded package: P<inn-2.4.0-20031111>
11-Nov-2003: Upgraded package: P<oidentd-2.0.7-20031111>
11-Nov-2003: Upgraded package: P<postgresql-7.3.1-1.2.4>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
