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