diff options
author | Akira Kakuto <kakuto@fuk.kindai.ac.jp> | 2020-05-06 05:51:40 +0000 |
---|---|---|
committer | Akira Kakuto <kakuto@fuk.kindai.ac.jp> | 2020-05-06 05:51:40 +0000 |
commit | eeb1e824bb4b27fbe8b62b23dc8bc614a55df772 (patch) | |
tree | ec3324663884994f8dea2210a15d08084ccd5f85 /Build/source | |
parent | d0e8f7ae13cc3dc0651718b3b29b68497b02df09 (diff) |
teckit 2.5.10
git-svn-id: svn://tug.org/texlive/trunk@55039 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source')
-rw-r--r-- | Build/source/libs/teckit/TLpatches/ChangeLog | 5 | ||||
-rw-r--r-- | Build/source/libs/teckit/TLpatches/patch-02-warning | 12 | ||||
-rw-r--r-- | Build/source/libs/teckit/TLpatches/patch-05-static | 44 | ||||
-rw-r--r-- | Build/source/libs/teckit/TLpatches/patch-07-warnings-and-static (renamed from Build/source/libs/teckit/TLpatches/patch-03-warnings) | 94 |
4 files changed, 57 insertions, 98 deletions
diff --git a/Build/source/libs/teckit/TLpatches/ChangeLog b/Build/source/libs/teckit/TLpatches/ChangeLog index c8d3247811e..9a7ba6153f5 100644 --- a/Build/source/libs/teckit/TLpatches/ChangeLog +++ b/Build/source/libs/teckit/TLpatches/ChangeLog @@ -2,8 +2,9 @@ Imported TECkit-2.5.10 source tree (teckit) from https://github.com/silnrsi/teckit/archive/2.5.10.tar.gz. - patch-02-warning, patch-03-warnings,patch-05-static, and - patch patch-06-dont-build-sfconv: Adapted. + patch-02-warning, patch-03-warnings, patch-05-static: Reduce + to a single patch-07-warnings-and-static for convenience. + patch-06-dont-build-sfconv: Adapted. 2019-05-03 Akira Kakuto <kakuto@w32tex.org> 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 44c5e14266d..00000000000 --- a/Build/source/libs/teckit/TLpatches/patch-02-warning +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur teckit-2.5.10/source/Compiler.h teckit-src/source/Compiler.h ---- teckit-2.5.10/source/Compiler.h Tue May 05 23:09:53 2020 -+++ teckit-src/source/Compiler.h Wed May 06 08:59:39 2020 -@@ -229,7 +229,7 @@ - vector<UInt32> byteClassLines; - vector<UInt32> uniClassLines; - -- long passType; -+ UInt32 passType; - UInt32 uniDefault; - UInt8 byteDefault; - bool supplementaryChars; 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 aab9431fb2b..00000000000 --- a/Build/source/libs/teckit/TLpatches/patch-05-static +++ /dev/null @@ -1,44 +0,0 @@ -diff -ur teckit-2.5.10/source/Engine.cpp teckit-src/source/Engine.cpp ---- teckit-2.5.10/source/Engine.cpp Tue May 05 23:09:53 2020 -+++ teckit-src/source/Engine.cpp Wed May 06 09:06:23 2020 -@@ -51,12 +51,6 @@ - # define NOSERVICE - # define NOMCX - # include <windows.h> -- -- BOOL WINAPI -- DllMain(HINSTANCE /*hInst*/, DWORD /*wDataSeg*/, LPVOID /*lpReserved*/) -- { -- return true; -- } - #endif - - #include "Engine.h" - -diff -ur teckit-2.5.10/source/Public-headers/TECkit_Compiler.h teckit-src/source/Public-headers/TECkit_Compiler.h ---- teckit-2.5.10/source/Public-headers/TECkit_Compiler.h Tue May 05 23:09:53 2020 -+++ teckit-src/source/Public-headers/TECkit_Compiler.h Wed May 06 09:07:39 2020 -@@ -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 -+#undef WINAPI -+#define WINAPI -+#define EXPORTED - #else - /* not the MS compiler, so try Metrowerks' platform macros */ - #ifndef __APPLE__ - -diff -ur teckit-2.5.10/source/Public-headers/TECkit_Engine.h teckit-src/source/Public-headers/TECkit_Engine.h ---- teckit-2.5.10/source/Public-headers/TECkit_Engine.h Tue May 05 23:09:53 2020 -+++ teckit-src/source/Public-headers/TECkit_Engine.h Wed May 06 09:08:33 2020 -@@ -79,6 +79,9 @@ - #ifdef _WIN32 - /* MS compiler has predefined _WIN32, so assume Windows target */ - #include <windows.h> -+#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-03-warnings b/Build/source/libs/teckit/TLpatches/patch-07-warnings-and-static index 01c8c457c8b..12ed8b7ecd1 100644 --- a/Build/source/libs/teckit/TLpatches/patch-03-warnings +++ b/Build/source/libs/teckit/TLpatches/patch-07-warnings-and-static @@ -1,6 +1,6 @@ diff -ur teckit-2.5.10/source/Compiler.cpp teckit-src/source/Compiler.cpp --- teckit-2.5.10/source/Compiler.cpp Tue May 05 23:09:53 2020 -+++ teckit-src/source/Compiler.cpp Wed May 06 09:00:33 2020 ++++ teckit-src/source/Compiler.cpp Wed May 06 09:00:34 2020 @@ -189,7 +189,7 @@ free(table); } @@ -10,46 +10,47 @@ diff -ur teckit-2.5.10/source/Compiler.cpp teckit-src/source/Compiler.cpp WINAPI TECkit_GetUnicodeName(UInt32 usv) { - -diff -ur teckit-2.5.10/source/Public-headers/TECkit_Compiler.h teckit-src/source/Public-headers/TECkit_Compiler.h ---- teckit-2.5.10/source/Public-headers/TECkit_Compiler.h Tue May 05 23:09:53 2020 -+++ teckit-src/source/Public-headers/TECkit_Compiler.h Wed May 06 09:07:39 2020 -@@ -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 */ - --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 -@@ -74,7 +77,7 @@ - TECkit_GetCompilerVersion(); +diff -ur teckit-2.5.10/source/Compiler.h teckit-src/source/Compiler.h +--- teckit-2.5.10/source/Compiler.h Tue May 05 23:09:53 2020 ++++ teckit-src/source/Compiler.h Wed May 06 08:59:40 2020 +@@ -229,7 +229,7 @@ + vector<UInt32> byteClassLines; + vector<UInt32> uniClassLines; - /* 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 */ -@@ -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 */ - --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 -@@ -74,7 +77,7 @@ - TECkit_GetCompilerVersion(); +- long passType; ++ UInt32 passType; + UInt32 uniDefault; + UInt8 byteDefault; + bool supplementaryChars; +diff -ur teckit-2.5.10/source/Engine.cpp teckit-src/source/Engine.cpp +--- teckit-2.5.10/source/Engine.cpp Tue May 05 23:09:53 2020 ++++ teckit-src/source/Engine.cpp Wed May 06 09:06:24 2020 +@@ -51,12 +51,6 @@ + # define NOSERVICE + # define NOMCX + # include <windows.h> +- +- BOOL WINAPI +- DllMain(HINSTANCE /*hInst*/, DWORD /*wDataSeg*/, LPVOID /*lpReserved*/) +- { +- return true; +- } + #endif - /* 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 */ + #include "Engine.h" +diff -ur teckit-2.5.10/source/Public-headers/TECkit_Compiler.h teckit-src/source/Public-headers/TECkit_Compiler.h +--- teckit-2.5.10/source/Public-headers/TECkit_Compiler.h Tue May 05 23:09:53 2020 ++++ teckit-src/source/Public-headers/TECkit_Compiler.h Wed May 06 09:07:40 2020 +@@ -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 ++#undef WINAPI ++#define WINAPI ++#define EXPORTED + #else + /* not the MS compiler, so try Metrowerks' platform macros */ + #ifndef __APPLE__ @@ -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 */ @@ -68,9 +69,22 @@ diff -ur teckit-2.5.10/source/Public-headers/TECkit_Compiler.h teckit-src/source WINAPI EXPORTED TECkit_GetUnicodeName(UInt32 usv); /* returns the Unicode name of usv, if available, else NULL */ +diff -ur teckit-2.5.10/source/Public-headers/TECkit_Engine.h teckit-src/source/Public-headers/TECkit_Engine.h +--- teckit-2.5.10/source/Public-headers/TECkit_Engine.h Tue May 05 23:09:53 2020 ++++ teckit-src/source/Public-headers/TECkit_Engine.h Wed May 06 09:08:34 2020 +@@ -79,6 +79,9 @@ + #ifdef _WIN32 + /* MS compiler has predefined _WIN32, so assume Windows target */ + #include <windows.h> ++#undef WINAPI ++#define WINAPI ++#define EXPORTED + #else + /* not the MS compiler, so try Metrowerks' platform macros */ + #ifndef __APPLE__ diff -ur teckit-2.5.10/source/Sample-tools/TECkit_Compile.cpp teckit-src/source/Sample-tools/TECkit_Compile.cpp --- teckit-2.5.10/source/Sample-tools/TECkit_Compile.cpp Tue May 05 23:09:53 2020 -+++ teckit-src/source/Sample-tools/TECkit_Compile.cpp Wed May 06 09:05:20 2020 ++++ teckit-src/source/Sample-tools/TECkit_Compile.cpp Wed May 06 09:05:22 2020 @@ -24,13 +24,13 @@ #endif |