tetex/tetex.patch@a2c6460cfb16
tetex/tetex.patch
Mon, 28 Jan 2013 17:37:18 +0100
- author
- Michael Schloh von Bennewitz <michael@schloh.com>
- date
- Mon, 28 Jan 2013 17:37:18 +0100
- changeset 758
- a2c6460cfb16
- parent 505
- 0838649dd325
- permissions
- -rw-r--r--
Correct socket error reporting improvement with IPv6 portable code,
after helpful recommendation by Saúl Ibarra Corretgé on OSips devlist.
1 Index: texk/gsftopk/gsftopk.c
2 --- texk/gsftopk/gsftopk.c.orig 2005-03-15 13:05:16.817449597 +0100
3 +++ texk/gsftopk/gsftopk.c 2005-03-15 13:06:07.241499293 +0100
4 @@ -417,7 +417,7 @@
5 Boolean dosnames = False;
6 Boolean quiet = False;
8 -struct option {
9 +struct option_loc {
10 const char *longname;
11 short shortname;
12 Boolean has_arg;
13 @@ -425,7 +425,7 @@
14 int value;
15 };
17 -static const struct option options[] = {
18 +static const struct option_loc options[] = {
19 {"test", 't', False, &test, True},
20 {"mapline", 0, True, &mapline, 0},
21 {"mapfile", 0, True, &mapfile, 0},
22 @@ -2099,8 +2099,8 @@
24 argp = argv;
25 while (++argp < argv + argc && (*argp)[0] == '-') {
26 - const struct option *opt_ptr;
27 - const struct option *opt;
28 + const struct option_loc *opt_ptr;
29 + const struct option_loc *opt;
30 char *arg = *argp + 1;
32 if (*arg == '\0') --arg; /* this will flag an error later */
34 Index: texk/dvipsk/texc.script
35 --- texk/dvipsk/texc.script.orig 2005-09-25 22:05:56 +0200
36 +++ texk/dvipsk/texc.script 2005-09-25 22:05:56 +0200
37 @@ -4,9 +4,7 @@
38 # To use it, say
39 # texc.script tex.lpro texc.lpro
40 #
41 -ed $1 <<edscriptend
42 -/% begin code for uncompressed fonts only/d
43 -.,/% end code for uncompressed fonts only/d
44 -.,/% end of code for unpacking compressed fonts/s/% //
45 -w $2
46 -edscriptend
47 +sed <$1 \
48 +-e '/% end code for uncompressed fonts only/,/% end of code for unpacking compressed fonts/s/% //' \
49 +-e '/% begin code for uncompressed fonts only/,/end code for uncompressed fonts only/d' \
50 +>$2
52 Index: texk/web2c/omegafonts/pl.l
53 --- texk/web2c/omegafonts/pl.l.orig 2003-05-06 10:30:52 +0200
54 +++ texk/web2c/omegafonts/pl.l 2007-12-22 12:11:05 +0100
55 @@ -63,12 +63,6 @@
57 %}
59 -/* For Solaris's lex, to increase tables sizes --RP */
60 -/* Space before number keeps ancient flex happy. */
61 -%e 4000
62 -%p 7000
63 -%n 1000
64 -
65 ws [ \t]+
66 hexnumber H{ws}[A-F0-9]+
67 octnumber O{ws}[0-7]+
68 Index: libs/ncurses/ncurses/tinfo/lib_baudrate.c
69 --- libs/ncurses/ncurses/tinfo/lib_baudrate.c.orig 2002-01-20 00:07:53 +0100
70 +++ libs/ncurses/ncurses/tinfo/lib_baudrate.c 2010-01-08 10:40:05 +0100
71 @@ -46,7 +46,7 @@
72 * of the indices up to B115200 fit nicely in a 'short', allowing us to retain
73 * ospeed's type for compatibility.
74 */
75 -#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
76 +#if defined(__NetBSD__) || defined(__OpenBSD__)
77 #undef B0
78 #undef B50
79 #undef B75
80 Index: libs/gd/gd_png.c
81 --- libs/gd/gd_png.c.orig 2004-10-28 20:09:52 +0200
82 +++ libs/gd/gd_png.c 2010-01-08 10:57:27 +0100
83 @@ -143,7 +143,7 @@
84 /* first do a quick check that the file really is a PNG image; could
85 * have used slightly more general png_sig_cmp() function instead */
86 gdGetBuf (sig, 8, infile);
87 - if (!png_check_sig (sig, 8))
88 + if (png_sig_cmp (sig, 0, 8) > 0)
89 return NULL; /* bad signature */
91 #ifndef PNG_SETJMP_NOT_SUPPORTED
92 Index: texk/dvipdfm/pngimage.c
93 --- texk/dvipdfm/pngimage.c.orig 2002-12-25 18:51:16 +0100
94 +++ texk/dvipdfm/pngimage.c 2010-01-08 10:58:28 +0100
95 @@ -42,7 +42,7 @@
96 rewind (png_file);
97 if (fread (sigbytes, 1, sizeof(sigbytes), png_file) !=
98 sizeof(sigbytes) ||
99 - (!png_check_sig (sigbytes, sizeof(sigbytes))))
100 + (png_sig_cmp (sigbytes, 0, sizeof(sigbytes)) > 0))
101 return 0;
102 else
103 return 1;
104 Index: texk/dvipdfm/thumbnail.c
105 --- texk/dvipdfm/thumbnail.c.orig 2002-12-25 18:51:16 +0100
106 +++ texk/dvipdfm/thumbnail.c 2010-01-08 10:58:39 +0100
107 @@ -79,7 +79,7 @@
108 }
109 if (fread (sigbytes, 1, sizeof(sigbytes), thumb_file) !=
110 sizeof(sigbytes) ||
111 - (!png_check_sig (sigbytes, sizeof(sigbytes)))) {
112 + (png_sig_cmp (sigbytes, 0, sizeof(sigbytes)) > 0)) {
113 fprintf (stderr, "\nThumbnail not a png file! Skipping\n");
114 return NULL;
115 }
116 Index: texk/dvipsk/afm2tfm.c
117 --- texk/dvipsk/afm2tfm.c.orig 2005-01-30 14:17:09.000000000 +0100
118 +++ texk/dvipsk/afm2tfm.c 2012-08-10 13:51:16.204770293 +0200
119 @@ -40,6 +40,9 @@
120 #endif
121 #endif /* KPATHSEA */
123 +/* Definitions to accommodate flawed or defective code. */
124 +#define getline local_getline
125 +
126 /* JLH: added these to make the code easier to read and remove some
127 ascii<->ebcdic dependencies */
128 #define ASCII_A 65
129 Index: texk/web2c/cpascal.h
130 --- texk/web2c/cpascal.h.orig 2004-08-28 22:49:59.000000000 +0200
131 +++ texk/web2c/cpascal.h 2012-08-10 13:50:28.634075696 +0200
132 @@ -241,6 +241,10 @@
133 #define getname vms_getname
134 #endif
136 +/* Definitions to accommodate flawed or defective code. */
137 +
138 +#define getline local_getline
139 +
140 /* Declarations for the routines we provide ourselves in lib/. */
142 extern string basenamechangesuffix P3H(const_string,const_string,const_string);
