diff options
Diffstat (limited to 'Build/source/libs/teckit/TLpatches')
6 files changed, 71 insertions, 37 deletions
diff --git a/Build/source/libs/teckit/TLpatches/ChangeLog b/Build/source/libs/teckit/TLpatches/ChangeLog index d58bfa90ab3..c8d3247811e 100644 --- a/Build/source/libs/teckit/TLpatches/ChangeLog +++ b/Build/source/libs/teckit/TLpatches/ChangeLog @@ -1,3 +1,10 @@ +2020-05-06 Akira Kakuto <kakuto@w32tex.org> + + 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. + 2019-05-03 Akira Kakuto <kakuto@w32tex.org> Imported TECkit-2.5.9 source tree (teckit) from diff --git a/Build/source/libs/teckit/TLpatches/TL-Changes b/Build/source/libs/teckit/TLpatches/TL-Changes index f32d8f7e967..4ee3e8d626d 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.9/ tree obtained from: - https://github.com/silnrsi/teckit/archive/2.5.9.tar.gz. +Changes applied to the TECkit-2.5.10/ tree obtained from: + https://github.com/silnrsi/teckit/archive/2.5.10.tar.gz. Removed execute permissions from: installed-top.pc.in @@ -23,9 +23,9 @@ Removed: test/Makefile.in test-driver SFconv/ - zlib-1.2.3/ + zlib-1.2.11/ -Converted Dos/Win line ends to native: +Converted Dos/Win lpwdine ends to native: source/Perl/TECkit.xs source/Perl/lib/Encode/TECkit.pm source/Perl/test.pl diff --git a/Build/source/libs/teckit/TLpatches/patch-02-warning b/Build/source/libs/teckit/TLpatches/patch-02-warning index 8914f63c202..44c5e14266d 100644 --- a/Build/source/libs/teckit/TLpatches/patch-02-warning +++ b/Build/source/libs/teckit/TLpatches/patch-02-warning @@ -1,8 +1,6 @@ - Avoid compiler warning. - -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 +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; diff --git a/Build/source/libs/teckit/TLpatches/patch-03-warnings b/Build/source/libs/teckit/TLpatches/patch-03-warnings index eb36b57ca5b..01c8c457c8b 100644 --- a/Build/source/libs/teckit/TLpatches/patch-03-warnings +++ b/Build/source/libs/teckit/TLpatches/patch-03-warnings @@ -1,8 +1,6 @@ - Avoid more compiler warnings. - -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 +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 @@ -189,7 +189,7 @@ free(table); } @@ -13,9 +11,9 @@ diff -ur teckit-2.5.9/source/Compiler.cpp teckit-src/source/Compiler.cpp TECkit_GetUnicodeName(UInt32 usv) { -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 +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 */ @@ -34,10 +32,45 @@ diff -ur teckit-2.5.9/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.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 +@@ -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(); + + /* 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(); + + /* 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.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 @@ -24,13 +24,13 @@ #endif diff --git a/Build/source/libs/teckit/TLpatches/patch-05-static b/Build/source/libs/teckit/TLpatches/patch-05-static index 1cdb0770244..aab9431fb2b 100644 --- a/Build/source/libs/teckit/TLpatches/patch-05-static +++ b/Build/source/libs/teckit/TLpatches/patch-05-static @@ -1,9 +1,6 @@ - For TeX Live we build a static library and not a Dll. - - -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 +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 @@ -18,9 +15,9 @@ diff -ur teckit-2.5.9/source/Engine.cpp teckit-src/source/Engine.cpp #include "Engine.h" -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 +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 */ @@ -32,9 +29,9 @@ diff -ur teckit-2.5.9/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.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 +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 */ 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 7e89efee728..15885f3815e 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.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 +diff -ur teckit-2.5.10/bin/Makefile.am teckit-src/bin/Makefile.am +--- teckit-2.5.10/bin/Makefile.am Tue May 05 23:09:53 2020 ++++ teckit-src/bin/Makefile.am Wed May 06 09:09:23 2020 @@ -1,6 +1,6 @@ AUTOMAKE_OPTIONS = -Wno-portability @@ -8,4 +8,3 @@ diff -ur teckit-2.5.9/bin/Makefile.am teckit-src/bin/Makefile.am +bin_PROGRAMS = teckit_compile txtconv AM_CPPFLAGS = -I$(top_srcdir)/source/Public-headers - |