diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2009-11-09 16:08:58 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2009-11-09 16:08:58 +0000 |
commit | 2c92c64be5afdf033f8d21178b02950a379c1fb4 (patch) | |
tree | a2a0365e0fc42c4b7a1a854da9d4074643a7ff1b /Build/source/utils | |
parent | bfbe81796df41ce30c05a1dc88bb3147f28837b5 (diff) |
update build system
git-svn-id: svn://tug.org/texlive/trunk@15951 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/utils')
5 files changed, 356 insertions, 0 deletions
diff --git a/Build/source/utils/t1utils/t1utils-1.34-PATCHES/ChangeLog b/Build/source/utils/t1utils/t1utils-1.34-PATCHES/ChangeLog new file mode 100644 index 00000000000..6732b2ca655 --- /dev/null +++ b/Build/source/utils/t1utils/t1utils-1.34-PATCHES/ChangeLog @@ -0,0 +1,13 @@ +2009-08-23 Peter Breitenlohner <peb@mppmu.mpg.de> + + * patch-03-warnings (new): Avoid more compiler warnings. + +2009-08-19 Peter Breitenlohner <peb@mppmu.mpg.de> + + * patch-02-static (new): Avoid warnings when compiling with + 'gcc --Wmissing-prototypes'. + +2009-06-12 Francois Charette <firmicus@ankabut.net> + + * patch-01-getline (new): Avoid getline name conflict. + diff --git a/Build/source/utils/t1utils/t1utils-1.34-PATCHES/TL-Changes b/Build/source/utils/t1utils/t1utils-1.34-PATCHES/TL-Changes new file mode 100644 index 00000000000..194016e2ac5 --- /dev/null +++ b/Build/source/utils/t1utils/t1utils-1.34-PATCHES/TL-Changes @@ -0,0 +1,13 @@ +Changes applied to the t1utils-1.34 tree as obtained from: + http://www.lcdf.org/type/ + +Removed: + config.guess + config.sub + depcomp + install-sh + mkinstalldirs + +Moved this file to ../: + strerror.c + diff --git a/Build/source/utils/t1utils/t1utils-1.34-PATCHES/patch-01-getline b/Build/source/utils/t1utils/t1utils-1.34-PATCHES/patch-01-getline new file mode 100644 index 00000000000..006771de650 --- /dev/null +++ b/Build/source/utils/t1utils/t1utils-1.34-PATCHES/patch-01-getline @@ -0,0 +1,32 @@ + Avoid conflict with getline from some newer C libraries. + +diff -ur t1utils-1.34.orig/t1asm.c t1utils-1.34/t1asm.c +--- t1utils-1.34.orig/t1asm.c 2008-03-01 18:59:11.000000000 +0100 ++++ t1utils-1.34/t1asm.c 2009-06-12 01:41:46.000000000 +0200 +@@ -280,7 +280,7 @@ + the newline is put into line[]. When terminated by '{', the '{' is not put + into line[], and the flag start_charstring is set to 1. */ + +-static void getline() ++static void texlive_getline() + { + int c; + char *p = line; +@@ -721,7 +721,7 @@ + without /Subrs sections and provided a patch. */ + + while (!feof(ifp) && !ferror(ifp)) { +- getline(); ++ texlive_getline(); + + if (!ever_active) { + if (strncmp(line, "currentfile eexec", 17) == 0 && isspace(line[17])) { +@@ -792,7 +792,7 @@ + + /* There may be additional code. */ + while (!feof(ifp) && !ferror(ifp)) { +- getline(); ++ texlive_getline(); + eexec_string(line); + } + diff --git a/Build/source/utils/t1utils/t1utils-1.34-PATCHES/patch-02-static b/Build/source/utils/t1utils/t1utils-1.34-PATCHES/patch-02-static new file mode 100644 index 00000000000..f603ab022db --- /dev/null +++ b/Build/source/utils/t1utils/t1utils-1.34-PATCHES/patch-02-static @@ -0,0 +1,176 @@ + Declare all functions used in only one file as static. + +diff -ur t1utils-1.34.orig/clp.c t1utils-1.34/clp.c +--- t1utils-1.34.orig/clp.c 2006-01-19 18:41:30.000000000 +0100 ++++ t1utils-1.34/clp.c 2009-08-19 15:02:19.000000000 +0200 +@@ -680,7 +680,7 @@ + } + + +-int ++static int + finish_string_list(Clp_Parser *clp, int type_id, int flags, + Clp_Option *items, int nitems, int itemscap) + { +diff -ur t1utils-1.34.orig/t1ascii.c t1utils-1.34/t1ascii.c +--- t1utils-1.34.orig/t1ascii.c 2008-03-01 18:58:48.000000000 +0100 ++++ t1utils-1.34/t1ascii.c 2009-08-19 15:02:19.000000000 +0200 +@@ -100,7 +100,7 @@ + putc('\n', stderr); + } + +-void ++static void + short_usage(void) + { + fprintf(stderr, "Usage: %s [OPTION]... [INPUT [OUTPUT]]\n\ +@@ -108,7 +108,7 @@ + program_name, program_name); + } + +-void ++static void + usage(void) + { + printf("\ +diff -ur t1utils-1.34.orig/t1asm.c t1utils-1.34/t1asm.c +--- t1utils-1.34.orig/t1asm.c 2009-06-12 01:41:46.000000000 +0200 ++++ t1utils-1.34/t1asm.c 2009-08-19 15:02:19.000000000 +0200 +@@ -572,7 +572,7 @@ + putc('\n', stderr); + } + +-void ++static void + short_usage(void) + { + fprintf(stderr, "Usage: %s [OPTION]... [INPUT [OUTPUT]]\n\ +@@ -580,7 +580,7 @@ + program_name, program_name); + } + +-void ++static void + usage(void) + { + printf("\ +diff -ur t1utils-1.34.orig/t1binary.c t1utils-1.34/t1binary.c +--- t1utils-1.34.orig/t1binary.c 2008-03-01 18:59:18.000000000 +0100 ++++ t1utils-1.34/t1binary.c 2009-08-19 15:02:19.000000000 +0200 +@@ -132,7 +132,7 @@ + } + + +-void ++static void + short_usage(void) + { + fprintf(stderr, "Usage: %s [OPTION]... [INPUT [OUTPUT]]\n\ +@@ -141,7 +141,7 @@ + } + + +-void ++static void + usage(void) + { + printf("\ +diff -ur t1utils-1.34.orig/t1disasm.c t1utils-1.34/t1disasm.c +--- t1utils-1.34.orig/t1disasm.c 2008-03-01 18:59:27.000000000 +0100 ++++ t1utils-1.34/t1disasm.c 2009-08-19 15:02:19.000000000 +0200 +@@ -640,7 +640,7 @@ + error_count++; + } + +-void ++static void + short_usage(void) + { + fprintf(stderr, "Usage: %s [INPUT [OUTPUT]]\n\ +@@ -648,7 +648,7 @@ + program_name, program_name); + } + +-void ++static void + usage(void) + { + printf("\ +diff -ur t1utils-1.34.orig/t1mac.c t1utils-1.34/t1mac.c +--- t1utils-1.34.orig/t1mac.c 2008-03-01 18:59:01.000000000 +0100 ++++ t1utils-1.34/t1mac.c 2009-08-19 14:57:25.000000000 +0200 +@@ -778,7 +778,7 @@ + } + + +-void ++static void + short_usage(void) + { + fprintf(stderr, "Usage: %s [OPTION]... [INPUT [OUTPUT]]\n\ +@@ -787,7 +787,7 @@ + } + + +-void ++static void + usage(void) + { + printf("\ +diff -ur t1utils-1.34.orig/t1unmac.c t1utils-1.34/t1unmac.c +--- t1utils-1.34.orig/t1unmac.c 2008-03-01 19:00:03.000000000 +0100 ++++ t1utils-1.34/t1unmac.c 2009-08-19 14:59:25.000000000 +0200 +@@ -259,7 +259,7 @@ + putc('\n', stderr); + } + +-void ++static void + short_usage(void) + { + fprintf(stderr, "Usage: %s [OPTION]... INPUT [OUTPUT]\n\ +@@ -267,7 +267,7 @@ + program_name, program_name); + } + +-void ++static void + usage(void) + { + printf("\ +@@ -388,7 +388,7 @@ + #define APPLESINGLE_MAGIC 0x00051600 + #define APPLEDOUBLE_MAGIC 0x00051607 + +-const char * ++static const char * + check_appledouble(FILE *ifp) + { + int i; +@@ -400,7 +400,7 @@ + return 0; + } + +-const char * ++static const char * + translate_binhex(FILE *f, FILE *tmpf) + { + int i, c = 0, last_char, after_x90, bits, bitpos; +@@ -486,7 +486,7 @@ + return 0; + } + +-int ++static int + check_binhex_crc(FILE *f, int offset, int length) + { + int crc = 0; +@@ -501,7 +501,7 @@ + return crc == 0; + } + +-const char * ++static const char * + check_binhex(FILE *f) + { + int fname_len, data_len, rsrc_len, off; diff --git a/Build/source/utils/t1utils/t1utils-1.34-PATCHES/patch-03-warnings b/Build/source/utils/t1utils/t1utils-1.34-PATCHES/patch-03-warnings new file mode 100644 index 00000000000..66f072f1779 --- /dev/null +++ b/Build/source/utils/t1utils/t1utils-1.34-PATCHES/patch-03-warnings @@ -0,0 +1,122 @@ + Avoid compiler warnings: + ANSI C function definitions. + Declare various (param and other) strings as const. + +diff -ur t1utils-1.34.orig/t1ascii.c t1utils-1.34/t1ascii.c +--- t1utils-1.34.orig/t1ascii.c 2009-08-19 15:02:19.000000000 +0200 ++++ t1utils-1.34/t1ascii.c 2009-08-23 14:48:59.000000000 +0200 +@@ -172,7 +172,7 @@ + } + + static void +-pfa_output_end() ++pfa_output_end(void) + { + } + +diff -ur t1utils-1.34.orig/t1asm.c t1utils-1.34/t1asm.c +--- t1utils-1.34.orig/t1asm.c 2009-08-19 15:02:19.000000000 +0200 ++++ t1utils-1.34/t1asm.c 2009-08-23 14:49:03.000000000 +0200 +@@ -266,7 +266,7 @@ + charstring. We use the heuristic that it should start with `/' (a name) or + `dup' (a subroutine). Previous heuristic caused killa bad output. */ + +-static int check_line_charstring() ++static int check_line_charstring(void) + { + char *p = line; + while (isspace(*p)) +@@ -280,7 +280,7 @@ + the newline is put into line[]. When terminated by '{', the '{' is not put + into line[], and the flag start_charstring is set to 1. */ + +-static void texlive_getline() ++static void texlive_getline(void) + { + int c; + char *p = line; +@@ -367,7 +367,7 @@ + /* This function initializes charstring encryption. Note that this is called + at the beginning of every charstring. */ + +-static void charstring_start() ++static void charstring_start(void) + { + int i; + +@@ -390,7 +390,7 @@ + /* This function outputs buffered, encrypted charstring data through possible + eexec encryption. */ + +-static void charstring_end() ++static void charstring_end(void) + { + byte *bp; + +@@ -433,7 +433,7 @@ + + /* This function returns one charstring token. It ignores comments. */ + +-static void get_charstring_token() ++static void get_charstring_token(void) + { + int c = getc(ifp); + while (isspace(c)) +@@ -466,7 +466,7 @@ + /* This function parses an entire charstring into integers and commands, + outputting bytes through the charstring buffer. */ + +-static void parse_charstring() ++static void parse_charstring(void) + { + struct command *cp; + +diff -ur t1utils-1.34.orig/t1binary.c t1utils-1.34/t1binary.c +--- t1utils-1.34.orig/t1binary.c 2009-08-19 15:02:19.000000000 +0200 ++++ t1utils-1.34/t1binary.c 2009-08-23 14:49:01.000000000 +0200 +@@ -85,7 +85,7 @@ + } + + static void +-pfb_output_end() ++pfb_output_end(void) + { + pfb_writer_end(&w); + } +diff -ur t1utils-1.34.orig/t1disasm.c t1utils-1.34/t1disasm.c +--- t1utils-1.34.orig/t1disasm.c 2009-08-19 15:02:19.000000000 +0200 ++++ t1utils-1.34/t1disasm.c 2009-08-23 15:04:37.000000000 +0200 +@@ -332,11 +332,11 @@ + /* 23.Feb.2004 - use 'memstr', not strstr, because the strings input to + eexec_line aren't null terminated! Reported by Werner Lemberg. */ + +-static const unsigned char * +-oog_memstr(const unsigned char *line, int line_len, const char *pattern, int pattern_len) ++static unsigned char * ++oog_memstr(unsigned char *line, int line_len, const char *pattern, int pattern_len) + { +- const unsigned char *try; +- const unsigned char *last = line + line_len - pattern_len + 1; ++ unsigned char *try; ++ unsigned char *last = line + line_len - pattern_len + 1; + while (line < last + && (try = memchr(line, (unsigned char)*pattern, last - line))) { + if (memcmp(try, pattern, pattern_len) == 0) +@@ -432,7 +432,7 @@ + badly: a charstring definition follows "/Charstrings ... begin", ON THE + SAME LINE. */ + { +- const char *CharStrings = (const char *) ++ char *CharStrings = (char *) + oog_memstr(line, line_len, "/CharStrings ", 13); + int crap, n; + char should_be_slash = 0; +@@ -595,7 +595,7 @@ + } + + static void +-disasm_output_end() ++disasm_output_end(void) + { + /* take care of leftover saved data */ + static char crap[1] = ""; |