diff options
Diffstat (limited to 'Build/source/libs/teckit/TLpatches')
7 files changed, 44 insertions, 149 deletions
diff --git a/Build/source/libs/teckit/TLpatches/ChangeLog b/Build/source/libs/teckit/TLpatches/ChangeLog index 2eb695c78c0..d58bfa90ab3 100644 --- a/Build/source/libs/teckit/TLpatches/ChangeLog +++ b/Build/source/libs/teckit/TLpatches/ChangeLog @@ -1,11 +1,19 @@ -2018-07-24 Akira Kakuto <kakuto@.fuk.kindai.ac.jp> +2019-05-03 Akira Kakuto <kakuto@w32tex.org> + + Imported TECkit-2.5.9 source tree (teckit) from + https://github.com/silnrsi/teckit/archive/2.5.9.tar.gz. + patch-02-warning, patch-03-warnings,patch-05-static, and + patch patch-06-dont-build-sfconv: Adapted. + patch-04-pragmas: Removed. + +2018-07-24 Akira Kakuto <kakuto@fuk.kindai.ac.jp> Imported TECkit-2.5.8 source tree (teckit) from https://github.com/silnrsi/teckit/archive/2.5.8.tar.gz. patch-02-warning, patch-03-warnings, patch-04-pragmas, patch-05-static, and patch patch-06-dont-build-sfconv: Adapted. -2017-06-27 Akira Kakuto <kakuto@.fuk.kindai.ac.jp> +2017-06-27 Akira Kakuto <kakuto@fuk.kindai.ac.jp> Imported TECkit-2.5.7 source tree (teckit) from https://github.com/silnrsi/teckit/archive/2.5.7.tar.gz. @@ -17,7 +25,7 @@ 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 <kakuto@.fuk.kindai.ac.jp> +2016-12-30 Akira Kakuto <kakuto@fuk.kindai.ac.jp> Imported TECkit-2.5.6 source tree (teckit) from https://github.com/silnrsi/teckit/archive/2.5.6.tar.gz. diff --git a/Build/source/libs/teckit/TLpatches/TL-Changes b/Build/source/libs/teckit/TLpatches/TL-Changes index 9667ecd4855..f32d8f7e967 100644 --- a/Build/source/libs/teckit/TLpatches/TL-Changes +++ b/Build/source/libs/teckit/TLpatches/TL-Changes @@ -1,5 +1,5 @@ -Changes applied to the TECkit-2.5.8/ tree obtained from: - https://github.com/silnrsi/teckit/archive/2.5.8.tar.gz. +Changes applied to the TECkit-2.5.9/ tree obtained from: + https://github.com/silnrsi/teckit/archive/2.5.9.tar.gz. Removed execute permissions from: installed-top.pc.in diff --git a/Build/source/libs/teckit/TLpatches/patch-02-warning b/Build/source/libs/teckit/TLpatches/patch-02-warning index 05b1fe17a49..8914f63c202 100644 --- a/Build/source/libs/teckit/TLpatches/patch-02-warning +++ b/Build/source/libs/teckit/TLpatches/patch-02-warning @@ -1,9 +1,9 @@ Avoid compiler warning. -diff -ur teckit-2.5.8/source/Compiler.h teckit-src/source/Compiler.h ---- teckit-2.5.8/source/Compiler.h Tue Dec 05 07:20:20 2017 -+++ teckit-src/source/Compiler.h Tue Jul 24 07:21:23 2018 -@@ -230,7 +230,7 @@ +diff -ur teckit-2.5.9/source/Compiler.h teckit-src/source/Compiler.h +--- teckit-2.5.9/source/Compiler.h Tue Mar 19 00:23:12 2019 ++++ teckit-src/source/Compiler.h Tue Mar 19 07:02:47 2019 +@@ -229,7 +229,7 @@ vector<UInt32> byteClassLines; vector<UInt32> uniClassLines; diff --git a/Build/source/libs/teckit/TLpatches/patch-03-warnings b/Build/source/libs/teckit/TLpatches/patch-03-warnings index 011670adda3..eb36b57ca5b 100644 --- a/Build/source/libs/teckit/TLpatches/patch-03-warnings +++ b/Build/source/libs/teckit/TLpatches/patch-03-warnings @@ -1,9 +1,9 @@ Avoid more compiler warnings. -diff -ur teckit-2.5.8/source/Compiler.cpp teckit-src/source/Compiler.cpp ---- teckit-2.5.8/source/Compiler.cpp Tue Dec 05 07:20:20 2017 -+++ teckit-src/source/Compiler.cpp Tue Jul 24 07:23:53 2018 -@@ -189,14 +189,14 @@ +diff -ur teckit-2.5.9/source/Compiler.cpp teckit-src/source/Compiler.cpp +--- teckit-2.5.9/source/Compiler.cpp Tue Mar 19 00:23:12 2019 ++++ teckit-src/source/Compiler.cpp Tue Mar 19 07:06:23 2019 +@@ -189,7 +189,7 @@ free(table); } @@ -12,63 +12,11 @@ diff -ur teckit-2.5.8/source/Compiler.cpp teckit-src/source/Compiler.cpp 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.8/source/Engine.cpp teckit-src/source/Engine.cpp ---- teckit-2.5.8/source/Engine.cpp Tue Dec 05 07:20:20 2017 -+++ teckit-src/source/Engine.cpp Tue Jul 24 07:39:17 2018 -@@ -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.8/source/Engine.h teckit-src/source/Engine.h ---- teckit-2.5.8/source/Engine.h Tue Dec 05 07:20:20 2017 -+++ teckit-src/source/Engine.h Tue Jul 24 07:29:14 2018 -@@ -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.8/source/Public-headers/TECkit_Compiler.h teckit-src/source/Public-headers/TECkit_Compiler.h ---- teckit-2.5.8/source/Public-headers/TECkit_Compiler.h Tue Dec 05 07:20:20 2017 -+++ teckit-src/source/Public-headers/TECkit_Compiler.h Tue Jul 24 07:41:00 2018 -@@ -56,7 +59,7 @@ +diff -ur teckit-2.5.9/source/Public-headers/TECkit_Compiler.h teckit-src/source/Public-headers/TECkit_Compiler.h +--- teckit-2.5.9/source/Public-headers/TECkit_Compiler.h Tue Mar 19 00:23:12 2019 ++++ teckit-src/source/Public-headers/TECkit_Compiler.h Tue Mar 19 07:31:10 2019 +@@ -55,7 +58,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 */ @@ -77,7 +25,7 @@ diff -ur teckit-2.5.8/source/Public-headers/TECkit_Compiler.h teckit-src/source/ TECkit_Status WINAPI EXPORTED -@@ -75,7 +78,7 @@ +@@ -74,7 +77,7 @@ TECkit_GetCompilerVersion(); /* new APIs for looking up Unicode names (as NUL-terminated C strings) */ @@ -87,10 +35,9 @@ diff -ur teckit-2.5.8/source/Public-headers/TECkit_Compiler.h teckit-src/source/ TECkit_GetUnicodeName(UInt32 usv); /* returns the Unicode name of usv, if available, else NULL */ - -diff -ur teckit-2.5.8/source/Sample-tools/TECkit_Compile.cpp teckit-src/source/Sample-tools/TECkit_Compile.cpp ---- teckit-2.5.8/source/Sample-tools/TECkit_Compile.cpp Tue Dec 05 07:20:20 2017 -+++ teckit-src/source/Sample-tools/TECkit_Compile.cpp Tue Jul 24 07:34:18 2018 +diff -ur teckit-2.5.9/source/Sample-tools/TECkit_Compile.cpp teckit-src/source/Sample-tools/TECkit_Compile.cpp +--- teckit-2.5.9/source/Sample-tools/TECkit_Compile.cpp Tue Mar 19 00:23:12 2019 ++++ teckit-src/source/Sample-tools/TECkit_Compile.cpp Tue Mar 19 07:25:19 2019 @@ -24,13 +24,13 @@ #endif 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 601f3976e99..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.8/source/Engine.cpp teckit-src/source/Engine.cpp ---- teckit-2.5.8/source/Engine.cpp Tue Dec 05 07:20:20 2017 -+++ teckit-src/source/Engine.cpp Tue Jul 24 07:39:17 2018 -@@ -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 index e3a646c5669..1cdb0770244 100644 --- a/Build/source/libs/teckit/TLpatches/patch-05-static +++ b/Build/source/libs/teckit/TLpatches/patch-05-static @@ -1,9 +1,9 @@ For TeX Live we build a static library and not a Dll. -diff -ur teckit-2.5.8/source/Engine.cpp teckit-src/source/Engine.cpp ---- teckit-2.5.8/source/Engine.cpp Tue Dec 05 07:20:20 2017 -+++ teckit-src/source/Engine.cpp Tue Jul 24 07:39:17 2018 +diff -ur teckit-2.5.9/source/Engine.cpp teckit-src/source/Engine.cpp +--- teckit-2.5.9/source/Engine.cpp Tue Mar 19 00:23:12 2019 ++++ teckit-src/source/Engine.cpp Tue Mar 19 07:29:37 2019 @@ -51,12 +51,6 @@ # define NOSERVICE # define NOMCX @@ -18,10 +18,10 @@ diff -ur teckit-2.5.8/source/Engine.cpp teckit-src/source/Engine.cpp #include "Engine.h" -diff -ur teckit-2.5.8/source/Public-headers/TECkit_Compiler.h teckit-src/source/Public-headers/TECkit_Compiler.h ---- teckit-2.5.8/source/Public-headers/TECkit_Compiler.h Tue Dec 05 07:20:20 2017 -+++ teckit-src/source/Public-headers/TECkit_Compiler.h Tue Jul 24 07:41:00 2018 -@@ -30,6 +30,9 @@ +diff -ur teckit-2.5.9/source/Public-headers/TECkit_Compiler.h teckit-src/source/Public-headers/TECkit_Compiler.h +--- teckit-2.5.9/source/Public-headers/TECkit_Compiler.h Tue Mar 19 00:23:12 2019 ++++ teckit-src/source/Public-headers/TECkit_Compiler.h Tue Mar 19 07:31:10 2019 +@@ -29,6 +29,9 @@ #ifdef _WIN32 /* MS compiler has predefined _WIN32, so assume Windows target */ #include <windows.h> // apparently just using windef.h fails on VC++6 @@ -32,10 +32,10 @@ diff -ur teckit-2.5.8/source/Public-headers/TECkit_Compiler.h teckit-src/source/ /* not the MS compiler, so try Metrowerks' platform macros */ #ifndef __APPLE__ -diff -ur teckit-2.5.8/source/Public-headers/TECkit_Engine.h teckit-src/source/Public-headers/TECkit_Engine.h ---- teckit-2.5.8/source/Public-headers/TECkit_Engine.h Tue Dec 05 07:20:20 2017 -+++ teckit-src/source/Public-headers/TECkit_Engine.h Tue Jul 24 07:42:14 2018 -@@ -80,6 +80,9 @@ +diff -ur teckit-2.5.9/source/Public-headers/TECkit_Engine.h teckit-src/source/Public-headers/TECkit_Engine.h +--- teckit-2.5.9/source/Public-headers/TECkit_Engine.h Tue Mar 19 00:23:12 2019 ++++ teckit-src/source/Public-headers/TECkit_Engine.h Tue Mar 19 07:32:08 2019 +@@ -79,6 +79,9 @@ #ifdef _WIN32 /* MS compiler has predefined _WIN32, so assume Windows target */ #include <windows.h> diff --git a/Build/source/libs/teckit/TLpatches/patch-06-dont-build-sfconv b/Build/source/libs/teckit/TLpatches/patch-06-dont-build-sfconv index 86288adf28f..7e89efee728 100644 --- a/Build/source/libs/teckit/TLpatches/patch-06-dont-build-sfconv +++ b/Build/source/libs/teckit/TLpatches/patch-06-dont-build-sfconv @@ -1,6 +1,6 @@ -diff -ur teckit-2.5.8/bin/Makefile.am teckit-src/bin/Makefile.am ---- teckit-2.5.8/bin/Makefile.am Tue Dec 05 07:20:20 2017 -+++ teckit-src/bin/Makefile.am Tue Jul 24 07:44:12 2018 +diff -ur teckit-2.5.9/bin/Makefile.am teckit-src/bin/Makefile.am +--- teckit-2.5.9/bin/Makefile.am Tue Mar 19 00:23:12 2019 ++++ teckit-src/bin/Makefile.am Tue Mar 19 07:33:51 2019 @@ -1,6 +1,6 @@ AUTOMAKE_OPTIONS = -Wno-portability @@ -8,3 +8,4 @@ diff -ur teckit-2.5.8/bin/Makefile.am teckit-src/bin/Makefile.am +bin_PROGRAMS = teckit_compile txtconv AM_CPPFLAGS = -I$(top_srcdir)/source/Public-headers + |