diff options
Diffstat (limited to 'x11-misc/ttmkfdir/files')
11 files changed, 0 insertions, 337 deletions
diff --git a/x11-misc/ttmkfdir/files/digest-ttmkfdir-3.0.9-r2 b/x11-misc/ttmkfdir/files/digest-ttmkfdir-3.0.9-r2 deleted file mode 100644 index 23c8357a597c..000000000000 --- a/x11-misc/ttmkfdir/files/digest-ttmkfdir-3.0.9-r2 +++ /dev/null @@ -1 +0,0 @@ -MD5 7fbf13e432aa519669899b13d00673f3 ttmkfdir-3.0.9.tar.bz2 20160 diff --git a/x11-misc/ttmkfdir/files/digest-ttmkfdir-3.0.9-r3 b/x11-misc/ttmkfdir/files/digest-ttmkfdir-3.0.9-r3 deleted file mode 100644 index 23c8357a597c..000000000000 --- a/x11-misc/ttmkfdir/files/digest-ttmkfdir-3.0.9-r3 +++ /dev/null @@ -1 +0,0 @@ -MD5 7fbf13e432aa519669899b13d00673f3 ttmkfdir-3.0.9.tar.bz2 20160 diff --git a/x11-misc/ttmkfdir/files/ttmkfdir-1.0-gentoo.diff b/x11-misc/ttmkfdir/files/ttmkfdir-1.0-gentoo.diff deleted file mode 100644 index 37d8f7055b68..000000000000 --- a/x11-misc/ttmkfdir/files/ttmkfdir-1.0-gentoo.diff +++ /dev/null @@ -1,46 +0,0 @@ -diff -ur ttmkfdir.orig/Makefile ttmkfdir/Makefile ---- ttmkfdir.orig/Makefile Thu Sep 10 12:54:26 1998 -+++ ttmkfdir/Makefile Thu Mar 1 15:29:38 2001 -@@ -1,10 +1,11 @@ --FREETYPE_BASE=../freetype-1.1 --FREETYPE_INCL=$(FREETYPE_BASE)/lib --FREETYPE_LIB=-L$(FREETYPE_BASE)/lib/.libs -lttf -+FREETYPE_BASE=/usr -+FREETYPE_INCL=-I$(FREETYPE_BASE)/include -+FREETYPE_LIB=-L$(FREETYPE_BASE)/lib -lttf - - CC=gcc --CFLAGS=-Wall -pedantic -I$(FREETYPE_INCL) --LDFALGS=$(FREETYPE_LIB) -s -+OPT=-O2 -+CFLAGS=$(OPT) -Wall -pedantic $(FREETYPE_INCL) -+LDFLAGS=$(FREETYPE_LIB) - - all: ttmkfdir - -@@ -18,7 +19,11 @@ - ln $< $@ - - ttmkfdir: ttmkfdir.o -- $(CC) -o $@ $< $(LDFALGS) -+ $(CC) $(CFLAGS) -o $@ $< $(LDFLAGS) -+ -+install: all -+ mkdir -p $(DESTDIR)/usr/X11R6/bin -+ install -c -m 755 ttmkfdir $(DESTDIR)/usr/X11R6/bin - - ttmkfdir.o: ttmkfdir.c panose.h ttos2val.h - -Only in ttmkfdir: Makefile~ -diff -ur ttmkfdir.orig/ttmkfdir.c ttmkfdir/ttmkfdir.c ---- ttmkfdir.orig/ttmkfdir.c Wed Sep 9 08:50:50 1998 -+++ ttmkfdir/ttmkfdir.c Thu Mar 1 15:09:51 2001 -@@ -61,7 +61,7 @@ - #include <ctype.h> - #include <errno.h> - --#include <freetype.h> -+#include <freetype/freetype.h> - - #include "panose.h" - #include "ttos2val.h" diff --git a/x11-misc/ttmkfdir/files/ttmkfdir-2.0-gentoo.patch b/x11-misc/ttmkfdir/files/ttmkfdir-2.0-gentoo.patch deleted file mode 100644 index 181365d28dbf..000000000000 --- a/x11-misc/ttmkfdir/files/ttmkfdir-2.0-gentoo.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -urN ttmkfdir2/Makefile ttmkfdir2.azarah/Makefile ---- ttmkfdir2/Makefile.orig 2002-03-14 16:03:49.000000000 +0200 -+++ ttmkfdir2/Makefile 2002-10-13 03:55:17.000000000 +0200 -@@ -2,7 +2,7 @@ - FREETYPE_INCL=-I$(FREETYPE_BASE)/. - FREETYPE_LIB=/usr/lib/libfreetype.so - --DEBUG=-ggdb -+DEBUG= - CXX=g++ - CXXFLAGS=-Wall -pedantic $(FREETYPE_INCL) $(DEBUG) - -diff -urN ttmkfdir2/ttf.h ttmkfdir2.azarah/ttf.h ---- ttmkfdir2/ttf.h.orig 2002-03-13 20:16:38.000000000 +0200 -+++ ttmkfdir2/ttf.h 2002-10-13 03:46:34.000000000 +0200 -@@ -43,7 +43,7 @@ - FT_Face face; - TT_OS2 *os2; - TT_Postscript *post; -- string FileName; -+ std::string FileName; - }; - }; - diff --git a/x11-misc/ttmkfdir/files/ttmkfdir-3.0.9-cpp.patch b/x11-misc/ttmkfdir/files/ttmkfdir-3.0.9-cpp.patch deleted file mode 100644 index 58839eda9673..000000000000 --- a/x11-misc/ttmkfdir/files/ttmkfdir-3.0.9-cpp.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ttmkfdir-3.0.9/ttf.cpp.sopwith Thu Aug 7 12:49:08 2003 -+++ ttmkfdir-3.0.9/ttf.cpp Thu Aug 7 12:50:01 2003 -@@ -239,7 +239,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 NULL; - }; - platform = NamePtr.platform_id; - encoding = NamePtr.encoding_id; diff --git a/x11-misc/ttmkfdir/files/ttmkfdir-3.0.9-encoding.patch b/x11-misc/ttmkfdir/files/ttmkfdir-3.0.9-encoding.patch deleted file mode 100644 index 30f0170f4b3b..000000000000 --- a/x11-misc/ttmkfdir/files/ttmkfdir-3.0.9-encoding.patch +++ /dev/null @@ -1,73 +0,0 @@ -diff -urN ttmkfdir-3.0.9.orig/directory.cpp ttmkfdir-3.0.9/directory.cpp ---- ttmkfdir-3.0.9.orig/directory.cpp 2002-12-09 00:29:11.000000000 -0800 -+++ ttmkfdir-3.0.9/directory.cpp 2004-09-02 23:42:16.000000000 -0700 -@@ -9,10 +9,12 @@ - { - } - --void -+int - directory::scan (const std::string &dir) - { - DIR *ttfdir = opendir(dir.c_str ()); -+ if(!ttfdir) -+ return -1; - - this->clear (); - dirpath = dir; -@@ -26,6 +28,7 @@ - } - - closedir (ttfdir); -+ return 0; - } - - bool -diff -urN ttmkfdir-3.0.9.orig/directory.h ttmkfdir-3.0.9/directory.h ---- ttmkfdir-3.0.9.orig/directory.h 2002-12-09 00:29:11.000000000 -0800 -+++ ttmkfdir-3.0.9/directory.h 2004-09-02 23:42:16.000000000 -0700 -@@ -11,7 +11,7 @@ - if (path != "") scan (path); - }; - virtual ~directory (void); -- void scan (const std::string &path = "."); -+ int scan (const std::string &path = "."); - virtual bool select (const char *name) const; - const std::string &path (void) const { - return dirpath; -diff -urN ttmkfdir-3.0.9.orig/encoding.l ttmkfdir-3.0.9/encoding.l ---- ttmkfdir-3.0.9.orig/encoding.l 2003-01-07 21:25:25.000000000 -0800 -+++ ttmkfdir-3.0.9/encoding.l 2004-09-02 23:42:51.000000000 -0700 -@@ -108,7 +108,7 @@ - } - - /* now mark all the unassigned codes */ -- for (long i = i1; i <= i2; i++) { -+ for (long i = i1; i <= i2 && i < cur_enc->size; i++) { - (*cur_map)[i] = -1; - } - } -@@ -140,7 +140,7 @@ - break; - } - -- for (i = start_range; i <= end_range; i++, target++) { -+ for (i = start_range; i <= end_range && i < cur_enc->size; i++, target++) { - (*cur_map)[i] = target; - } - cur_enc->enc_size = cur_enc->enc_size + end_range - start_range + 1; -diff -urN ttmkfdir-3.0.9.orig/ttmkfdir.cpp ttmkfdir-3.0.9/ttmkfdir.cpp ---- ttmkfdir-3.0.9.orig/ttmkfdir.cpp 2003-01-19 15:33:11.000000000 -0800 -+++ ttmkfdir-3.0.9/ttmkfdir.cpp 2004-09-02 23:42:16.000000000 -0700 -@@ -60,7 +60,10 @@ - return 0; - } - -- dir::instance()->scan (cmdline::instance()->option ("font-dir")); -+ if(dir::instance()->scan (cmdline::instance()->option ("font-dir")) == -1) { -+ printf("No such directory...\n"); -+ return -1; -+ } - - for (directory::iterator i = dir::instance()->begin (); i != dir::instance()->end(); i++) { - const ttf::Face face (dir::instance()->path() + '/' + *i); diff --git a/x11-misc/ttmkfdir/files/ttmkfdir-3.0.9-freetype_new_includes.patch b/x11-misc/ttmkfdir/files/ttmkfdir-3.0.9-freetype_new_includes.patch deleted file mode 100644 index a5ded9fbe492..000000000000 --- a/x11-misc/ttmkfdir/files/ttmkfdir-3.0.9-freetype_new_includes.patch +++ /dev/null @@ -1,44 +0,0 @@ ---- ttmkfdir-3.0.9/encoding.cpp.orig 2002-12-09 17:52:48.000000000 +0900 -+++ ttmkfdir-3.0.9/encoding.cpp 2004-01-31 18:16:46.617118976 +0900 -@@ -4,7 +4,6 @@ - #include <cstring> - #include <unistd.h> - #include <zlib.h> --#include "freetype/freetype.h" - - #include "ttmkfdir.h" - #include "encoding.h" ---- ttmkfdir-3.0.9/encoding.h.orig 2002-12-09 17:52:48.000000000 +0900 -+++ ttmkfdir-3.0.9/encoding.h 2004-01-31 18:19:18.600014064 +0900 -@@ -6,7 +6,8 @@ - #include <map> - #include <string> - --#include "freetype/freetype.h" -+#include <ft2build.h> -+#include FT_FREETYPE_H - - #include "util.h" - ---- ttmkfdir-3.0.9/ttf.h.orig 2003-01-08 14:25:25.000000000 +0900 -+++ ttmkfdir-3.0.9/ttf.h 2004-01-31 18:32:53.333155800 +0900 -@@ -3,12 +3,13 @@ - #define TTF_H__ - - #include <string> --#include "freetype/freetype.h" --#include "freetype/tttables.h" --#include "freetype/ftsnames.h" --#include "freetype/ttnameid.h" --#include "freetype/fterrors.h" --#include "freetype/ftmodule.h" -+#include <ft2build.h> -+#include FT_FREETYPE_H -+#include FT_SFNT_NAMES_H -+#include FT_TRUETYPE_TABLES_H -+#include FT_TRUETYPE_IDS_H -+#include FT_ERRORS_H -+#include FT_MODULE_H - - #include "util.h" - #include "encoding.h" diff --git a/x11-misc/ttmkfdir/files/ttmkfdir-3.0.9-gcc33.patch b/x11-misc/ttmkfdir/files/ttmkfdir-3.0.9-gcc33.patch deleted file mode 100644 index c8f41458003d..000000000000 --- a/x11-misc/ttmkfdir/files/ttmkfdir-3.0.9-gcc33.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ttmkfdir-3.0.9/ttf.cpp.orig 2003-07-21 23:14:21.000000000 +0200 -+++ ttmkfdir-3.0.9/ttf.cpp 2003-07-21 23:15:35.000000000 +0200 -@@ -239,7 +239,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 "invalid"; - }; - platform = NamePtr.platform_id; - encoding = NamePtr.encoding_id; diff --git a/x11-misc/ttmkfdir/files/ttmkfdir-3.0.9-gcc34.patch b/x11-misc/ttmkfdir/files/ttmkfdir-3.0.9-gcc34.patch deleted file mode 100644 index 7df899ef2e59..000000000000 --- a/x11-misc/ttmkfdir/files/ttmkfdir-3.0.9-gcc34.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff -Nurd builtin.cpp.old builtin.cpp ---- builtin.cpp.old 2004-04-22 16:26:16.175065656 -0400 -+++ builtin.cpp 2004-04-22 16:27:06.042484656 -0400 -@@ -600,7 +600,7 @@ - 0x00f8, 0x00f9, 0x00fa, 0x00fb, 0x00fc, 0x00fd, 0x00fe, 0x00ff - }; - --}; -+} - - Encoding::BuiltinEncoding_t Encoding::builtin_encodings[] = { - {256,191,32,{TT_PLATFORM_MICROSOFT,TT_MS_ID_UNICODE_CS,iso8859_1},{"iso8859-1",}}, -diff -Nurd ttf.h.old ttf.h ---- ttf.h.old 2004-04-22 16:26:16.176065504 -0400 -+++ ttf.h 2004-04-22 16:27:06.042484656 -0400 -@@ -49,7 +49,7 @@ - TT_Postscript *post; - std::string FileName; - }; --}; -+} - - #endif /* TTF_H__ */ - -diff -Nurd util.h.old util.h ---- util.h.old 2004-04-22 16:26:16.176065504 -0400 -+++ util.h 2004-04-22 16:27:06.042484656 -0400 -@@ -17,6 +17,6 @@ - Singleton (void) {}; - ~Singleton (void) {}; - }; --}; -+} - - #endif // TTMKFDIRUTIL_H__ diff --git a/x11-misc/ttmkfdir/files/ttmkfdir-3.0.9-zlib.patch b/x11-misc/ttmkfdir/files/ttmkfdir-3.0.9-zlib.patch deleted file mode 100644 index 548a49e3c669..000000000000 --- a/x11-misc/ttmkfdir/files/ttmkfdir-3.0.9-zlib.patch +++ /dev/null @@ -1,80 +0,0 @@ ---- ttmkfdir-3.0.9/encoding.cpp 2002-12-09 03:52:48.000000000 -0500 -+++ ttmkfdir-3.0.9/encoding.cpp 2003-09-12 12:32:29.000000000 -0400 -@@ -2,6 +2,8 @@ - #include <cstdio> - #include <cstdlib> - #include <cstring> -+#include <unistd.h> -+#include <zlib.h> - #include "freetype/freetype.h" - - #include "ttmkfdir.h" -@@ -32,9 +34,16 @@ - NextFile (FILE *f, char *name) - { - char file_name [1024]; -- char command[1024]; -+ char line_buf [1024]; -+ char tmp_file_name[] = "/tmp/ttmkfdir_XXXXXX"; -+ char inbuf[300000]; -+ FILE *od; -+ gzFile fd; -+ int rvalue, tmpfd; - -- if (fscanf (f, "%*s %[^\n]\n", file_name) == 1) { -+ if (fgets (line_buf, sizeof(line_buf), f) != NULL) { -+ -+ sscanf (line_buf, "%*s %[^\n]\n", file_name); - - if (file_name[0] == '/') { - name[0] = 0; -@@ -44,9 +53,25 @@ - - strcat (name, file_name); - -- sprintf (command, "exec %s < %s", (toupper(name[strlen (name) - 1]) == 'Z') -- ? "gzip -d" : "cat", name); -- return popen (command, "r"); -+ bzero(inbuf, sizeof(inbuf)); -+ -+ fd = gzopen (name,"rb"); -+ rvalue = gzread (fd, inbuf, sizeof(inbuf)); -+ -+ tmpfd = mkstemp (tmp_file_name); -+ if (tmpfd == -1) { -+ return 0; -+ } -+ -+ od = fdopen (tmpfd,"w"); -+ fputs (inbuf, od); -+ fflush (od); -+ fclose (od); -+ -+ od = fopen (tmp_file_name,"r"); -+ unlink (tmp_file_name); -+ return od; -+ - } - - return 0; -@@ -75,7 +100,7 @@ - yyrestart (input); - yylex (name, *this); - -- pclose (input); -+ fclose (input); - } - - fclose (f); -diff -uNr ttmkfdir-3.0.9.orig/Makefile ttmkfdir-3.0.9/Makefile ---- ttmkfdir-3.0.9.orig/Makefile 2003-08-21 17:43:13.000000000 +1000 -+++ ttmkfdir-3.0.9/Makefile 2003-08-21 17:40:16.000000000 +1000 -@@ -28,7 +28,7 @@ - DEBUG=-ggdb - CXX=g++ - CXXFLAGS=-Wall -pedantic $(FREETYPE_INCL) $(DEBUG) $(OPTFLAGS) --LDFLAGS=$(FREETYPE_LIB) $(DEBUG) -+LDFLAGS=$(FREETYPE_LIB) $(DEBUG) -lz - - DESTDIR= - PREFIX=/usr diff --git a/x11-misc/ttmkfdir/files/ttmkfdir2-ignore-FIRSTINDEX.patch b/x11-misc/ttmkfdir/files/ttmkfdir2-ignore-FIRSTINDEX.patch deleted file mode 100644 index c2652966e6a1..000000000000 --- a/x11-misc/ttmkfdir/files/ttmkfdir2-ignore-FIRSTINDEX.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ttmkfdir2/encoding.l.orig 2002-12-23 03:22:27.000000000 +0200 -+++ ttmkfdir2/encoding.l 2002-12-23 03:28:39.000000000 +0200 -@@ -167,7 +167,7 @@ - } - - [[:alnum:]]+ { -- if (YY_START != INSIDE_UNKNOWN_MAP) { -+ if ((YY_START != INSIDE_UNKNOWN_MAP) && (0 != strcmp(yytext,"FIRSTINDEX"))) { - std::cerr << "unexpected token " << yytext << " in file " << - current_file << ", line " << line_number << std::endl; - switch (YY_START) { |