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 openpkg$ Date: 07-Nov-2003 21:12:49
Branch: HEAD Handle: 2003110720124702
Added files:
openpkg-src/ttmkfdir ttmkfdir.patch
Modified files:
openpkg-re/vcheck vc.ttmkfdir
openpkg-src/ttmkfdir ttmkfdir.spec
openpkg-web news.txt
Log:
update a more recent version which especially uses freetype 2.x
Summary:
Revision Changes Path
1.2 +3 -5 openpkg-re/vcheck/vc.ttmkfdir
1.1 +63 -0 openpkg-src/ttmkfdir/ttmkfdir.patch
1.9 +12 -9 openpkg-src/ttmkfdir/ttmkfdir.spec
1.7318 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-re/vcheck/vc.ttmkfdir
============================================================================
$ cvs diff -u -r1.1 -r1.2 vc.ttmkfdir
--- openpkg-re/vcheck/vc.ttmkfdir 22 Dec 2002 08:54:48 -0000 1.1
+++ openpkg-re/vcheck/vc.ttmkfdir 7 Nov 2003 20:12:47 -0000 1.2
@@ -2,10 +2,8 @@
}
prog ttmkfdir = {
- disabled
- comment = "rse: no versioned tarball available"
- version = 1998
- url = http://www.joerg-pommnitz.de/TrueType/xfsft.html
- regex = ttmkfdir\.tar\.gz
+ version = 20021109
+ url = http://people.redhat.com/yshao/
+ regex = ttmkfdir2\.(__VER__)\.tar\.bz2
}
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/ttmkfdir/ttmkfdir.patch
============================================================================
$ cvs diff -u -r0 -r1.1 ttmkfdir.patch
--- /dev/null 2003-11-07 21:12:49.000000000 +0100
+++ ttmkfdir.patch 2003-11-07 21:12:49.000000000 +0100
@@ -0,0 +1,63 @@
+Index: ttf.cpp
+--- ttf.cpp.orig 2002-11-07 06:30:04.000000000 +0100
++++ ttf.cpp 2003-11-07 21:02:17.000000000 +0100
+@@ -226,7 +226,7 @@
+ for (i = 0; i < n; i++) {
+ if ((fterror = FT_Get_Sfnt_Name (face, i, &NamePtr)) != FT_Err_Ok) {
+ std::cout << "Warning: Can't SFNT name : " << FileName << "("
<< fterror << ")" << std::endl;
+- return;
++ return "unknown";
+ };
+ platform = NamePtr.platform_id;
+ encoding = NamePtr.encoding_id;
+Index: ttf.h
+--- ttf.h.orig 2002-11-07 06:28:44.000000000 +0100
++++ ttf.h 2003-11-07 21:02:17.000000000 +0100
+@@ -8,7 +8,7 @@
+ #include "freetype/ftsnames.h"
+ #include "freetype/ttnameid.h"
+ #include "freetype/fterrors.h"
+-#include "freetype/ftmodule.h"
++#include "freetype/ftmodapi.h"
+
+ #include "util.h"
+ #include "encoding.h"
+Index: Makefile
+--- Makefile.orig 2002-11-07 06:28:44.000000000 +0100
++++ Makefile 2003-11-07 21:08:12.000000000 +0100
+@@ -1,25 +1,22 @@
+-FREETYPE_BASE=/usr/include/freetype2
+-FREETYPE_INCL=-I$(FREETYPE_BASE)/.
+-FREETYPE_LIB=/usr/lib/libfreetype.so
+-
+-DEBUG=-ggdb
+-CXX=g++
+-CXXFLAGS=-Wall -pedantic $(FREETYPE_INCL) $(DEBUG)
+
+-LDFLAGS=$(FREETYPE_LIB) $(DEBUG)
++FREETYPE_INCDIR = /cw/include
++FREETYPE_LIBDIR = /cw/lib
++
++CXX = g++
++CXXFLAGS = -I$(FREETYPE_INCDIR)
++LDFLAGS = -L$(FREETYPE_LIBDIR)
++LIBS = -lfreetype -lz -lgetopt
+
+ .PHONY: clean
+
+ all: ttmkfdir
+
+-.cpp.o:
+- libtool --mode=compile $(CXX) $(CXXFLAGS) -o $@ -c $^
+-
+ ttmkfdir: ttmkfdir.o directory.o commandline.o ttf.o encoding.o parser.o builtin.o
+- libtool --mode=link $(CXX) -o $@ $^ $(LDFLAGS)
++ $(CXX) $(LDFLAGS) -o $@ $^ $(LIBS)
+
+ parser.cpp: encoding.l
+- flex -i -8 -o$@ $<
++ flex -i -8 -o$@ $<
+
+ clean:
+ -rm -f *.o *~ ttmkfdir core parser.cpp
++
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/ttmkfdir/ttmkfdir.spec
============================================================================
$ cvs diff -u -r1.8 -r1.9 ttmkfdir.spec
--- openpkg-src/ttmkfdir/ttmkfdir.spec 8 Jul 2003 14:42:58 -0000 1.8
+++ openpkg-src/ttmkfdir/ttmkfdir.spec 7 Nov 2003 20:12:49 -0000 1.9
@@ -32,19 +32,20 @@
Distribution: OpenPKG [PLUS]
Group: Graphics
License: GPL
-Version: 1998
-Release: 20030707
+Version: 20021109
+Release: 20031107
# list of sources
-Source0: http://www.joerg-pommnitz.de/TrueType/ttmkfdir.tar.gz
+Source0: http://people.redhat.com/yshao/ttmkfdir2.%{version}.tar.bz2
+Patch0: ttmkfdir.patch
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20020206
+BuildPreReq: OpenPKG, openpkg >= 20020206, gcc, make, flex
PreReq: OpenPKG, openpkg >= 20020206
-BuildPreReq: freetype1
-PreReq: freetype1
+BuildPreReq: freetype, zlib, getopt
+PreReq: freetype, zlib, getopt
AutoReq: no
AutoReqProv: no
@@ -55,11 +56,13 @@
necessary for the X11 server to know about fonts in a directory.
%prep
- %setup -q -c
+ %setup -q -n ttmkfdir2
+ %patch -p0
%build
- %{l_cc} %{l_cflags -O} %{l_cppflags freetype} \
- -o ttmkfdir ttmkfdir.c %{l_ldflags} -lttf
+ %{l_make} %{l_mflags} \
+ FREETYPE_INCDIR=%{l_prefix}/include \
+ FREETYPE_LIBDIR=%{l_prefix}/lib
%install
rm -rf $RPM_BUILD_ROOT
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.7317 -r1.7318 news.txt
--- openpkg-web/news.txt 7 Nov 2003 11:48:37 -0000 1.7317
+++ openpkg-web/news.txt 7 Nov 2003 20:12:48 -0000 1.7318
@@ -1,3 +1,4 @@
+07-Nov-2003: Upgraded package: P<ttmkfdir-20021109-20031107>
07-Nov-2003: Upgraded package: P<openpkg-20031107-20031107>
07-Nov-2003: Upgraded package: P<pkgconfig-0.15.0-20031107>
07-Nov-2003: Upgraded package: P<perl-5.8.2-20031107>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
