From 370b138f85fb5eee6e176bcd9ad772ba178cb843 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 13 Feb 2017 22:32:47 +0000 Subject: TLpatches seems nicer than all uppercase; sorry for churn git-svn-id: svn://tug.org/texlive/trunk@43214 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/libs/teckit/TLPATCHES/ChangeLog | 79 ---------------- Build/source/libs/teckit/TLPATCHES/TL-Changes | 34 ------- .../source/libs/teckit/TLPATCHES/patch-02-warning | 14 --- .../source/libs/teckit/TLPATCHES/patch-03-warnings | 104 --------------------- .../source/libs/teckit/TLPATCHES/patch-04-pragmas | 61 ------------ Build/source/libs/teckit/TLPATCHES/patch-05-static | 44 --------- .../teckit/TLPATCHES/patch-06-dont-build-sfconv | 12 --- Build/source/libs/teckit/TLpatches/ChangeLog | 79 ++++++++++++++++ Build/source/libs/teckit/TLpatches/TL-Changes | 34 +++++++ .../source/libs/teckit/TLpatches/patch-02-warning | 14 +++ .../source/libs/teckit/TLpatches/patch-03-warnings | 104 +++++++++++++++++++++ .../source/libs/teckit/TLpatches/patch-04-pragmas | 61 ++++++++++++ Build/source/libs/teckit/TLpatches/patch-05-static | 44 +++++++++ .../teckit/TLpatches/patch-06-dont-build-sfconv | 12 +++ 14 files changed, 348 insertions(+), 348 deletions(-) delete mode 100644 Build/source/libs/teckit/TLPATCHES/ChangeLog delete mode 100644 Build/source/libs/teckit/TLPATCHES/TL-Changes delete mode 100644 Build/source/libs/teckit/TLPATCHES/patch-02-warning delete mode 100644 Build/source/libs/teckit/TLPATCHES/patch-03-warnings delete mode 100644 Build/source/libs/teckit/TLPATCHES/patch-04-pragmas delete mode 100644 Build/source/libs/teckit/TLPATCHES/patch-05-static delete mode 100644 Build/source/libs/teckit/TLPATCHES/patch-06-dont-build-sfconv create mode 100644 Build/source/libs/teckit/TLpatches/ChangeLog create mode 100644 Build/source/libs/teckit/TLpatches/TL-Changes create mode 100644 Build/source/libs/teckit/TLpatches/patch-02-warning create mode 100644 Build/source/libs/teckit/TLpatches/patch-03-warnings create mode 100644 Build/source/libs/teckit/TLpatches/patch-04-pragmas create mode 100644 Build/source/libs/teckit/TLpatches/patch-05-static create mode 100644 Build/source/libs/teckit/TLpatches/patch-06-dont-build-sfconv (limited to 'Build/source/libs/teckit') diff --git a/Build/source/libs/teckit/TLPATCHES/ChangeLog b/Build/source/libs/teckit/TLPATCHES/ChangeLog deleted file mode 100644 index 4ae1093d856..00000000000 --- a/Build/source/libs/teckit/TLPATCHES/ChangeLog +++ /dev/null @@ -1,79 +0,0 @@ -2017-01-11 Norbert Preining - - Remove SFconv directory, contains non-free ConvertUTF.{c,h} - Add patch patch-06-dont-build-sfconv to not build sfconv. - -2016-12-30 Akira Kakuto - - Imported TECkit-2.5.6 source tree (teckit) from - https://github.com/silnrsi/teckit/archive/2.5.6.tar.gz. - patch-02-warning, patch-03-warnings, patch-04-pragmas, and - patch-05-static: Adapted. - -2014-07-18 Peter Breitenlohner - - Imported TECkit-2.5.4 source tree (teckit) from - http://scripts.sil.org/svn-public/teckit/TRUNK - (svn r139 2014-07-09 14:47:39 UTC). - - * patch-06-backport-r119 (removed): Now in source tree. - * patch-02-warning, patch-03-warnings, patch-04-pragmas, - patch-05-static: Adapted. - -2014-06-28 Peter Breitenlohner - - * patch-06-static_cast (removed): Replaced by ... - * patch-06-backport-r119 (new): ... Backport upstream changes: - svn r117: Update test runner for compatibility with newer - versions of perl - svn r118: Update Normalization test data for 6.0.0 - svn r119: Fix data-narrowing bug - -2014-06-23 Peter Breitenlohner - - * patch-06-static_cast (new): Add static_cast required by C++11. - -2012-10-13 Peter Breitenlohner - - Avoid TL vs W32TeX diffs (from Akira). - * patch-04-pragmas (new): Remove '#pragma's. - * patch-05-static (new): Build a static library and not a Dll. - -2012-03-17 Peter Breitenlohner - - Imported TECkit-2.5.3 source tree (teckit) from - http://scripts.sil.org/svn-public/teckit/TRUNK - (svn r116 2011-05-12 18:24:47 UTC). - - * patch-01-debian-505693, patch-04-case-sensitive (removed): - Now in source tree. - * patch-02-warning, patch-03-warnings: Adapted. - -2010-02-19 Peter Breitenlohner - - * patch-04-case-sensitive (new): #include instead - of for, e.g., Linux => MinGW32 cross compilation. - -2009-10-18 Peter Breitenlohner - - Reconstruct TL TECkit sources from distributed tarball. - * TL-changes (new): Modifications applied to the distribution. - * patch-[0-9][0-9]-*: Patches applied to the distribution. - -2009-10-01 Peter Breitenlohner - - * patch-03-warnings (new): Avoid maximal compiler warnings. - source/Sample-tools/TECkit_Compile.cpp, source/Engine.{cpp,h}, - source/Public-headers/TECkit_Compiler.h, source/Compiler.cpp: - Constify. - -2009-06-25 Peter Breitenlohner - - * patch-02-warning (new): Avoid compiler warning. - source/Compiler.h: change type of Compiler::Pass.passType - long -> UInt32. - -2008-11-17 Jonathan Kew - - * patch-01-debian-505693 (new): Bug fix. - diff --git a/Build/source/libs/teckit/TLPATCHES/TL-Changes b/Build/source/libs/teckit/TLPATCHES/TL-Changes deleted file mode 100644 index fd47be354c5..00000000000 --- a/Build/source/libs/teckit/TLPATCHES/TL-Changes +++ /dev/null @@ -1,34 +0,0 @@ -Changes applied to the TECkit-2.5.6/ tree obtained from: - https://github.com/silnrsi/teckit/archive/2.5.6.tar.gz. - -Removed execute permissions from: - installed-top.pc.in - teckit.pc.in - uninstalled-top.pc.in - -Removed: - .gitignore - SFconv/ - TECkit.mcp - build-mac-binaries.sh - build-linux-package.sh - build-windows-binaries.sh - debian-src/ - mac-installer/ - perl_binaries/ - source/teckitjni/ - zlib-1.2.3/ - -Converted Dos/Win line ends to native: - source/Perl/TECkit.xs - source/Perl/lib/Encode/TECkit.pm - source/Perl/test.pl - source/Perl/typemap - test/GNT-map.xml - test/ISO-8859-1.map - test/Mrk-GNT.sf - test/mrk.sf.legacy.txt.orig - -Added newline at end of file: - source/Carbon.r - diff --git a/Build/source/libs/teckit/TLPATCHES/patch-02-warning b/Build/source/libs/teckit/TLPATCHES/patch-02-warning deleted file mode 100644 index 35f6c621c84..00000000000 --- a/Build/source/libs/teckit/TLPATCHES/patch-02-warning +++ /dev/null @@ -1,14 +0,0 @@ - Avoid compiler warning. - -diff -ur teckit-2.5.6.orig/source/Compiler.h teckit-2.5.6/source/Compiler.h ---- teckit-2.5.6.orig/source/Compiler.h Tue May 31 05:37:08 2016 -+++ teckit-2.5.6/source/Compiler.h Fri Dec 30 18:01:51 2016 -@@ -230,7 +230,7 @@ - vector byteClassLines; - vector uniClassLines; - -- long passType; -+ UInt32 passType; - UInt32 uniDefault; - UInt8 byteDefault; - bool supplementaryChars; diff --git a/Build/source/libs/teckit/TLPATCHES/patch-03-warnings b/Build/source/libs/teckit/TLPATCHES/patch-03-warnings deleted file mode 100644 index d88f8282eb1..00000000000 --- a/Build/source/libs/teckit/TLPATCHES/patch-03-warnings +++ /dev/null @@ -1,104 +0,0 @@ - Avoid more compiler warnings. - -diff -ur teckit-2.5.6.orig/source/Compiler.cpp teckit-2.5.6/source/Compiler.cpp ---- teckit-2.5.6.orig/source/Compiler.cpp Tue May 31 05:37:08 2016 -+++ teckit-2.5.6/source/Compiler.cpp Fri Dec 30 18:04:55 2016 -@@ -189,14 +189,14 @@ - free(table); - } - --char* -+const char* - WINAPI - TECkit_GetUnicodeName(UInt32 usv) - { - const CharName *c = &gUnicodeNames[0]; - while (c->name != 0) - if (c->usv == usv) -- return (char*)c->name; -+ return c->name; - else - ++c; - return NULL; -@@ -2133,7 +2133,7 @@ - cout << " at line " << line << endl; - } - else -- (*errorFunction)(errFuncUserData, (char*)msg, (char*)s, line); -+ (*errorFunction)(errFuncUserData, msg, s, line); - errorState = true; - ++errorCount; - } -diff -ur teckit-2.5.6.orig/source/Engine.cpp teckit-2.5.6/source/Engine.cpp ---- teckit-2.5.6.orig/source/Engine.cpp Tue May 31 05:37:08 2016 -+++ teckit-2.5.6/source/Engine.cpp Fri Dec 30 18:18:57 2016 -@@ -1093,7 +1075,7 @@ - if (matchElems == 0 && allowInsertion == false) - continue; - patternLength = matchElems + READ(rule->postLength); -- pattern = (MatchElem*)(rule + 1); // point past the defined struct for the rule header -+ pattern = (const MatchElem*)(rule + 1); // point past the defined struct for the rule header - direction = 1; - infoLimit = matchElems; - -@@ -2194,7 +2168,7 @@ - status = kStatus_BadMappingVersion; - else { - const Byte* namePtr; -- if (getNamePtrFromTable((Byte*)fh, nameID, namePtr, *nameLength)) { -+ if (getNamePtrFromTable((const Byte*)fh, nameID, namePtr, *nameLength)) { - UInt16 copyBytes = *nameLength < bufferSize ? *nameLength : bufferSize; - if (copyBytes > 0) - memcpy(nameBuffer, namePtr, copyBytes); -diff -ur teckit-2.5.6.orig/source/Engine.h teckit-2.5.6/source/Engine.h ---- teckit-2.5.6.orig/source/Engine.h Tue May 31 05:37:08 2016 -+++ teckit-2.5.6/source/Engine.h Fri Dec 30 18:09:51 2016 -@@ -117,7 +117,7 @@ - - UInt32 match(int index, int repeats, int textLoc); - // returns 0 for no match, 1 for match, or kNeedMoreInput/kInvalidChar -- MatchElem* pattern; -+ const MatchElem* pattern; - int patternLength; - int direction; - MatchInfo info[256]; -diff -ur teckit-2.5.6.orig/source/Public-headers/TECkit_Compiler.h teckit-2.5.6/source/Public-headers/TECkit_Compiler.h ---- teckit-2.5.6.orig/source/Public-headers/TECkit_Compiler.h Tue May 31 05:37:08 2016 -+++ teckit-2.5.6/source/Public-headers/TECkit_Compiler.h Fri Dec 30 18:21:02 2016 -@@ -56,7 +59,7 @@ - #define kCompilerOpts_Compress 0x00000010 /* generate compressed mapping table */ - #define kCompilerOpts_XML 0x00000020 /* instead of a compiled binary table, generate an XML representation of the mapping */ - --typedef void (CALLBACK *TECkit_ErrorFn)(void* userData, char* msg, char* param, UInt32 line); -+typedef void (CALLBACK *TECkit_ErrorFn)(void* userData, const char* msg, const char* param, UInt32 line); - - TECkit_Status - WINAPI EXPORTED -@@ -75,7 +78,7 @@ - TECkit_GetCompilerVersion(); - - /* new APIs for looking up Unicode names (as NUL-terminated C strings) */ --char* -+const char* - WINAPI EXPORTED - TECkit_GetUnicodeName(UInt32 usv); - /* returns the Unicode name of usv, if available, else NULL */ -diff -ur teckit-2.5.6.orig/source/Sample-tools/TECkit_Compile.cpp teckit-2.5.6/source/Sample-tools/TECkit_Compile.cpp ---- teckit-2.5.6.orig/source/Sample-tools/TECkit_Compile.cpp Tue May 31 05:37:08 2016 -+++ teckit-2.5.6/source/Sample-tools/TECkit_Compile.cpp Fri Dec 30 18:14:53 2016 -@@ -24,13 +24,13 @@ - #endif - - extern "C" { -- static void CALLBACK errFunc(void* userData, char* msg, char* param, UInt32 line); -+ static void CALLBACK errFunc(void* userData, const char* msg, const char* param, UInt32 line); - }; - - static - void - CALLBACK --errFunc(void* /*userData*/, char* msg, char* param, UInt32 line) -+errFunc(void* /*userData*/, const char* msg, const char* param, UInt32 line) - { - fprintf(stderr, "%s", msg); - if (param != 0) diff --git a/Build/source/libs/teckit/TLPATCHES/patch-04-pragmas b/Build/source/libs/teckit/TLPATCHES/patch-04-pragmas deleted file mode 100644 index 171a2aec59f..00000000000 --- a/Build/source/libs/teckit/TLPATCHES/patch-04-pragmas +++ /dev/null @@ -1,61 +0,0 @@ - Remove the '#pragma's, they seem to cause problems for MSVC - and are certainly not needed otherwise. - -diff -ur teckit-2.5.6.orig/source/Engine.cpp teckit-2.5.6/source/Engine.cpp ---- teckit-2.5.6.orig/source/Engine.cpp Tue May 31 05:37:08 2016 -+++ teckit-2.5.6/source/Engine.cpp Fri Dec 30 18:18:57 2016 -@@ -102,10 +96,6 @@ - #endif - } - --#ifndef __GNUC__ --#pragma mark --- class Stage --- --#endif -- - Stage::Stage() - : oBuffer(0) - , oBufSize(0) -@@ -127,10 +117,6 @@ - return 0; - } - --#ifndef __GNUC__ --#pragma mark --- class Normalizer --- --#endif -- - #include "NormalizationData.c" - - Normalizer::Normalizer(bool compose) -@@ -400,10 +386,6 @@ - return c; - } - --#ifndef __GNUC__ --#pragma mark --- class Pass --- --#endif -- - Pass::Pass(const TableHeader* inTable, Converter* cnv) - : converter(cnv) - , tableHeader(inTable) -@@ -1288,10 +1270,6 @@ - return 0; - } - --#ifndef __GNUC__ --#pragma mark --- class Converter --- --#endif -- - Converter::Converter(const Byte* inTable, UInt32 inTableSize, bool inForward, - UInt16 inForm, UInt16 outForm) - : table(0) -@@ -1942,10 +1920,6 @@ - return true; - } - --#ifndef __GNUC__ --#pragma mark --- Public "C" API functions --- --#endif -- - TECkit_Status - WINAPI - TECkit_CreateConverter( diff --git a/Build/source/libs/teckit/TLPATCHES/patch-05-static b/Build/source/libs/teckit/TLPATCHES/patch-05-static deleted file mode 100644 index 00d0d2eccc2..00000000000 --- a/Build/source/libs/teckit/TLPATCHES/patch-05-static +++ /dev/null @@ -1,44 +0,0 @@ - For TeX Live we build a static library and not a Dll. - -diff -ur teckit-2.5.6.orig/source/Engine.cpp teckit-2.5.6/source/Engine.cpp ---- teckit-2.5.6.orig/source/Engine.cpp Tue May 31 05:37:08 2016 -+++ teckit-2.5.6/source/Engine.cpp Fri Dec 30 18:18:57 2016 -@@ -51,12 +51,6 @@ - # define NOSERVICE - # define NOMCX - # include -- -- BOOL WINAPI -- DllMain(HINSTANCE /*hInst*/, DWORD /*wDataSeg*/, LPVOID /*lpReserved*/) -- { -- return true; -- } - #endif - - #include "Engine.h" -diff -ur teckit-2.5.6.orig/source/Public-headers/TECkit_Compiler.h teckit-2.5.6/source/Public-headers/TECkit_Compiler.h ---- teckit-2.5.6.orig/source/Public-headers/TECkit_Compiler.h Tue May 31 05:37:08 2016 -+++ teckit-2.5.6/source/Public-headers/TECkit_Compiler.h Fri Dec 30 18:21:02 2016 -@@ -30,6 +30,9 @@ - #ifdef _WIN32 - /* MS compiler has predefined _WIN32, so assume Windows target */ - #include // apparently just using windef.h fails on VC++6 -+#undef WINAPI -+#define WINAPI -+#define EXPORTED - #else - /* not the MS compiler, so try Metrowerks' platform macros */ - #ifndef __APPLE__ -diff -ur teckit-2.5.6.orig/source/Public-headers/TECkit_Engine.h teckit-2.5.6/source/Public-headers/TECkit_Engine.h ---- teckit-2.5.6.orig/source/Public-headers/TECkit_Engine.h Tue May 31 05:37:08 2016 -+++ teckit-2.5.6/source/Public-headers/TECkit_Engine.h Fri Dec 30 18:22:04 2016 -@@ -80,6 +80,9 @@ - #ifdef _WIN32 - /* MS compiler has predefined _WIN32, so assume Windows target */ - #include -+#undef WINAPI -+#define WINAPI -+#define EXPORTED - #else - /* not the MS compiler, so try Metrowerks' platform macros */ - #ifndef __APPLE__ diff --git a/Build/source/libs/teckit/TLPATCHES/patch-06-dont-build-sfconv b/Build/source/libs/teckit/TLPATCHES/patch-06-dont-build-sfconv deleted file mode 100644 index 77324d5145a..00000000000 --- a/Build/source/libs/teckit/TLPATCHES/patch-06-dont-build-sfconv +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/Build/source/libs/teckit/TECkit-src/bin/Makefile.am b/Build/source/libs/teckit/TECkit-src/bin/Makefile.am -index 2337f1d851d..1edc61627bd 100644 ---- TECkit-src/bin/Makefile.am -+++ TECkit-src/bin/Makefile.am -@@ -1,6 +1,6 @@ - AUTOMAKE_OPTIONS = -Wno-portability - --bin_PROGRAMS = teckit_compile txtconv sfconv -+bin_PROGRAMS = teckit_compile txtconv - - AM_CPPFLAGS = -I$(top_srcdir)/source/Public-headers - diff --git a/Build/source/libs/teckit/TLpatches/ChangeLog b/Build/source/libs/teckit/TLpatches/ChangeLog new file mode 100644 index 00000000000..4ae1093d856 --- /dev/null +++ b/Build/source/libs/teckit/TLpatches/ChangeLog @@ -0,0 +1,79 @@ +2017-01-11 Norbert Preining + + Remove SFconv directory, contains non-free ConvertUTF.{c,h} + Add patch patch-06-dont-build-sfconv to not build sfconv. + +2016-12-30 Akira Kakuto + + Imported TECkit-2.5.6 source tree (teckit) from + https://github.com/silnrsi/teckit/archive/2.5.6.tar.gz. + patch-02-warning, patch-03-warnings, patch-04-pragmas, and + patch-05-static: Adapted. + +2014-07-18 Peter Breitenlohner + + Imported TECkit-2.5.4 source tree (teckit) from + http://scripts.sil.org/svn-public/teckit/TRUNK + (svn r139 2014-07-09 14:47:39 UTC). + + * patch-06-backport-r119 (removed): Now in source tree. + * patch-02-warning, patch-03-warnings, patch-04-pragmas, + patch-05-static: Adapted. + +2014-06-28 Peter Breitenlohner + + * patch-06-static_cast (removed): Replaced by ... + * patch-06-backport-r119 (new): ... Backport upstream changes: + svn r117: Update test runner for compatibility with newer + versions of perl + svn r118: Update Normalization test data for 6.0.0 + svn r119: Fix data-narrowing bug + +2014-06-23 Peter Breitenlohner + + * patch-06-static_cast (new): Add static_cast required by C++11. + +2012-10-13 Peter Breitenlohner + + Avoid TL vs W32TeX diffs (from Akira). + * patch-04-pragmas (new): Remove '#pragma's. + * patch-05-static (new): Build a static library and not a Dll. + +2012-03-17 Peter Breitenlohner + + Imported TECkit-2.5.3 source tree (teckit) from + http://scripts.sil.org/svn-public/teckit/TRUNK + (svn r116 2011-05-12 18:24:47 UTC). + + * patch-01-debian-505693, patch-04-case-sensitive (removed): + Now in source tree. + * patch-02-warning, patch-03-warnings: Adapted. + +2010-02-19 Peter Breitenlohner + + * patch-04-case-sensitive (new): #include instead + of for, e.g., Linux => MinGW32 cross compilation. + +2009-10-18 Peter Breitenlohner + + Reconstruct TL TECkit sources from distributed tarball. + * TL-changes (new): Modifications applied to the distribution. + * patch-[0-9][0-9]-*: Patches applied to the distribution. + +2009-10-01 Peter Breitenlohner + + * patch-03-warnings (new): Avoid maximal compiler warnings. + source/Sample-tools/TECkit_Compile.cpp, source/Engine.{cpp,h}, + source/Public-headers/TECkit_Compiler.h, source/Compiler.cpp: + Constify. + +2009-06-25 Peter Breitenlohner + + * patch-02-warning (new): Avoid compiler warning. + source/Compiler.h: change type of Compiler::Pass.passType + long -> UInt32. + +2008-11-17 Jonathan Kew + + * patch-01-debian-505693 (new): Bug fix. + diff --git a/Build/source/libs/teckit/TLpatches/TL-Changes b/Build/source/libs/teckit/TLpatches/TL-Changes new file mode 100644 index 00000000000..fd47be354c5 --- /dev/null +++ b/Build/source/libs/teckit/TLpatches/TL-Changes @@ -0,0 +1,34 @@ +Changes applied to the TECkit-2.5.6/ tree obtained from: + https://github.com/silnrsi/teckit/archive/2.5.6.tar.gz. + +Removed execute permissions from: + installed-top.pc.in + teckit.pc.in + uninstalled-top.pc.in + +Removed: + .gitignore + SFconv/ + TECkit.mcp + build-mac-binaries.sh + build-linux-package.sh + build-windows-binaries.sh + debian-src/ + mac-installer/ + perl_binaries/ + source/teckitjni/ + zlib-1.2.3/ + +Converted Dos/Win line ends to native: + source/Perl/TECkit.xs + source/Perl/lib/Encode/TECkit.pm + source/Perl/test.pl + source/Perl/typemap + test/GNT-map.xml + test/ISO-8859-1.map + test/Mrk-GNT.sf + test/mrk.sf.legacy.txt.orig + +Added newline at end of file: + source/Carbon.r + diff --git a/Build/source/libs/teckit/TLpatches/patch-02-warning b/Build/source/libs/teckit/TLpatches/patch-02-warning new file mode 100644 index 00000000000..35f6c621c84 --- /dev/null +++ b/Build/source/libs/teckit/TLpatches/patch-02-warning @@ -0,0 +1,14 @@ + Avoid compiler warning. + +diff -ur teckit-2.5.6.orig/source/Compiler.h teckit-2.5.6/source/Compiler.h +--- teckit-2.5.6.orig/source/Compiler.h Tue May 31 05:37:08 2016 ++++ teckit-2.5.6/source/Compiler.h Fri Dec 30 18:01:51 2016 +@@ -230,7 +230,7 @@ + vector byteClassLines; + vector uniClassLines; + +- long passType; ++ UInt32 passType; + UInt32 uniDefault; + UInt8 byteDefault; + bool supplementaryChars; diff --git a/Build/source/libs/teckit/TLpatches/patch-03-warnings b/Build/source/libs/teckit/TLpatches/patch-03-warnings new file mode 100644 index 00000000000..d88f8282eb1 --- /dev/null +++ b/Build/source/libs/teckit/TLpatches/patch-03-warnings @@ -0,0 +1,104 @@ + Avoid more compiler warnings. + +diff -ur teckit-2.5.6.orig/source/Compiler.cpp teckit-2.5.6/source/Compiler.cpp +--- teckit-2.5.6.orig/source/Compiler.cpp Tue May 31 05:37:08 2016 ++++ teckit-2.5.6/source/Compiler.cpp Fri Dec 30 18:04:55 2016 +@@ -189,14 +189,14 @@ + free(table); + } + +-char* ++const char* + WINAPI + TECkit_GetUnicodeName(UInt32 usv) + { + const CharName *c = &gUnicodeNames[0]; + while (c->name != 0) + if (c->usv == usv) +- return (char*)c->name; ++ return c->name; + else + ++c; + return NULL; +@@ -2133,7 +2133,7 @@ + cout << " at line " << line << endl; + } + else +- (*errorFunction)(errFuncUserData, (char*)msg, (char*)s, line); ++ (*errorFunction)(errFuncUserData, msg, s, line); + errorState = true; + ++errorCount; + } +diff -ur teckit-2.5.6.orig/source/Engine.cpp teckit-2.5.6/source/Engine.cpp +--- teckit-2.5.6.orig/source/Engine.cpp Tue May 31 05:37:08 2016 ++++ teckit-2.5.6/source/Engine.cpp Fri Dec 30 18:18:57 2016 +@@ -1093,7 +1075,7 @@ + if (matchElems == 0 && allowInsertion == false) + continue; + patternLength = matchElems + READ(rule->postLength); +- pattern = (MatchElem*)(rule + 1); // point past the defined struct for the rule header ++ pattern = (const MatchElem*)(rule + 1); // point past the defined struct for the rule header + direction = 1; + infoLimit = matchElems; + +@@ -2194,7 +2168,7 @@ + status = kStatus_BadMappingVersion; + else { + const Byte* namePtr; +- if (getNamePtrFromTable((Byte*)fh, nameID, namePtr, *nameLength)) { ++ if (getNamePtrFromTable((const Byte*)fh, nameID, namePtr, *nameLength)) { + UInt16 copyBytes = *nameLength < bufferSize ? *nameLength : bufferSize; + if (copyBytes > 0) + memcpy(nameBuffer, namePtr, copyBytes); +diff -ur teckit-2.5.6.orig/source/Engine.h teckit-2.5.6/source/Engine.h +--- teckit-2.5.6.orig/source/Engine.h Tue May 31 05:37:08 2016 ++++ teckit-2.5.6/source/Engine.h Fri Dec 30 18:09:51 2016 +@@ -117,7 +117,7 @@ + + UInt32 match(int index, int repeats, int textLoc); + // returns 0 for no match, 1 for match, or kNeedMoreInput/kInvalidChar +- MatchElem* pattern; ++ const MatchElem* pattern; + int patternLength; + int direction; + MatchInfo info[256]; +diff -ur teckit-2.5.6.orig/source/Public-headers/TECkit_Compiler.h teckit-2.5.6/source/Public-headers/TECkit_Compiler.h +--- teckit-2.5.6.orig/source/Public-headers/TECkit_Compiler.h Tue May 31 05:37:08 2016 ++++ teckit-2.5.6/source/Public-headers/TECkit_Compiler.h Fri Dec 30 18:21:02 2016 +@@ -56,7 +59,7 @@ + #define kCompilerOpts_Compress 0x00000010 /* generate compressed mapping table */ + #define kCompilerOpts_XML 0x00000020 /* instead of a compiled binary table, generate an XML representation of the mapping */ + +-typedef void (CALLBACK *TECkit_ErrorFn)(void* userData, char* msg, char* param, UInt32 line); ++typedef void (CALLBACK *TECkit_ErrorFn)(void* userData, const char* msg, const char* param, UInt32 line); + + TECkit_Status + WINAPI EXPORTED +@@ -75,7 +78,7 @@ + TECkit_GetCompilerVersion(); + + /* new APIs for looking up Unicode names (as NUL-terminated C strings) */ +-char* ++const char* + WINAPI EXPORTED + TECkit_GetUnicodeName(UInt32 usv); + /* returns the Unicode name of usv, if available, else NULL */ +diff -ur teckit-2.5.6.orig/source/Sample-tools/TECkit_Compile.cpp teckit-2.5.6/source/Sample-tools/TECkit_Compile.cpp +--- teckit-2.5.6.orig/source/Sample-tools/TECkit_Compile.cpp Tue May 31 05:37:08 2016 ++++ teckit-2.5.6/source/Sample-tools/TECkit_Compile.cpp Fri Dec 30 18:14:53 2016 +@@ -24,13 +24,13 @@ + #endif + + extern "C" { +- static void CALLBACK errFunc(void* userData, char* msg, char* param, UInt32 line); ++ static void CALLBACK errFunc(void* userData, const char* msg, const char* param, UInt32 line); + }; + + static + void + CALLBACK +-errFunc(void* /*userData*/, char* msg, char* param, UInt32 line) ++errFunc(void* /*userData*/, const char* msg, const char* param, UInt32 line) + { + fprintf(stderr, "%s", msg); + if (param != 0) diff --git a/Build/source/libs/teckit/TLpatches/patch-04-pragmas b/Build/source/libs/teckit/TLpatches/patch-04-pragmas new file mode 100644 index 00000000000..171a2aec59f --- /dev/null +++ b/Build/source/libs/teckit/TLpatches/patch-04-pragmas @@ -0,0 +1,61 @@ + Remove the '#pragma's, they seem to cause problems for MSVC + and are certainly not needed otherwise. + +diff -ur teckit-2.5.6.orig/source/Engine.cpp teckit-2.5.6/source/Engine.cpp +--- teckit-2.5.6.orig/source/Engine.cpp Tue May 31 05:37:08 2016 ++++ teckit-2.5.6/source/Engine.cpp Fri Dec 30 18:18:57 2016 +@@ -102,10 +96,6 @@ + #endif + } + +-#ifndef __GNUC__ +-#pragma mark --- class Stage --- +-#endif +- + Stage::Stage() + : oBuffer(0) + , oBufSize(0) +@@ -127,10 +117,6 @@ + return 0; + } + +-#ifndef __GNUC__ +-#pragma mark --- class Normalizer --- +-#endif +- + #include "NormalizationData.c" + + Normalizer::Normalizer(bool compose) +@@ -400,10 +386,6 @@ + return c; + } + +-#ifndef __GNUC__ +-#pragma mark --- class Pass --- +-#endif +- + Pass::Pass(const TableHeader* inTable, Converter* cnv) + : converter(cnv) + , tableHeader(inTable) +@@ -1288,10 +1270,6 @@ + return 0; + } + +-#ifndef __GNUC__ +-#pragma mark --- class Converter --- +-#endif +- + Converter::Converter(const Byte* inTable, UInt32 inTableSize, bool inForward, + UInt16 inForm, UInt16 outForm) + : table(0) +@@ -1942,10 +1920,6 @@ + return true; + } + +-#ifndef __GNUC__ +-#pragma mark --- Public "C" API functions --- +-#endif +- + TECkit_Status + WINAPI + TECkit_CreateConverter( diff --git a/Build/source/libs/teckit/TLpatches/patch-05-static b/Build/source/libs/teckit/TLpatches/patch-05-static new file mode 100644 index 00000000000..00d0d2eccc2 --- /dev/null +++ b/Build/source/libs/teckit/TLpatches/patch-05-static @@ -0,0 +1,44 @@ + For TeX Live we build a static library and not a Dll. + +diff -ur teckit-2.5.6.orig/source/Engine.cpp teckit-2.5.6/source/Engine.cpp +--- teckit-2.5.6.orig/source/Engine.cpp Tue May 31 05:37:08 2016 ++++ teckit-2.5.6/source/Engine.cpp Fri Dec 30 18:18:57 2016 +@@ -51,12 +51,6 @@ + # define NOSERVICE + # define NOMCX + # include +- +- BOOL WINAPI +- DllMain(HINSTANCE /*hInst*/, DWORD /*wDataSeg*/, LPVOID /*lpReserved*/) +- { +- return true; +- } + #endif + + #include "Engine.h" +diff -ur teckit-2.5.6.orig/source/Public-headers/TECkit_Compiler.h teckit-2.5.6/source/Public-headers/TECkit_Compiler.h +--- teckit-2.5.6.orig/source/Public-headers/TECkit_Compiler.h Tue May 31 05:37:08 2016 ++++ teckit-2.5.6/source/Public-headers/TECkit_Compiler.h Fri Dec 30 18:21:02 2016 +@@ -30,6 +30,9 @@ + #ifdef _WIN32 + /* MS compiler has predefined _WIN32, so assume Windows target */ + #include // apparently just using windef.h fails on VC++6 ++#undef WINAPI ++#define WINAPI ++#define EXPORTED + #else + /* not the MS compiler, so try Metrowerks' platform macros */ + #ifndef __APPLE__ +diff -ur teckit-2.5.6.orig/source/Public-headers/TECkit_Engine.h teckit-2.5.6/source/Public-headers/TECkit_Engine.h +--- teckit-2.5.6.orig/source/Public-headers/TECkit_Engine.h Tue May 31 05:37:08 2016 ++++ teckit-2.5.6/source/Public-headers/TECkit_Engine.h Fri Dec 30 18:22:04 2016 +@@ -80,6 +80,9 @@ + #ifdef _WIN32 + /* MS compiler has predefined _WIN32, so assume Windows target */ + #include ++#undef WINAPI ++#define WINAPI ++#define EXPORTED + #else + /* not the MS compiler, so try Metrowerks' platform macros */ + #ifndef __APPLE__ diff --git a/Build/source/libs/teckit/TLpatches/patch-06-dont-build-sfconv b/Build/source/libs/teckit/TLpatches/patch-06-dont-build-sfconv new file mode 100644 index 00000000000..77324d5145a --- /dev/null +++ b/Build/source/libs/teckit/TLpatches/patch-06-dont-build-sfconv @@ -0,0 +1,12 @@ +diff --git a/Build/source/libs/teckit/TECkit-src/bin/Makefile.am b/Build/source/libs/teckit/TECkit-src/bin/Makefile.am +index 2337f1d851d..1edc61627bd 100644 +--- TECkit-src/bin/Makefile.am ++++ TECkit-src/bin/Makefile.am +@@ -1,6 +1,6 @@ + AUTOMAKE_OPTIONS = -Wno-portability + +-bin_PROGRAMS = teckit_compile txtconv sfconv ++bin_PROGRAMS = teckit_compile txtconv + + AM_CPPFLAGS = -I$(top_srcdir)/source/Public-headers + -- cgit v1.2.3