summaryrefslogtreecommitdiff
path: root/Build/source/texk/chktex/chktex-1.7.1-PATCHES
diff options
context:
space:
mode:
Diffstat (limited to 'Build/source/texk/chktex/chktex-1.7.1-PATCHES')
-rw-r--r--Build/source/texk/chktex/chktex-1.7.1-PATCHES/ChangeLog85
-rw-r--r--Build/source/texk/chktex/chktex-1.7.1-PATCHES/TL-Changes13
-rw-r--r--Build/source/texk/chktex/chktex-1.7.1-PATCHES/patch-07-kpathsea31
-rw-r--r--Build/source/texk/chktex/chktex-1.7.1-PATCHES/patch-08-stpcpy30
-rw-r--r--Build/source/texk/chktex/chktex-1.7.1-PATCHES/patch-09-test-output27
-rw-r--r--Build/source/texk/chktex/chktex-1.7.1-PATCHES/patch-10-semicolon150
-rw-r--r--Build/source/texk/chktex/chktex-1.7.1-PATCHES/patch-11-TL107
-rw-r--r--Build/source/texk/chktex/chktex-1.7.1-PATCHES/patch-12-uint64_t122
-rw-r--r--Build/source/texk/chktex/chktex-1.7.1-PATCHES/patch-13-char60
-rw-r--r--Build/source/texk/chktex/chktex-1.7.1-PATCHES/patch-14-finderrs11
10 files changed, 0 insertions, 636 deletions
diff --git a/Build/source/texk/chktex/chktex-1.7.1-PATCHES/ChangeLog b/Build/source/texk/chktex/chktex-1.7.1-PATCHES/ChangeLog
deleted file mode 100644
index b0d6fe22008..00000000000
--- a/Build/source/texk/chktex/chktex-1.7.1-PATCHES/ChangeLog
+++ /dev/null
@@ -1,85 +0,0 @@
-2013-04-01 Karl Berry <karl@tug.org>
-
- * patch-14-finderrs: patch from author for test failure,
- info in tlbuild mail from koch, 30 Mar 2013 20:12:17.
-
-2012-10-23 Peter Breitenlohner <peb@mppmu.mpg.de>
-
- * patch-13-char (new): Modify a function parameter and a few
- local variables int => char in order to avois MSVC warnings.
-
-2012-10-22 Peter Breitenlohner <peb@mppmu.mpg.de>
-
- * patch-10-semicolon: Adapt to upstream.
- * patch-11-TL (new): Use kpse_var_value(), binary output files.
- * patch-12-uint64_t (new): Use uint64_t and check for it.
-
-2012-10-10 Peter Breitenlohner <peb@mppmu.mpg.de>
-
- * patch-08-stpcpy: Check for declaration of stpcpy().
- * patch-07-kpathsea: Modify as discussed with upstream.
- * patch-10-semicolon (new): Avoid to create isolated semicolon.
-
-2012-09-27 Peter Breitenlohner <peb@mppmu.mpg.de>
-
- Imported chktex-1.7.1 source tree from:
- http://download.savannah.gnu.org/
- * patch-06-extern(removed): Now distributed.
- * patch-07-kpathsea: Adapted.
- * patch-08-stpcpy (new): Not everyone has stpcpy().
- * patch-09-test-output (new): Our Test.out.
-
-2012-07-23 Peter Breitenlohner <peb@mppmu.mpg.de>
-
- * patch-07-kpathsea (new): With -DKPATHSEA now using kpathsea.
-
-2012-04-16 Peter Breitenlohner <peb@mppmu.mpg.de>
-
- * patch-06-extern: Remove the obsolete ASM_HASHWORD stuff (for
- Amiga) avoiding extern decls from *.c files.
-
-2012-04-10 Karl Berry <karl@tug.org>
-
- * patch-01-const,
- * patch-02-bug,
- * patch-03-texlive,
- * patch-04-strcpy-bug,
- * patch-05-ctype-bug: apparently installed upstream, yay.
-
- * patch-06-extern: not installed, but HashWord and HASH_TYPE are
- only used in that one .c file anyway, so it seems fine to me for
- them to be defined there. Admittedly the function should be static.
- Did not apply or change, sorry.
-
- * TL-Changes: update for chktex 1.6.6.
-
-2012-03-29 Peter Breitenlohner <peb@mppmu.mpg.de>
-
- * patch-06-extern (new): Move decls from Utility.c to Utility.h.
-
-2010-06-13 Peter Breitenlohner <peb@mppmu.mpg.de>
-
- * patch-05-ctype-bug (new): Bug fix:
- Cast all arguments of isalpha() and similar to 'unsigned char'.
- Patch from Jukka Salmi [tlbuild, 10 Jun 2010].
-
-2010-05-21 Peter Breitenlohner <peb@mppmu.mpg.de>
-
- * patch-01-const: Change OutputFormat and PipeOutputFormat back
- to non-const.
-
-2010-05-20 Peter Breitenlohner <peb@mppmu.mpg.de>
-
- * patch-04-strcpy-bug (new): Bug fixes:
- (GetLTXArg): Avoid strcpy() with overlapping args.
- (PreProcess): Do not access Buf[-1].
-
-2010-05-06 Peter Breitenlohner <peb@mppmu.mpg.de>
-
- * patch-02-bug (new): Bug fix
- * patch-03-texlive (new): Handle global rc file for TeX Live.
-
-2010-05-02 Peter Breitenlohner <peb@mppmu.mpg.de>
-
- * patch-01-const (new): Avoid compiler warnings (const).
-
diff --git a/Build/source/texk/chktex/chktex-1.7.1-PATCHES/TL-Changes b/Build/source/texk/chktex/chktex-1.7.1-PATCHES/TL-Changes
deleted file mode 100644
index 57b92396f19..00000000000
--- a/Build/source/texk/chktex/chktex-1.7.1-PATCHES/TL-Changes
+++ /dev/null
@@ -1,13 +0,0 @@
-Changes applied to the chktex-1.7.1 tree as obtained from:
- http://mirror.ctan.org/support/chktex/chktex-1.7.1.tar.gz
- http://download.savannah.gnu.org/releases/chktex/chktex-1.7.1.tar.gz
-
-Remove:
- config.h.in
- configure
- install-sh
- stamp-h.in
-
-Rename:
- chkweb -> chkweb.sh
-
diff --git a/Build/source/texk/chktex/chktex-1.7.1-PATCHES/patch-07-kpathsea b/Build/source/texk/chktex/chktex-1.7.1-PATCHES/patch-07-kpathsea
deleted file mode 100644
index bbe955aaf09..00000000000
--- a/Build/source/texk/chktex/chktex-1.7.1-PATCHES/patch-07-kpathsea
+++ /dev/null
@@ -1,31 +0,0 @@
-diff -ur chktex-1.7.1.orig/ChkTeX.c chktex-1.7.1/ChkTeX.c
---- chktex-1.7.1.orig/ChkTeX.c 2012-07-26 12:44:22.000000000 +0200
-+++ chktex-1.7.1/ChkTeX.c 2012-10-10 11:34:16.000000000 +0200
-@@ -27,8 +27,12 @@
- */
-
-
--#include "getopt.h"
- #include "ChkTeX.h"
-+#ifdef KPATHSEA
-+#include <kpathsea/getopt.h>
-+#else
-+#include <getopt.h>
-+#endif
- #include "OpSys.h"
- #include "Utility.h"
- #include "FindErrs.h"
-diff -ur chktex-1.7.1.orig/ChkTeX.h chktex-1.7.1/ChkTeX.h
---- chktex-1.7.1.orig/ChkTeX.h 2012-08-04 21:28:49.000000000 +0200
-+++ chktex-1.7.1/ChkTeX.h 2012-10-10 11:32:49.000000000 +0200
-@@ -38,6 +38,10 @@
- # include CONFIG_H_NAME
- #endif
-
-+#ifdef KPATHSEA
-+#include <kpathsea/config.h>
-+#endif
-+
- #include <ctype.h>
- #include <math.h>
- #include <stdio.h>
diff --git a/Build/source/texk/chktex/chktex-1.7.1-PATCHES/patch-08-stpcpy b/Build/source/texk/chktex/chktex-1.7.1-PATCHES/patch-08-stpcpy
deleted file mode 100644
index bb4904e9411..00000000000
--- a/Build/source/texk/chktex/chktex-1.7.1-PATCHES/patch-08-stpcpy
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -ur chktex-1.7.1.orig/FindErrs.c chktex-1.7.1/FindErrs.c
---- chktex-1.7.1.orig/FindErrs.c 2012-08-08 22:27:57.000000000 +0200
-+++ chktex-1.7.1/FindErrs.c 2012-10-10 11:24:26.000000000 +0200
-@@ -33,6 +33,14 @@
- #include "Utility.h"
- #include "Resource.h"
-
-+#if !(defined HAVE_DECL_STPCPY && HAVE_DECL_STPCPY)
-+static inline char *
-+stpcpy(char *dest, const char *src)
-+{
-+ return strcpy(dest, src) + strlen(src);
-+}
-+#endif
-+
- #if HAVE_PCRE || HAVE_POSIX_ERE
-
- #if HAVE_PCRE
-diff -ur chktex-1.7.1.orig/configure.in chktex-1.7.1/configure.in
---- chktex-1.7.1.orig/configure.in 2012-08-22 16:27:32.000000000 +0200
-+++ chktex-1.7.1/configure.in 2012-10-10 11:24:37.000000000 +0200
-@@ -164,6 +164,8 @@
- AC_CHECK_FUNCS(access closedir fileno isatty opendir readdir stat dnl
- strcasecmp strdup strlwr strtol)
-
-+dnl Checks for declarations.
-+AC_CHECK_DECLS([stpcpy])
-
- dnl Check for PCRE regular expression support
- AC_MSG_CHECKING(whether PCRE regular expressions are enabled)
diff --git a/Build/source/texk/chktex/chktex-1.7.1-PATCHES/patch-09-test-output b/Build/source/texk/chktex/chktex-1.7.1-PATCHES/patch-09-test-output
deleted file mode 100644
index 8206114742c..00000000000
--- a/Build/source/texk/chktex/chktex-1.7.1-PATCHES/patch-09-test-output
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -ur chktex-1.7.1.orig/Test.out chktex-1.7.1/Test.out
---- chktex-1.7.1.orig/Test.out 2012-08-09 17:11:32.000000000 +0200
-+++ chktex-1.7.1/Test.out 2012-09-27 10:56:14.000000000 +0200
-@@ -418,9 +418,9 @@
- Message 22 in Test.tex: Comment displayed.
- % Warning 44 -- user regex -- default message
- ^
--Message 44 in Test.tex: User Regex: intro.
-+Message 44 in Test.tex: User Regex: intro..
- You should always write a good intro.
-- ^^^^^
-+ ^^^^^^^
- Message 22 in Test.tex: Comment displayed.
- % Warning 44 -- user regex -- user message
- ^
-@@ -457,9 +457,9 @@
- Message 36 in Test.tex: You should put a space after parenthesis.
- Here(on this line only)is a warning $sin(x)$ suppressed. % CHKTEX 35 36
- ^
--Message 44 in Test.tex: User Regex: -1:Capitalize before references.
-+Message 44 in Test.tex: User Regex: 1:Capitalize before references.
- In section~\ref{sec:3} we have a warning.
-- ^^^^^^^^^^^^
-+ ^^^^^^^^^^^^^
- Message 22 in Test.tex: Comment displayed.
- In section~\ref{sec:4} it is suppressed. % chktex -1
- ^
diff --git a/Build/source/texk/chktex/chktex-1.7.1-PATCHES/patch-10-semicolon b/Build/source/texk/chktex/chktex-1.7.1-PATCHES/patch-10-semicolon
deleted file mode 100644
index dd0adeabef3..00000000000
--- a/Build/source/texk/chktex/chktex-1.7.1-PATCHES/patch-10-semicolon
+++ /dev/null
@@ -1,150 +0,0 @@
-diff -ur chktex-1.7.1.orig/ChkTeX.c chktex-1.7.1/ChkTeX.c
---- chktex-1.7.1.orig/ChkTeX.c 2012-10-10 11:34:16.000000000 +0200
-+++ chktex-1.7.1/ChkTeX.c 2012-10-21 14:42:07.000000000 +0200
-@@ -195,7 +195,7 @@
-
- char VerbNormal[] = "%k %n in %f line %l: %m\n" "%r%s%t\n" "%u\n";
-
--#define DEF(type, name, value) type name = value;
-+#define DEF(type, name, value) type name = value
- OPTION_DEFAULTS;
- STATE_VARS;
- #undef DEF
-@@ -426,7 +426,7 @@
- for (Count = 0; Count < NUMBRACKETS; Count++)
- Brackets[Count] = 0L;
-
--#define DEF(type, name, value) name = value;
-+#define DEF(type, name, value) name = value
- STATE_VARS;
- #undef DEF
- if (UsingStdIn)
-@@ -687,7 +687,7 @@
- static void ResetSettings(void)
- {
-
--#define DEF(type, name, value) name = value;
-+#define DEF(type, name, value) name = value
- OPTION_DEFAULTS;
- #undef DEF
- if (OutputFile != stdout)
-@@ -855,11 +855,13 @@
- nextc = ShiftArg(&optarg);
- break;
-
-- LOOP(warntype, case 'w':
-- ErrType = etWarn; InUse = iuOK; LAST(warntype); case 'e':
-- ErrType = etErr; InUse = iuOK; LAST(warntype); case 'm':
-- ErrType = etMsg; InUse = iuOK; LAST(warntype); case 'n':
-- ErrType = etMsg; InUse = iuNotUser; LAST(warntype);) if (isdigit((unsigned char)*optarg))
-+ LOOP(warntype,
-+ case 'w': ErrType = etWarn; InUse = iuOK; LAST(warntype);
-+ case 'e': ErrType = etErr; InUse = iuOK; LAST(warntype);
-+ case 'm': ErrType = etMsg; InUse = iuOK; LAST(warntype);
-+ case 'n': ErrType = etMsg; InUse = iuNotUser; LAST(warntype);
-+ )
-+ if (isdigit((unsigned char)*optarg))
- {
- nextc = ParseNumArg(&Err, -1, &optarg);
- if (betw(emMinFault, Err, emMaxFault))
-diff -ur chktex-1.7.1.orig/ChkTeX.h chktex-1.7.1/ChkTeX.h
---- chktex-1.7.1.orig/ChkTeX.h 2012-10-10 11:32:49.000000000 +0200
-+++ chktex-1.7.1/ChkTeX.h 2012-10-21 14:33:01.000000000 +0200
-@@ -286,38 +286,39 @@
- extern FILE *OutputFile, *InputFile;
-
- #define OPTION_DEFAULTS \
-- DEF(int, GlobalRC, TRUE) \
-- DEF(int, WipeVerb, TRUE) \
-- DEF(int, BackupOut, TRUE) \
-- DEF(int, Quiet, FALSE) \
-- DEF(int, LicenseOnly, FALSE) \
-- DEF(int, UsingStdIn, FALSE) \
-- DEF(int, InputFiles, TRUE) \
-- DEF(int, HeadErrOut, TRUE) \
-- DEF(const char *, OutputName, "") \
-- DEF(const char *, PseudoInName, NULL) \
-- DEF(char *, OutputFormat, VerbNormal) \
-- DEF(char *, PipeOutputFormat, NULL) \
-- DEF(const char *, Delimit, ":") \
-- DEF(long, DebugLevel, 0) \
-+ DEF(int, GlobalRC, TRUE); \
-+ DEF(int, WipeVerb, TRUE); \
-+ DEF(int, BackupOut, TRUE); \
-+ DEF(int, Quiet, FALSE); \
-+ DEF(int, LicenseOnly, FALSE); \
-+ DEF(int, UsingStdIn, FALSE); \
-+ DEF(int, InputFiles, TRUE); \
-+ DEF(int, HeadErrOut, TRUE); \
-+ DEF(const char *, OutputName, ""); \
-+ DEF(const char *, PseudoInName, NULL); \
-+ DEF(char *, OutputFormat, VerbNormal); \
-+ DEF(char *, PipeOutputFormat, NULL); \
-+ DEF(const char *, Delimit, ":"); \
-+ DEF(long, DebugLevel, 0); \
- DEF(int, NoLineSupp, FALSE)
-
- #define STATE_VARS \
-- DEF(enum ItState, ItState, itOff) /* Are we doing italics? */ \
-- DEF(int, AtLetter, FALSE) /* Whether `@' is a letter or not. */ \
-- DEF(int, InHeader, TRUE) /* Whether we're in the header */ \
-- DEF(int, VerbMode, FALSE) /* Whether we're in complete ignore-mode */ \
-- DEF(long, MathMode, 0) /* Whether we're in math mode or not */ \
-- DEF(const char *, VerbStr, "") /* String we'll terminate verbmode upon */ \
-- DEF(unsigned long, ErrPrint, 0) /* # errors printed */ \
-- DEF(unsigned long, WarnPrint, 0) /* # warnings printed */ \
-- DEF(unsigned long, UserSupp, 0) /* # user suppressed warnings */ \
-- DEF(unsigned long, LineSupp, 0) /* # warnings suppressed on a single line */ \
-- DEF(unsigned long long, FileSuppressions, 0) /* # warnings suppressed in a file */ \
-- DEF(unsigned long long, UserFileSuppressions, 0) /* # User warnings suppressed in a file */
-+ DEF(enum ItState, ItState, itOff); /* Are we doing italics? */ \
-+ DEF(int, AtLetter, FALSE); /* Whether `@' is a letter or not. */ \
-+ DEF(int, InHeader, TRUE); /* Whether we're in the header */ \
-+ DEF(int, VerbMode, FALSE); /* Whether we're in complete ignore-mode */ \
-+ DEF(long, MathMode, 0); /* Whether we're in math mode or not */ \
-+ DEF(const char *, VerbStr, ""); /* String we'll terminate verbmode upon */ \
-+ DEF(unsigned long, ErrPrint, 0); /* # errors printed */ \
-+ DEF(unsigned long, WarnPrint, 0); /* # warnings printed */ \
-+ DEF(unsigned long, UserSupp, 0); /* # user suppressed warnings */ \
-+ DEF(unsigned long, LineSupp, 0); /* # warnings suppressed on a single line */ \
-+ DEF(unsigned long long, FileSuppressions, 0); /* # warnings suppressed in a file */ \
-+ DEF(unsigned long long, UserFileSuppressions, 0); /* # User warnings suppressed in a file */
-
--#define DEF(type, name, value) extern type name;
--OPTION_DEFAULTS STATE_VARS
-+#define DEF(type, name, value) extern type name
-+OPTION_DEFAULTS;
-+STATE_VARS;
- #undef DEF
- extern struct Stack CharStack, InputStack, EnvStack;
-
-diff -ur chktex-1.7.1.orig/Resource.c chktex-1.7.1/Resource.c
---- chktex-1.7.1.orig/Resource.c 2012-04-23 22:22:26.000000000 +0200
-+++ chktex-1.7.1/Resource.c 2012-10-21 14:45:14.000000000 +0200
-@@ -75,7 +75,7 @@
- BIT(Equal), /* = */ \
- BIT(Word), /* Keyword */ \
- BIT(Item) /* List item */ \
--};
-+}
-
- #undef BIT
- #define BIT BITDEF1
-@@ -323,7 +323,7 @@
-
- #define DONEKEY (FLG_Open | FLG_Equal | FLG_BrOpen)
- #define DONELIST (FLG_Close | FLG_BrClose)
--#define TOKEN(c, ctxt, tk) case c: if(Expect & (ctxt)) Retval = tk; LAST(token);
-+#define TOKEN(c, ctxt, tk) case c: if(Expect & (ctxt)) Retval = tk; LAST(token)
-
- LOOP(token,
- TOKEN('{', DONEKEY, FLG_Open);
-@@ -331,7 +331,7 @@
- TOKEN('=', DONEKEY, FLG_Equal);
- TOKEN(']', DONELIST, FLG_BrClose);
- TOKEN('}', DONELIST, FLG_Close);
-- );
-+ )
- if (Retval != FLG_Eof)
- {
- OnceMore = FALSE;
diff --git a/Build/source/texk/chktex/chktex-1.7.1-PATCHES/patch-11-TL b/Build/source/texk/chktex/chktex-1.7.1-PATCHES/patch-11-TL
deleted file mode 100644
index 6ef6b935ae4..00000000000
--- a/Build/source/texk/chktex/chktex-1.7.1-PATCHES/patch-11-TL
+++ /dev/null
@@ -1,107 +0,0 @@
-diff -ur chktex-1.7.1.orig/ChkTeX.c chktex-1.7.1/ChkTeX.c
---- chktex-1.7.1.orig/ChkTeX.c 2012-10-21 14:42:07.000000000 +0200
-+++ chktex-1.7.1/ChkTeX.c 2012-10-21 16:00:08.000000000 +0200
-@@ -334,7 +334,15 @@
- #endif
-
- OutputFile = stdout;
-+#ifdef KPATHSEA
-+ kpse_set_program_name(argv[0], "chktex");
-+ PrgName = kpse_program_name;
-+#ifdef WIN32
-+ setmode(fileno(stdout), _O_BINARY);
-+#endif
-+#else
- PrgName = argv[0];
-+#endif
-
- #undef KEY
- #undef LCASE
-@@ -512,7 +520,11 @@
-
- if (Success)
- {
-+#ifdef KPATHSEA
-+ if (!(OutputFile = fopen(OutputName, "wb")))
-+#else
- if (!(OutputFile = fopen(OutputName, "w")))
-+#endif
- {
- PrintPrgErr(pmOutOpen);
- Success = FALSE;
-diff -ur chktex-1.7.1.orig/OpSys.c chktex-1.7.1/OpSys.c
---- chktex-1.7.1.orig/OpSys.c 2010-12-18 22:12:10.000000000 +0100
-+++ chktex-1.7.1/OpSys.c 2012-10-21 15:56:54.000000000 +0200
-@@ -37,6 +37,10 @@
- #include "OpSys.h"
- #include "Utility.h"
-
-+#ifdef KPATHSEA
-+#include <kpathsea/variable.h>
-+#endif
-+
- #ifdef HAVE_SYS_STAT_H
- # include <sys/stat.h>
- #endif
-@@ -105,6 +109,8 @@
-
- #ifdef __MSDOS__
- # define LOCALRCFILE RCBASENAME
-+#elif defined(WIN32)
-+# define LOCALRCFILE RCBASENAME
- #else
- # define LOCALRCFILE "." RCBASENAME
- #endif
-@@ -173,6 +179,8 @@
- #ifdef __MSDOS__
-
- if ((Env = getenv("CHKTEXRC")) || (Env = getenv("CHKTEX_HOME")))
-+#elif defined(TEX_LIVE)
-+ if ((Env = kpse_var_value("CHKTEXRC")))
- #else
-
- if ((Env = getenv("CHKTEXRC")))
-@@ -181,6 +189,9 @@
- {
- strcpy(ConfigFile, Env);
- tackon(ConfigFile, LOCALRCFILE);
-+#ifdef TEX_LIVE
-+ free(Env);
-+#endif
- }
- else
- #ifdef __MSDOS__
-@@ -217,24 +228,20 @@
- break;
- case liSysDir: /* System dir for resource files */
- #ifdef TEX_LIVE
-- if ((Env = getenv("CHKTEX_CONFIG")))
-+ if ((Env = kpse_var_value("CHKTEX_CONFIG")))
- {
- strcpy(ConfigFile, Env);
-+ free(Env);
- }
-- else
-+ else if ((Env = kpse_var_value("TEXMFMAIN")))
- {
-- FILE *f;
-- *ConfigFile = 0;
-- if ((f = popen("kpsewhich -expand-var='$TEXMFMAIN'", "r")))
-- {
-- if (1 == fscanf(f, "%1024s", ConfigFile))
-- {
-- tackon(ConfigFile, "chktex");
-- tackon(ConfigFile, RCBASENAME);
-- }
-- (void)pclose(f);
-- }
-+ strcpy(ConfigFile, Env);
-+ tackon(ConfigFile, "chktex");
-+ tackon(ConfigFile, RCBASENAME);
-+ free(Env);
- }
-+ else
-+ *ConfigFile = 0;
- #else /* TEX_LIVE */
- #if defined(__unix__) || defined(__MSDOS__)
- strcpy(ConfigFile, SYSCONFDIR);
diff --git a/Build/source/texk/chktex/chktex-1.7.1-PATCHES/patch-12-uint64_t b/Build/source/texk/chktex/chktex-1.7.1-PATCHES/patch-12-uint64_t
deleted file mode 100644
index 298ec44dfee..00000000000
--- a/Build/source/texk/chktex/chktex-1.7.1-PATCHES/patch-12-uint64_t
+++ /dev/null
@@ -1,122 +0,0 @@
-diff -ur chktex-1.7.1.orig/ChkTeX.h chktex-1.7.1/ChkTeX.h
---- chktex-1.7.1.orig/ChkTeX.h 2012-10-21 14:33:01.000000000 +0200
-+++ chktex-1.7.1/ChkTeX.h 2012-10-22 10:26:21.000000000 +0200
-@@ -72,6 +72,14 @@
- # include <strings.h>
- #endif
-
-+#ifdef HAVE_INTTYPES_H
-+# include <inttypes.h>
-+#endif
-+
-+#ifdef HAVE_STDINT_H
-+# include <stdint.h>
-+#endif
-+
- #include "types.h"
-
- #ifndef LONG_MAX
-@@ -313,8 +321,8 @@
- DEF(unsigned long, WarnPrint, 0); /* # warnings printed */ \
- DEF(unsigned long, UserSupp, 0); /* # user suppressed warnings */ \
- DEF(unsigned long, LineSupp, 0); /* # warnings suppressed on a single line */ \
-- DEF(unsigned long long, FileSuppressions, 0); /* # warnings suppressed in a file */ \
-- DEF(unsigned long long, UserFileSuppressions, 0); /* # User warnings suppressed in a file */
-+ DEF(uint64_t, FileSuppressions, 0); /* # warnings suppressed in a file */ \
-+ DEF(uint64_t, UserFileSuppressions, 0); /* # User warnings suppressed in a file */
-
- #define DEF(type, name, value) extern type name
- OPTION_DEFAULTS;
-diff -ur chktex-1.7.1.orig/FindErrs.c chktex-1.7.1/FindErrs.c
---- chktex-1.7.1.orig/FindErrs.c 2012-10-10 11:24:26.000000000 +0200
-+++ chktex-1.7.1/FindErrs.c 2012-10-22 10:34:58.000000000 +0200
-@@ -75,7 +75,7 @@
- return(func(c)); \
- }
-
--#define SUPPRESSED_ON_LINE(c) (LineSuppressions & (1LL<<c))
-+#define SUPPRESSED_ON_LINE(c) (LineSuppressions & ((uint64_t)1<<c))
-
- #define INUSE(c) \
- ((LaTeXMsgs[(enum ErrNum) c].InUse == iuOK) && !SUPPRESSED_ON_LINE(c))
-@@ -146,12 +146,12 @@
- /*
- * A bit field used to hold the suppressions for the current line.
- */
--static unsigned long long LineSuppressions;
-+static uint64_t LineSuppressions;
- /*
- * A bit field used to hold the suppressions of numbered user warnings
- * for the current line.
- */
--static unsigned long long UserLineSuppressions;
-+static uint64_t UserLineSuppressions;
-
- static unsigned long Line;
-
-@@ -344,7 +344,7 @@
- if (!NoLineSupp)
- {
- int error;
-- const int MaxSuppressionBits = sizeof(unsigned long long)*8-1;
-+ const int MaxSuppressionBits = 63;
-
- /* Convert to lowercase to compare with LineSuppDelim */
- EscapePtr = ++TmpPtr; /* move past NUL terminator */
-@@ -365,13 +365,13 @@
- }
- if (error > 0)
- {
-- FileSuppressions |= (1LL << error);
-- LineSuppressions |= (1LL << error);
-+ FileSuppressions |= ((uint64_t)1 << error);
-+ LineSuppressions |= ((uint64_t)1 << error);
- }
- else
- {
-- UserFileSuppressions |= (1LL << (-error));
-- UserLineSuppressions |= (1LL << (-error));
-+ UserFileSuppressions |= ((uint64_t)1 << (-error));
-+ UserLineSuppressions |= ((uint64_t)1 << (-error));
- }
- }
- TmpPtr = EscapePtr;
-@@ -388,11 +388,11 @@
-
- if (error > 0)
- {
-- LineSuppressions |= (1LL << error);
-+ LineSuppressions |= ((uint64_t)1 << error);
- }
- else
- {
-- UserLineSuppressions |= (1LL << (-error));
-+ UserLineSuppressions |= ((uint64_t)1 << (-error));
- }
- }
- }
-@@ -882,11 +882,11 @@
- while (offset < len)
- {
- /* Check if this warning should be suppressed. */
-- if (UserLineSuppressions != 0LL && NamedWarning)
-+ if (UserLineSuppressions && NamedWarning)
- {
- /* The warning can be named with positive or negative numbers. */
- int UserWarningNumber = abs(atoi(ErrMessage));
-- if (UserLineSuppressions & (1LL << UserWarningNumber))
-+ if (UserLineSuppressions & ((uint64_t)1 << UserWarningNumber))
- {
- break;
- }
-diff -ur chktex-1.7.1.orig/configure.in chktex-1.7.1/configure.in
---- chktex-1.7.1.orig/configure.in 2012-10-10 11:24:37.000000000 +0200
-+++ chktex-1.7.1/configure.in 2012-10-22 10:24:01.000000000 +0200
-@@ -158,6 +158,7 @@
- AC_C_CONST
- AC_C_INLINE
- AC_TYPE_SIZE_T
-+AC_TYPE_UINT64_T
-
- dnl Checks for library functions.
- AC_FUNC_VPRINTF
diff --git a/Build/source/texk/chktex/chktex-1.7.1-PATCHES/patch-13-char b/Build/source/texk/chktex/chktex-1.7.1-PATCHES/patch-13-char
deleted file mode 100644
index fac30b29996..00000000000
--- a/Build/source/texk/chktex/chktex-1.7.1-PATCHES/patch-13-char
+++ /dev/null
@@ -1,60 +0,0 @@
- Modify a function parameter and a few local variables
- int => char in order to avois MSVC warnings.
-
- Replace 'char const' => 'const char'.
-
-diff -ur chktex-1.7.1.orig/FindErrs.c chktex-1.7.1/FindErrs.c
---- chktex-1.7.1.orig/FindErrs.c 2012-10-22 10:34:58.000000000 +0200
-+++ chktex-1.7.1/FindErrs.c 2012-10-23 17:58:04.000000000 +0200
-@@ -1027,11 +1027,11 @@
- *
- */
-
--static void HandleBracket(int Char)
-+static void HandleBracket(char Char)
- {
- unsigned long BrOffset; /* Offset into BrOrder array */
- struct ErrInfo *ei;
-- int TmpC, Match;
-+ char TmpC, Match;
- char ABuf[2], BBuf[2];
- char *TmpPtr;
-
-@@ -1235,7 +1235,7 @@
- char *TmpPtr; /* Temporary pointer */
- char *ErrPtr; /* Ptr to where an error started */
-
-- int TmpC, /* Just a temp var used throughout the proc. */
-+ char TmpC, /* Just a temp var used throughout the proc. */
- MatchC, Char; /* Char. currently processed */
- unsigned long CmdLen; /* Length of misc. things */
- int MixingQuotes;
-@@ -1505,11 +1505,7 @@
- HERE(1, emUseQuoteLiga);
- break;
-
-- /* One of these are unnecessary, but what the heck... */
-- case 180: /* ´. NOTE: '\xb4' gets converted to - something */
-- case ~(0xff & (~180)): /* This yields 0xff...fb4 in */
-- /* arbitrary precision. */
--
-+ case '\264': /* '´' */
- HERE(1, emUseOtherQuote);
- break;
-
-diff -ur chktex-1.7.1.orig/Utility.h chktex-1.7.1/Utility.h
---- chktex-1.7.1.orig/Utility.h 2012-08-04 18:40:33.000000000 +0200
-+++ chktex-1.7.1/Utility.h 2012-10-22 20:53:20.000000000 +0200
-@@ -150,9 +150,9 @@
- struct ErrInfo *PopErr(struct Stack *Stack);
- struct ErrInfo *TopMatch(struct Stack *Stack, char *String);
-
--long BrackIndex(char const c);
--void AddBracket(char const c);
--char MatchBracket(char const);
-+long BrackIndex(const char c);
-+void AddBracket(const char c);
-+char MatchBracket(const char c);
-
-
-
diff --git a/Build/source/texk/chktex/chktex-1.7.1-PATCHES/patch-14-finderrs b/Build/source/texk/chktex/chktex-1.7.1-PATCHES/patch-14-finderrs
deleted file mode 100644
index 16ba4c47b5e..00000000000
--- a/Build/source/texk/chktex/chktex-1.7.1-PATCHES/patch-14-finderrs
+++ /dev/null
@@ -1,11 +0,0 @@
---- FindErrs.c (revision 242)
-+++ FindErrs.c (working copy)
-@@ -918,7 +918,7 @@
- /* Default -- show the match */
- PSERR2(offset + MATCH.rm_so, MATCH.rm_eo - MATCH.rm_so,
- emUserWarnRegex,
-- MATCH.rm_eo - MATCH.rm_so,
-+ (int)(MATCH.rm_eo - MATCH.rm_so),
- TmpBuffer + offset + MATCH.rm_so);
- }
- offset += MATCH.rm_eo;