diff options
Diffstat (limited to 'Build/source/utils/psutils/psutils-1.21-PATCHES')
6 files changed, 0 insertions, 311 deletions
diff --git a/Build/source/utils/psutils/psutils-1.21-PATCHES/ChangeLog b/Build/source/utils/psutils/psutils-1.21-PATCHES/ChangeLog deleted file mode 100644 index 804637a3dc4..00000000000 --- a/Build/source/utils/psutils/psutils-1.21-PATCHES/ChangeLog +++ /dev/null @@ -1,63 +0,0 @@ -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/utils/psutils/psutils-1.21-PATCHES/TL-Changes b/Build/source/utils/psutils/psutils-1.21-PATCHES/TL-Changes deleted file mode 100644 index 96528b891a5..00000000000 --- a/Build/source/utils/psutils/psutils-1.21-PATCHES/TL-Changes +++ /dev/null @@ -1,6 +0,0 @@ -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/utils/psutils/psutils-1.21-PATCHES/patch-01-backport b/Build/source/utils/psutils/psutils-1.21-PATCHES/patch-01-backport deleted file mode 100644 index 1eca478234d..00000000000 --- a/Build/source/utils/psutils/psutils-1.21-PATCHES/patch-01-backport +++ /dev/null @@ -1,12 +0,0 @@ -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/utils/psutils/psutils-1.21-PATCHES/patch-10-binary-mode b/Build/source/utils/psutils/psutils-1.21-PATCHES/patch-10-binary-mode deleted file mode 100644 index ddb38186dc2..00000000000 --- a/Build/source/utils/psutils/psutils-1.21-PATCHES/patch-10-binary-mode +++ /dev/null @@ -1,164 +0,0 @@ -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/utils/psutils/psutils-1.21-PATCHES/patch-11-WIN32 b/Build/source/utils/psutils/psutils-1.21-PATCHES/patch-11-WIN32 deleted file mode 100644 index 2490a1b0642..00000000000 --- a/Build/source/utils/psutils/psutils-1.21-PATCHES/patch-11-WIN32 +++ /dev/null @@ -1,22 +0,0 @@ -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/utils/psutils/psutils-1.21-PATCHES/patch-12-getopt b/Build/source/utils/psutils/psutils-1.21-PATCHES/patch-12-getopt deleted file mode 100644 index bfe0e286b39..00000000000 --- a/Build/source/utils/psutils/psutils-1.21-PATCHES/patch-12-getopt +++ /dev/null @@ -1,44 +0,0 @@ -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-11-21 08:17:17.000000000 +0100 -@@ -32,7 +32,7 @@ - ] [ - .B \-s\fIscale\fR - ] [ --.B \-n\fIup\fR -+.B \-\fInup\fR - ] [ - .B \-q - ] [ -diff -ur psutils-1.21.orig/psnup.c psutils-1.21/psnup.c ---- psutils-1.21.orig/psnup.c 2013-10-25 13:06:05.000000000 +0200 -+++ psutils-1.21/psnup.c 2013-11-21 08:17:17.000000000 +0100 -@@ -64,7 +64,7 @@ - - while((opt = - getopt(argc, argv, -- "qd::lrfcw:W:h:H:m:b:t:s:p:P:n:1::2::3::4::5::6::7::8::9::")) -+ "qd::lrfcw:W:h:H:m:b:t:s:p:P:n:123456789")) - != EOF) { - switch(opt) { - case 'q': /* quiet */ -@@ -141,18 +141,7 @@ - case '7': - case '8': - case '9': -- if(optarg) { -- char *valuestr = (char *) malloc(strlen(optarg) + 2); -- valuestr[0] = opt; -- strcpy(&(valuestr[1]), optarg); -- -- /* really should check that valuestr is only digits here...*/ -- if ((nup = atoi(valuestr)) < 1) -- message(FATAL, "-n %d too small\n", nup); -- free(valuestr); -- } else { -- nup = (opt - '0'); -- } -+ nup = (opt - '0'); - break; - case 'v': /* version */ - default: |