diff options
Diffstat (limited to 'Build/source/texk/psutils/psutils-1.21-PATCHES')
6 files changed, 457 insertions, 0 deletions
diff --git a/Build/source/texk/psutils/psutils-1.21-PATCHES/ChangeLog b/Build/source/texk/psutils/psutils-1.21-PATCHES/ChangeLog new file mode 100644 index 00000000000..3d3b2d38a7e --- /dev/null +++ b/Build/source/texk/psutils/psutils-1.21-PATCHES/ChangeLog @@ -0,0 +1,68 @@ +2013-11-21 Peter Breitenlohner <peb@mppmu.mpg.de> + + * patch-12-getopt (removed): Now using getopt() from kpathsea. + * patch-20-psnup-man (new): Fix psnup.1 typos and cleanup. + +2013-11-21 Peter Breitenlohner <peb@mppmu.mpg.de> + + * patch-12-getopt (new): Adapt psnup.[1c] to non-GNU getopt. + +2013-10-28 Peter Breitenlohner <peb@mppmu.mpg.de> + + * patch-11-WIN32: Adapt to Visual Studio 2010 (from Akira). + +2013-10-25 Peter Breitenlohner <peb@mppmu.mpg.de> + + Import psutils-1.21. + + * patch-01-WIN32, patch-02-PERL, patch-03-main-is-int, + patch-04-warnings, patch-05-const, patch-07-TEMPDIR, + patch-08-non-free, patch-09-PERL, patch-11-extern: All removed + because either obsolete or included upstream. + + * patch-01-backport (new): Backport from git repository. + * patch-10-binary-mode: Adapted (from Akira). + * patch-11-WIN32 (new): LFS defines for native WIN32 and MinGW. + +2012-08-26 Peter Breitenlohner <peb@mppmu.mpg.de> + + * patch-01-WIN32: Adapt to W32TeX (from Akira Kakuto). + * patch-06-MINGW (removed): Obsolete. + +2012-03-29 Peter Breitenlohner <peb@mppmu.mpg.de> + + * patch-11-extern (new): Remove extern decls from *.c files. + +2011-09-22 Peter Breitenlohner <peb@mppmu.mpg.de> + + * patch-10-binary-mode (new): Fix error messages when setting + binary mode fails. + +2011-01-09 Peter Breitenlohner <peb@mppmu.mpg.de> + + * patch-07-TEMPDIR: Fix broken perl syntax. + * patch-09-PERL (new): Avoid problems with Akira's perl. + + Mail from Akira Sat, 08 Jan 2011 14:43:53. + +2010-12-20 Peter Breitenlohner <peb@mppmu.mpg.de> + + * patch-07-TEMPDIR (new): Honor $TMPDIR, $TEMP, and $TMP. + * patch-08-non-free (new): Adapt to removal of non-free files. + +2010-12-16 Peter Breitenlohner <peb@mppmu.mpg.de> + + * patch-02-PERL: Adapt to new kpsewhich semantics and + texmf layout. + Change basename => dirname and add 'use File::Basename'. + +2010-12-10 Peter Breitenlohner <peb@mppmu.mpg.de> + + Patches applied to psutils-1.17 as obtained from CTAN. + * patch-01-WIN32: Added various #ifdef WIN32. + * patch-02-PERL: Handling of perl scripts. + * patch-03-main-is-int: Changed return type of main() from void + to int; changed exit at end into return. + * patch-04-warnings: Avoid various compiler warnings. + * patch-05-const: Constify strings. + * patch-06-MINGW: Do not #include <win32lib.h> for MinGW32. diff --git a/Build/source/texk/psutils/psutils-1.21-PATCHES/TL-Changes b/Build/source/texk/psutils/psutils-1.21-PATCHES/TL-Changes new file mode 100644 index 00000000000..96528b891a5 --- /dev/null +++ b/Build/source/texk/psutils/psutils-1.21-PATCHES/TL-Changes @@ -0,0 +1,6 @@ +Changes applied to the psutils-1.21 tree as obtained from: + https://github.com/rrthomas/psutils/archive/v1.21.tar.gz + +Remove: + .gitignore + diff --git a/Build/source/texk/psutils/psutils-1.21-PATCHES/patch-01-backport b/Build/source/texk/psutils/psutils-1.21-PATCHES/patch-01-backport new file mode 100644 index 00000000000..1eca478234d --- /dev/null +++ b/Build/source/texk/psutils/psutils-1.21-PATCHES/patch-01-backport @@ -0,0 +1,12 @@ +diff -ur psutils-1.21/psspec.c ../../psutils-git/psspec.c +--- psutils-1.21/psspec.c 2013-10-21 23:28:08.000000000 +0200 ++++ ../../psutils-git/psspec.c 2013-10-24 09:54:36.000000000 +0200 +@@ -6,6 +6,8 @@ + * See file LICENSE for details. + */ + ++#include "config.h" ++ + #include "psutil.h" + #include "psspec.h" + diff --git a/Build/source/texk/psutils/psutils-1.21-PATCHES/patch-10-binary-mode b/Build/source/texk/psutils/psutils-1.21-PATCHES/patch-10-binary-mode new file mode 100644 index 00000000000..ddb38186dc2 --- /dev/null +++ b/Build/source/texk/psutils/psutils-1.21-PATCHES/patch-10-binary-mode @@ -0,0 +1,164 @@ +diff -ur psutils-1.21.orig/epsffit.c psutils-1.21/epsffit.c +--- psutils-1.21.orig/epsffit.c 2013-10-21 23:28:08.000000000 +0200 ++++ psutils-1.21/epsffit.c 2013-10-25 13:06:05.000000000 +0200 +@@ -17,7 +17,9 @@ + #include <stdlib.h> + #include <string.h> + #include <ctype.h> ++#ifdef HAVE_UNISTD_H + #include <unistd.h> ++#endif + + #include "psutil.h" + +@@ -37,6 +39,9 @@ + FILE *output = stdout; + int opt; + ++ SET_BINARY(stdin); ++ SET_BINARY(stdout); ++ + program = *argv; + + while((opt = getopt(argc, argv, "csramv")) != EOF) { +diff -ur psutils-1.21.orig/psbook.c psutils-1.21/psbook.c +--- psutils-1.21.orig/psbook.c 2013-10-21 23:28:08.000000000 +0200 ++++ psutils-1.21/psbook.c 2013-10-25 13:06:05.000000000 +0200 +@@ -7,9 +7,9 @@ + */ + + #include "config.h" +- ++#ifdef HAVE_UNISTD_H + #include <unistd.h> +- ++#endif + #include "psutil.h" + + const char *syntax = "[-q] [-sSIGNATURE] [INFILE [OUTFILE]]\n SIGNATURE must be positive and divisible by 4\n"; +@@ -23,6 +23,9 @@ + int currentpg, maxpage; + int opt; + ++ SET_BINARY(stdin); ++ SET_BINARY(stdout); ++ + verbose = 1; + program = *argv; + +diff -ur psutils-1.21.orig/psnup.c psutils-1.21/psnup.c +--- psutils-1.21.orig/psnup.c 2013-10-21 23:28:08.000000000 +0200 ++++ psutils-1.21/psnup.c 2013-10-25 13:06:05.000000000 +0200 +@@ -7,8 +7,9 @@ + */ + + #include "config.h" +- ++#ifdef HAVE_UNISTD_H + #include <unistd.h> ++#endif + #include <string.h> + #include <paper.h> + +@@ -49,6 +50,9 @@ + int opt; + const struct paper *paper = NULL; + ++ SET_BINARY(stdin); ++ SET_BINARY(stdout); ++ + set_paper_size(NULL); + + margin = border = vshift = hshift = column = flip = 0; +diff -ur psutils-1.21.orig/psresize.c psutils-1.21/psresize.c +--- psutils-1.21.orig/psresize.c 2013-10-21 23:28:08.000000000 +0200 ++++ psutils-1.21/psresize.c 2013-10-25 13:06:05.000000000 +0200 +@@ -7,8 +7,9 @@ + */ + + #include "config.h" +- ++#ifdef HAVE_UNISTD_H + #include <unistd.h> ++#endif + #include <paper.h> + + #include "psutil.h" +@@ -32,6 +33,9 @@ + int opt; + const struct paper *paper = NULL; + ++ SET_BINARY(stdin); ++ SET_BINARY(stdout); ++ + set_paper_size(NULL); + + vshift = hshift = 0; +diff -ur psutils-1.21.orig/psselect.c psutils-1.21/psselect.c +--- psutils-1.21.orig/psselect.c 2013-10-21 23:28:08.000000000 +0200 ++++ psutils-1.21/psselect.c 2013-10-25 13:06:05.000000000 +0200 +@@ -7,9 +7,9 @@ + */ + + #include "config.h" +- ++#ifdef HAVE_UNISTD_H + #include <unistd.h> +- ++#endif + #include "psutil.h" + + const char *syntax = "[-q] [-e] [-o] [-r] [-pPAGES] [INFILE [OUTFILE]]\n"; +@@ -88,6 +88,9 @@ + int pass, all; + PageRange *pagerange = NULL; + ++ SET_BINARY(stdin); ++ SET_BINARY(stdout); ++ + verbose = 1; + program = *argv; + +diff -ur psutils-1.21.orig/pstops.c psutils-1.21/pstops.c +--- psutils-1.21.orig/pstops.c 2013-10-21 23:28:08.000000000 +0200 ++++ psutils-1.21/pstops.c 2013-10-25 13:06:05.000000000 +0200 +@@ -7,8 +7,9 @@ + */ + + #include "config.h" +- ++#ifdef HAVE_UNISTD_H + #include <unistd.h> ++#endif + #include <string.h> + #include <paper.h> + +@@ -107,6 +108,9 @@ + const struct paper *paper = NULL; + int opt; + ++ SET_BINARY(stdin); ++ SET_BINARY(stdout); ++ + set_paper_size(NULL); + + verbose = 1; +diff -ur psutils-1.21.orig/psutil.h psutils-1.21/psutil.h +--- psutils-1.21.orig/psutil.h 2013-10-21 23:28:08.000000000 +0200 ++++ psutils-1.21/psutil.h 2013-10-25 13:06:05.000000000 +0200 +@@ -21,6 +21,15 @@ + #define WARN (MESSAGE_NL|MESSAGE_PROGRAM) + #define LOG 0 + ++/* change mode of a file pointer on Windows */ ++#if defined(WIN32) ++#include <io.h> ++#include <fcntl.h> ++#define SET_BINARY(fp) (void)_setmode(fileno(fp), _O_BINARY) ++#else /* !WIN32 */ ++#define SET_BINARY(fp) (void)0 ++#endif ++ + /* Definitions for functions found in psutil.c */ + extern void usage(void); + extern void message(int flags, const char *format, ...); diff --git a/Build/source/texk/psutils/psutils-1.21-PATCHES/patch-11-WIN32 b/Build/source/texk/psutils/psutils-1.21-PATCHES/patch-11-WIN32 new file mode 100644 index 00000000000..2490a1b0642 --- /dev/null +++ b/Build/source/texk/psutils/psutils-1.21-PATCHES/patch-11-WIN32 @@ -0,0 +1,22 @@ +diff -ur psutils-1.21.orig/psutil.h psutils-1.21/psutil.h +--- psutils-1.21.orig/psutil.h 2013-10-25 13:06:05.000000000 +0200 ++++ psutils-1.21/psutil.h 2013-10-28 10:39:53.000000000 +0100 +@@ -26,6 +26,18 @@ + #include <io.h> + #include <fcntl.h> + #define SET_BINARY(fp) (void)_setmode(fileno(fp), _O_BINARY) ++#undef off_t ++#undef ftello ++#undef fseeko ++#if defined(__MINGW32__) ++#define off_t off64_t ++#define ftello ftello64 ++#define fseeko fseeko64 ++#else ++#define off_t __int64 ++#define ftello _ftelli64 ++#define fseeko _fseeki64 ++#endif + #else /* !WIN32 */ + #define SET_BINARY(fp) (void)0 + #endif diff --git a/Build/source/texk/psutils/psutils-1.21-PATCHES/patch-20-psnup-man b/Build/source/texk/psutils/psutils-1.21-PATCHES/patch-20-psnup-man new file mode 100644 index 00000000000..41e9549348f --- /dev/null +++ b/Build/source/texk/psutils/psutils-1.21-PATCHES/patch-20-psnup-man @@ -0,0 +1,185 @@ +diff -ur psutils-1.21.orig/psnup.1 psutils-1.21/psnup.1 +--- psutils-1.21.orig/psnup.1 2013-10-21 23:28:08.000000000 +0200 ++++ psutils-1.21/psnup.1 2013-12-03 11:26:05.000000000 +0100 +@@ -3,53 +3,33 @@ + psnup \- multiple pages per sheet + .SH SYNOPSIS + .B psnup +-[ +-.B \-w\fIwidth\fR +-] [ +-.B \-h\fIheight\fR +-] [ +-.B \-p\fIpaper\fR +-] [ +-.B \-W\fIwidth\fR +-] [ +-.B \-H\fIheight\fR +-] [ +-.B \-P\fIpaper\fR +-] [ +-.B \-l +-] [ +-.B \-r +-] [ +-.B \-f +-] [ +-.B \-c +-] [ +-.B \-m\fImargin\fR +-] [ +-.B \-b\fIborder\fR +-] [ +-.B \-d\fIlwidth\fR +-] [ +-.B \-s\fIscale\fR +-] [ +-.B \-n\fIup\fR +-] [ +-.B \-q +-] [ +-.I infile +-[ +-.I outfile +-] ] ++.RB [ \-w\fIwidth\fR ] ++.RB [ \-h\fIheight\fR ] ++.RB [ \-p\fIpaper\fR ] ++.RB [ \-W\fIwidth\fR ] ++.RB [ \-H\fIheight\fR ] ++.RB [ \-P\fIpaper\fR ] ++.RB [ \-l | \-r | \-f ] ++.RB [ \-c ] ++.RB [ \-m\fImargin\fR ] ++.RB [ \-b\fIborder\fR ] ++.RB [ \-d\fIlwidth\fR ] ++.RB [ \-s\fIscale\fR ] ++.RB [ \-\fInup\fR ] ++.RB [ \-q ++] ++.RI [ infile ++.RI [ outfile ]] + .SH DESCRIPTION +-.I Psnup ++.B Psnup + puts multiple logical pages onto each physical sheet of paper. + The input PostScript file should follow the Adobe Document Structuring + Conventions. + .PP + The +-.I \-w ++.B \-w + option gives the paper width, and the +-.I \-h ++.B \-h + option gives the paper height, specified in + .BR pt , + .BR mm , +@@ -57,79 +37,80 @@ + or + .BR in . + The +-.I \-p ++.B \-p + option can be used instead, to set the paper size; otherwise a default value is used. + See + .BR papersize (5). + The +-.I \-W, \-H, ++.BR \-W , ++.BR \-H , + and +-.I \-P ++.B \-P + options set the input paper size, if it is different from the output + size. This makes it easy to impose pages of one size on a different size of + paper. + .PP + The +-.I \-l ++.B \-l + option should be used for pages which are in landscape orientation (rotated 90 + degrees anticlockwise). The +-.I \-r ++.B \-r + option should be used for pages which are in seascape orientation (rotated 90 + degrees clockwise), and the +-.I \-f ++.B \-f + option should be used for pages which have the width and height interchanged, + but are not rotated. + .PP +-.I Psnup ++.B Psnup + normally uses `row-major' layout, where adjacent pages are placed in rows + across the paper. + The +-.I \-c ++.B \-c + option changes the order to `column-major', where successive pages are placed + in columns down the paper. + .PP + A margin to leave around the whole page can be specified with the +-.I \-m ++.B \-m + option. This is useful for sheets of `thumbnail' pages, because the normal + page margins are reduced by putting multiple pages on a single sheet. + .PP + The +-.I \-b ++.B \-b + option is used to specify an additional margin around each page on a sheet. + .PP + The +-.I \-d ++.B \-d + option draws a line around the border of each page, of the specified width. + If the \fIlwidth\fR parameter is omitted, a default linewidth of 1 point is + assumed. The linewidth is relative to the original page dimensions, + \fIi.e.\fR it is scaled down with the rest of the page. + .PP + The scale chosen by +-.I psnup ++.B psnup + can be overridden with the +-.I \-s ++.B \-s + option. This is useful to merge pages which are already reduced. + .PP + The +-.I \-\fInup\fR ++.BI \- nup + option selects the number of logical pages to put on each sheet of paper. This + can be any whole number; +-.I psnup ++.B psnup + tries to optimise the layout so that the minimum amount of space is wasted. If +-.I psnup ++.B psnup + cannot find a layout within its tolerance limit, it will abort with an error + message. The alternative form +-.I \i \fInup\fR ++.BI \-n nup + can also be used, for compatibility with other n-up programs. + .PP +-.I Psnup ++.B Psnup + normally prints the page numbers of the pages re-arranged; the +-.I \-q ++.B \-q + option suppresses this. + .SH EXAMPLES + The potential use of this utility is varied but one particular + use is in conjunction with +-.I psbook(1). ++.BR psbook (1). + For example, using groff to create a PostScript document and lpr as + the + .SM UNIX +@@ -151,5 +132,5 @@ + .B PostScript + is a trademark of Adobe Systems Incorporated. + .SH BUGS +-.I Psnup ++.B Psnup + does not accept all DSC comments. |