texlive[55039] Build/source/libs/teckit/TLpatches: teckit 2.5.10
commits+kakuto at tug.org
commits+kakuto at tug.org
Wed May 6 07:51:40 CEST 2020
Revision: 55039
http://tug.org/svn/texlive?view=revision&revision=55039
Author: kakuto
Date: 2020-05-06 07:51:40 +0200 (Wed, 06 May 2020)
Log Message:
-----------
teckit 2.5.10
Modified Paths:
--------------
trunk/Build/source/libs/teckit/TLpatches/ChangeLog
Added Paths:
-----------
trunk/Build/source/libs/teckit/TLpatches/patch-07-warnings-and-static
Removed Paths:
-------------
trunk/Build/source/libs/teckit/TLpatches/patch-02-warning
trunk/Build/source/libs/teckit/TLpatches/patch-03-warnings
trunk/Build/source/libs/teckit/TLpatches/patch-05-static
Modified: trunk/Build/source/libs/teckit/TLpatches/ChangeLog
===================================================================
--- trunk/Build/source/libs/teckit/TLpatches/ChangeLog 2020-05-06 00:45:53 UTC (rev 55038)
+++ trunk/Build/source/libs/teckit/TLpatches/ChangeLog 2020-05-06 05:51:40 UTC (rev 55039)
@@ -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 at w32tex.org>
Deleted: trunk/Build/source/libs/teckit/TLpatches/patch-02-warning
===================================================================
--- trunk/Build/source/libs/teckit/TLpatches/patch-02-warning 2020-05-06 00:45:53 UTC (rev 55038)
+++ trunk/Build/source/libs/teckit/TLpatches/patch-02-warning 2020-05-06 05:51:40 UTC (rev 55039)
@@ -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;
Deleted: trunk/Build/source/libs/teckit/TLpatches/patch-03-warnings
===================================================================
--- trunk/Build/source/libs/teckit/TLpatches/patch-03-warnings 2020-05-06 00:45:53 UTC (rev 55038)
+++ trunk/Build/source/libs/teckit/TLpatches/patch-03-warnings 2020-05-06 05:51:40 UTC (rev 55039)
@@ -1,89 +0,0 @@
-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);
- }
-
--char*
-+const char*
- 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();
-
- /* 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 */
-@@ -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
-
- 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)
Deleted: trunk/Build/source/libs/teckit/TLpatches/patch-05-static
===================================================================
--- trunk/Build/source/libs/teckit/TLpatches/patch-05-static 2020-05-06 00:45:53 UTC (rev 55038)
+++ trunk/Build/source/libs/teckit/TLpatches/patch-05-static 2020-05-06 05:51:40 UTC (rev 55039)
@@ -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__
Added: trunk/Build/source/libs/teckit/TLpatches/patch-07-warnings-and-static
===================================================================
--- trunk/Build/source/libs/teckit/TLpatches/patch-07-warnings-and-static (rev 0)
+++ trunk/Build/source/libs/teckit/TLpatches/patch-07-warnings-and-static 2020-05-06 05:51:40 UTC (rev 55039)
@@ -0,0 +1,103 @@
+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:34 2020
+@@ -189,7 +189,7 @@
+ free(table);
+ }
+
+-char*
++const char*
+ WINAPI
+ TECkit_GetUnicodeName(UInt32 usv)
+ {
+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;
+
+- 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
+
+ #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 */
+
+-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/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:22 2020
+@@ -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)
More information about the tex-live-commits
mailing list.