comparison: tetex/tetex.patch
tetex/tetex.patch
- changeset 505
- 0838649dd325
- child 506
- ed99728b62ad
equal
deleted
inserted
replaced
| -1:000000000000 | 0:17f40b3d838d |
|---|---|
| 1 Index: texk/gsftopk/gsftopk.c | |
| 2 diff -Nau texk/gsftopk/gsftopk.c.orig texk/gsftopk/gsftopk.c | |
| 3 --- texk/gsftopk/gsftopk.c.orig 2005-03-15 13:05:16.817449597 +0100 | |
| 4 +++ texk/gsftopk/gsftopk.c 2005-03-15 13:06:07.241499293 +0100 | |
| 5 @@ -417,7 +417,7 @@ | |
| 6 Boolean dosnames = False; | |
| 7 Boolean quiet = False; | |
| 8 | |
| 9 -struct option { | |
| 10 +struct option_loc { | |
| 11 const char *longname; | |
| 12 short shortname; | |
| 13 Boolean has_arg; | |
| 14 @@ -425,7 +425,7 @@ | |
| 15 int value; | |
| 16 }; | |
| 17 | |
| 18 -static const struct option options[] = { | |
| 19 +static const struct option_loc options[] = { | |
| 20 {"test", 't', False, &test, True}, | |
| 21 {"mapline", 0, True, &mapline, 0}, | |
| 22 {"mapfile", 0, True, &mapfile, 0}, | |
| 23 @@ -2099,8 +2099,8 @@ | |
| 24 | |
| 25 argp = argv; | |
| 26 while (++argp < argv + argc && (*argp)[0] == '-') { | |
| 27 - const struct option *opt_ptr; | |
| 28 - const struct option *opt; | |
| 29 + const struct option_loc *opt_ptr; | |
| 30 + const struct option_loc *opt; | |
| 31 char *arg = *argp + 1; | |
| 32 | |
| 33 if (*arg == '\0') --arg; /* this will flag an error later */ | |
| 34 | |
| 35 Index: texk/dvipsk/texc.script | |
| 36 --- texk/dvipsk/texc.script.orig 2005-09-25 22:05:56 +0200 | |
| 37 +++ texk/dvipsk/texc.script 2005-09-25 22:05:56 +0200 | |
| 38 @@ -4,9 +4,7 @@ | |
| 39 # To use it, say | |
| 40 # texc.script tex.lpro texc.lpro | |
| 41 # | |
| 42 -ed $1 <<edscriptend | |
| 43 -/% begin code for uncompressed fonts only/d | |
| 44 -.,/% end code for uncompressed fonts only/d | |
| 45 -.,/% end of code for unpacking compressed fonts/s/% // | |
| 46 -w $2 | |
| 47 -edscriptend | |
| 48 +sed <$1 \ | |
| 49 +-e '/% end code for uncompressed fonts only/,/% end of code for unpacking compressed fonts/s/% //' \ | |
| 50 +-e '/% begin code for uncompressed fonts only/,/end code for uncompressed fonts only/d' \ | |
| 51 +>$2 | |
| 52 | |
| 53 Index: texk/web2c/omegafonts/pl.l | |
| 54 --- texk/web2c/omegafonts/pl.l.orig 2003-05-06 10:30:52 +0200 | |
| 55 +++ texk/web2c/omegafonts/pl.l 2007-12-22 12:11:05 +0100 | |
| 56 @@ -63,12 +63,6 @@ | |
| 57 | |
| 58 %} | |
| 59 | |
| 60 -/* For Solaris's lex, to increase tables sizes --RP */ | |
| 61 -/* Space before number keeps ancient flex happy. */ | |
| 62 -%e 4000 | |
| 63 -%p 7000 | |
| 64 -%n 1000 | |
| 65 - | |
| 66 ws [ \t]+ | |
| 67 hexnumber H{ws}[A-F0-9]+ | |
| 68 octnumber O{ws}[0-7]+ | |
| 69 Index: libs/ncurses/ncurses/tinfo/lib_baudrate.c | |
| 70 --- libs/ncurses/ncurses/tinfo/lib_baudrate.c.orig 2002-01-20 00:07:53 +0100 | |
| 71 +++ libs/ncurses/ncurses/tinfo/lib_baudrate.c 2010-01-08 10:40:05 +0100 | |
| 72 @@ -46,7 +46,7 @@ | |
| 73 * of the indices up to B115200 fit nicely in a 'short', allowing us to retain | |
| 74 * ospeed's type for compatibility. | |
| 75 */ | |
| 76 -#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) | |
| 77 +#if defined(__NetBSD__) || defined(__OpenBSD__) | |
| 78 #undef B0 | |
| 79 #undef B50 | |
| 80 #undef B75 | |
| 81 Index: libs/gd/gd_png.c | |
| 82 --- libs/gd/gd_png.c.orig 2004-10-28 20:09:52 +0200 | |
| 83 +++ libs/gd/gd_png.c 2010-01-08 10:57:27 +0100 | |
| 84 @@ -143,7 +143,7 @@ | |
| 85 /* first do a quick check that the file really is a PNG image; could | |
| 86 * have used slightly more general png_sig_cmp() function instead */ | |
| 87 gdGetBuf (sig, 8, infile); | |
| 88 - if (!png_check_sig (sig, 8)) | |
| 89 + if (png_sig_cmp (sig, 0, 8) > 0) | |
| 90 return NULL; /* bad signature */ | |
| 91 | |
| 92 #ifndef PNG_SETJMP_NOT_SUPPORTED | |
| 93 Index: texk/dvipdfm/pngimage.c | |
| 94 --- texk/dvipdfm/pngimage.c.orig 2002-12-25 18:51:16 +0100 | |
| 95 +++ texk/dvipdfm/pngimage.c 2010-01-08 10:58:28 +0100 | |
| 96 @@ -42,7 +42,7 @@ | |
| 97 rewind (png_file); | |
| 98 if (fread (sigbytes, 1, sizeof(sigbytes), png_file) != | |
| 99 sizeof(sigbytes) || | |
| 100 - (!png_check_sig (sigbytes, sizeof(sigbytes)))) | |
| 101 + (png_sig_cmp (sigbytes, 0, sizeof(sigbytes)) > 0)) | |
| 102 return 0; | |
| 103 else | |
| 104 return 1; | |
| 105 Index: texk/dvipdfm/thumbnail.c | |
| 106 --- texk/dvipdfm/thumbnail.c.orig 2002-12-25 18:51:16 +0100 | |
| 107 +++ texk/dvipdfm/thumbnail.c 2010-01-08 10:58:39 +0100 | |
| 108 @@ -79,7 +79,7 @@ | |
| 109 } | |
| 110 if (fread (sigbytes, 1, sizeof(sigbytes), thumb_file) != | |
| 111 sizeof(sigbytes) || | |
| 112 - (!png_check_sig (sigbytes, sizeof(sigbytes)))) { | |
| 113 + (png_sig_cmp (sigbytes, 0, sizeof(sigbytes)) > 0)) { | |
| 114 fprintf (stderr, "\nThumbnail not a png file! Skipping\n"); | |
| 115 return NULL; | |
| 116 } |
