sync patches with TL
Norbert Preining
3 years ago
0 | 2018-07-24 Akira Kakuto <kakuto@.fuk.kindai.ac.jp> | |
0 | 2020-05-06 Akira Kakuto <kakuto@w32tex.org> | |
1 | ||
2 | Imported TECkit-2.5.10 source tree (teckit) from | |
3 | https://github.com/silnrsi/teckit/archive/2.5.10.tar.gz. | |
4 | patch-02-warning, patch-03-warnings, patch-05-static: Reduce | |
5 | to a single patch-07-warnings-and-static for convenience. | |
6 | patch-06-dont-build-sfconv: Adapted. | |
7 | ||
8 | 2019-05-03 Akira Kakuto <kakuto@w32tex.org> | |
9 | ||
10 | Imported TECkit-2.5.9 source tree (teckit) from | |
11 | https://github.com/silnrsi/teckit/archive/2.5.9.tar.gz. | |
12 | patch-02-warning, patch-03-warnings,patch-05-static, and | |
13 | patch-06-dont-build-sfconv: Adapted. | |
14 | patch-04-pragmas: Removed. | |
15 | ||
16 | 2018-07-24 Akira Kakuto <kakuto@fuk.kindai.ac.jp> | |
1 | 17 | |
2 | 18 | Imported TECkit-2.5.8 source tree (teckit) from |
3 | 19 | https://github.com/silnrsi/teckit/archive/2.5.8.tar.gz. |
4 | 20 | patch-02-warning, patch-03-warnings, patch-04-pragmas, |
5 | 21 | patch-05-static, and patch patch-06-dont-build-sfconv: Adapted. |
6 | 22 | |
7 | 2017-06-27 Akira Kakuto <kakuto@.fuk.kindai.ac.jp> | |
23 | 2017-06-27 Akira Kakuto <kakuto@fuk.kindai.ac.jp> | |
8 | 24 | |
9 | 25 | Imported TECkit-2.5.7 source tree (teckit) from |
10 | 26 | https://github.com/silnrsi/teckit/archive/2.5.7.tar.gz. |
16 | 32 | Remove SFconv directory, contains non-free ConvertUTF.{c,h} |
17 | 33 | Add patch patch-06-dont-build-sfconv to not build sfconv. |
18 | 34 | |
19 | 2016-12-30 Akira Kakuto <kakuto@.fuk.kindai.ac.jp> | |
35 | 2016-12-30 Akira Kakuto <kakuto@fuk.kindai.ac.jp> | |
20 | 36 | |
21 | 37 | Imported TECkit-2.5.6 source tree (teckit) from |
22 | 38 | https://github.com/silnrsi/teckit/archive/2.5.6.tar.gz. |
1 | 1 | |
2 | 2 | texlive-bin-2018.20180907.48586/libs/teckit/TLpatches |
3 | 3 | |
4 | NP: Updated to patches from TL source svn 2020-06-04 | |
5 | ||
4 | 6 | 2018-10-31 |
0 | Changes applied to the TECkit-2.5.8/ tree obtained from: | |
1 | https://github.com/silnrsi/teckit/archive/2.5.8.tar.gz. | |
0 | Changes applied to the TECkit-2.5.10/ tree obtained from: | |
1 | https://github.com/silnrsi/teckit/archive/2.5.10.tar.gz. | |
2 | 2 | |
3 | 3 | Removed execute permissions from: |
4 | 4 | installed-top.pc.in |
22 | 22 | test/Makefile.in |
23 | 23 | test-driver |
24 | 24 | SFconv/ |
25 | zlib-1.2.3/ | |
25 | zlib-1.2.11/ | |
26 | 26 | |
27 | Converted Dos/Win line ends to native: | |
27 | Converted Dos/Win lpwdine ends to native: | |
28 | 28 | source/Perl/TECkit.xs |
29 | 29 | source/Perl/lib/Encode/TECkit.pm |
30 | 30 | source/Perl/test.pl |
0 | From: texlive-bin package <debian-tex-maint@lists.debian.org> | |
1 | Avoid compiler warning. | |
2 | ||
3 | --- | |
4 | source/Compiler.h | 2 +- | |
5 | 1 file changed, 1 insertion(+), 1 deletion(-) | |
6 | ||
7 | --- teckit.orig/source/Compiler.h | |
8 | +++ teckit/source/Compiler.h | |
9 | @@ -229,7 +229,7 @@ protected: | |
10 | vector<UInt32> byteClassLines; | |
11 | vector<UInt32> uniClassLines; | |
12 | ||
13 | - long passType; | |
14 | + UInt32 passType; | |
15 | UInt32 uniDefault; | |
16 | UInt8 byteDefault; | |
17 | bool supplementaryChars; |
0 | From: texlive-bin package <debian-tex-maint@lists.debian.org> | |
1 | Avoid more compiler warnings. | |
2 | ||
3 | diff -ur teckit-2.5.8/source/Compiler.cpp teckit-src/source/Compiler.cpp | |
4 | --- teckit-2.5.8/source/Compiler.cpp Tue Dec 05 07:20:20 2017 | |
5 | +++ teckit-src/source/Compiler.cpp Tue Jul 24 07:23:53 2018 | |
6 | @@ -189,14 +189,14 @@ | |
7 | free(table); | |
8 | } | |
9 | ||
10 | -char* | |
11 | +const char* | |
12 | WINAPI | |
13 | TECkit_GetUnicodeName(UInt32 usv) | |
14 | { | |
15 | const CharName *c = &gUnicodeNames[0]; | |
16 | while (c->name != 0) | |
17 | if (c->usv == usv) | |
18 | - return (char*)c->name; | |
19 | + return c->name; | |
20 | else | |
21 | ++c; | |
22 | return NULL; | |
23 | @@ -2133,7 +2133,7 @@ | |
24 | cout << " at line " << line << endl; | |
25 | } | |
26 | else | |
27 | - (*errorFunction)(errFuncUserData, (char*)msg, (char*)s, line); | |
28 | + (*errorFunction)(errFuncUserData, msg, s, line); | |
29 | errorState = true; | |
30 | ++errorCount; | |
31 | } | |
32 | ||
33 | diff -ur teckit-2.5.8/source/Engine.cpp teckit-src/source/Engine.cpp | |
34 | --- teckit-2.5.8/source/Engine.cpp Tue Dec 05 07:20:20 2017 | |
35 | +++ teckit-src/source/Engine.cpp Tue Jul 24 07:39:17 2018 | |
36 | @@ -1093,7 +1075,7 @@ | |
37 | if (matchElems == 0 && allowInsertion == false) | |
38 | continue; | |
39 | patternLength = matchElems + READ(rule->postLength); | |
40 | - pattern = (MatchElem*)(rule + 1); // point past the defined struct for the rule header | |
41 | + pattern = (const MatchElem*)(rule + 1); // point past the defined struct for the rule header | |
42 | direction = 1; | |
43 | infoLimit = matchElems; | |
44 | ||
45 | @@ -2194,7 +2168,7 @@ | |
46 | status = kStatus_BadMappingVersion; | |
47 | else { | |
48 | const Byte* namePtr; | |
49 | - if (getNamePtrFromTable((Byte*)fh, nameID, namePtr, *nameLength)) { | |
50 | + if (getNamePtrFromTable((const Byte*)fh, nameID, namePtr, *nameLength)) { | |
51 | UInt16 copyBytes = *nameLength < bufferSize ? *nameLength : bufferSize; | |
52 | if (copyBytes > 0) | |
53 | memcpy(nameBuffer, namePtr, copyBytes); | |
54 | ||
55 | diff -ur teckit-2.5.8/source/Engine.h teckit-src/source/Engine.h | |
56 | --- teckit-2.5.8/source/Engine.h Tue Dec 05 07:20:20 2017 | |
57 | +++ teckit-src/source/Engine.h Tue Jul 24 07:29:14 2018 | |
58 | @@ -117,7 +117,7 @@ | |
59 | ||
60 | UInt32 match(int index, int repeats, int textLoc); | |
61 | // returns 0 for no match, 1 for match, or kNeedMoreInput/kInvalidChar | |
62 | - MatchElem* pattern; | |
63 | + const MatchElem* pattern; | |
64 | int patternLength; | |
65 | int direction; | |
66 | MatchInfo info[256]; | |
67 | ||
68 | diff -ur teckit-2.5.8/source/Public-headers/TECkit_Compiler.h teckit-src/source/Public-headers/TECkit_Compiler.h | |
69 | --- teckit-2.5.8/source/Public-headers/TECkit_Compiler.h Tue Dec 05 07:20:20 2017 | |
70 | +++ teckit-src/source/Public-headers/TECkit_Compiler.h Tue Jul 24 07:41:00 2018 | |
71 | @@ -56,7 +59,7 @@ | |
72 | #define kCompilerOpts_Compress 0x00000010 /* generate compressed mapping table */ | |
73 | #define kCompilerOpts_XML 0x00000020 /* instead of a compiled binary table, generate an XML representation of the mapping */ | |
74 | ||
75 | -typedef void (CALLBACK *TECkit_ErrorFn)(void* userData, char* msg, char* param, UInt32 line); | |
76 | +typedef void (CALLBACK *TECkit_ErrorFn)(void* userData, const char* msg, const char* param, UInt32 line); | |
77 | ||
78 | TECkit_Status | |
79 | WINAPI EXPORTED | |
80 | @@ -75,7 +78,7 @@ | |
81 | TECkit_GetCompilerVersion(); | |
82 | ||
83 | /* new APIs for looking up Unicode names (as NUL-terminated C strings) */ | |
84 | -char* | |
85 | +const char* | |
86 | WINAPI EXPORTED | |
87 | TECkit_GetUnicodeName(UInt32 usv); | |
88 | /* returns the Unicode name of usv, if available, else NULL */ | |
89 | ||
90 | ||
91 | diff -ur teckit-2.5.8/source/Sample-tools/TECkit_Compile.cpp teckit-src/source/Sample-tools/TECkit_Compile.cpp | |
92 | --- teckit-2.5.8/source/Sample-tools/TECkit_Compile.cpp Tue Dec 05 07:20:20 2017 | |
93 | +++ teckit-src/source/Sample-tools/TECkit_Compile.cpp Tue Jul 24 07:34:18 2018 | |
94 | @@ -24,13 +24,13 @@ | |
95 | #endif | |
96 | ||
97 | extern "C" { | |
98 | - static void CALLBACK errFunc(void* userData, char* msg, char* param, UInt32 line); | |
99 | + static void CALLBACK errFunc(void* userData, const char* msg, const char* param, UInt32 line); | |
100 | }; | |
101 | ||
102 | static | |
103 | void | |
104 | CALLBACK | |
105 | -errFunc(void* /*userData*/, char* msg, char* param, UInt32 line) | |
106 | +errFunc(void* /* userData */, const char* msg, const char* param, UInt32 line) | |
107 | { | |
108 | fprintf(stderr, "%s", msg); | |
109 | if (param != 0) |
0 | From: texlive-bin package <debian-tex-maint@lists.debian.org> | |
1 | Remove the '#pragma's, they seem to cause problems for MSVC | |
2 | and are certainly not needed otherwise. | |
3 | ||
4 | diff -ur teckit-2.5.8/source/Engine.cpp teckit-src/source/Engine.cpp | |
5 | --- teckit-2.5.8/source/Engine.cpp Tue Dec 05 07:20:20 2017 | |
6 | +++ teckit-src/source/Engine.cpp Tue Jul 24 07:39:17 2018 | |
7 | @@ -102,10 +96,6 @@ | |
8 | #endif | |
9 | } | |
10 | ||
11 | -#ifndef __GNUC__ | |
12 | -#pragma mark --- class Stage --- | |
13 | -#endif | |
14 | - | |
15 | Stage::Stage() | |
16 | : oBuffer(0) | |
17 | , oBufSize(0) | |
18 | @@ -127,10 +117,6 @@ | |
19 | return 0; | |
20 | } | |
21 | ||
22 | -#ifndef __GNUC__ | |
23 | -#pragma mark --- class Normalizer --- | |
24 | -#endif | |
25 | - | |
26 | #include "NormalizationData.c" | |
27 | ||
28 | Normalizer::Normalizer(bool compose) | |
29 | @@ -400,10 +386,6 @@ | |
30 | return c; | |
31 | } | |
32 | ||
33 | -#ifndef __GNUC__ | |
34 | -#pragma mark --- class Pass --- | |
35 | -#endif | |
36 | - | |
37 | Pass::Pass(const TableHeader* inTable, Converter* cnv) | |
38 | : converter(cnv) | |
39 | , tableHeader(inTable) | |
40 | @@ -1288,10 +1270,6 @@ | |
41 | return 0; | |
42 | } | |
43 | ||
44 | -#ifndef __GNUC__ | |
45 | -#pragma mark --- class Converter --- | |
46 | -#endif | |
47 | - | |
48 | Converter::Converter(const Byte* inTable, UInt32 inTableSize, bool inForward, | |
49 | UInt16 inForm, UInt16 outForm) | |
50 | : table(0) | |
51 | @@ -1942,10 +1920,6 @@ | |
52 | return true; | |
53 | } | |
54 | ||
55 | -#ifndef __GNUC__ | |
56 | -#pragma mark --- Public "C" API functions --- | |
57 | -#endif | |
58 | - | |
59 | TECkit_Status | |
60 | WINAPI | |
61 | TECkit_CreateConverter( |
0 | For TeX Live we build a static library and not a Dll. | |
1 | ||
2 | ||
3 | diff -ur teckit-2.5.8/source/Engine.cpp teckit-src/source/Engine.cpp | |
4 | --- teckit-2.5.8/source/Engine.cpp Tue Dec 05 07:20:20 2017 | |
5 | +++ teckit-src/source/Engine.cpp Tue Jul 24 07:39:17 2018 | |
6 | @@ -51,12 +51,6 @@ | |
7 | # define NOSERVICE | |
8 | # define NOMCX | |
9 | # include <windows.h> | |
10 | - | |
11 | - BOOL WINAPI | |
12 | - DllMain(HINSTANCE /*hInst*/, DWORD /*wDataSeg*/, LPVOID /*lpReserved*/) | |
13 | - { | |
14 | - return true; | |
15 | - } | |
16 | #endif | |
17 | ||
18 | #include "Engine.h" | |
19 | ||
20 | diff -ur teckit-2.5.8/source/Public-headers/TECkit_Compiler.h teckit-src/source/Public-headers/TECkit_Compiler.h | |
21 | --- teckit-2.5.8/source/Public-headers/TECkit_Compiler.h Tue Dec 05 07:20:20 2017 | |
22 | +++ teckit-src/source/Public-headers/TECkit_Compiler.h Tue Jul 24 07:41:00 2018 | |
23 | @@ -30,6 +30,9 @@ | |
24 | #ifdef _WIN32 | |
25 | /* MS compiler has predefined _WIN32, so assume Windows target */ | |
26 | #include <windows.h> // apparently just using windef.h fails on VC++6 | |
27 | +#undef WINAPI | |
28 | +#define WINAPI | |
29 | +#define EXPORTED | |
30 | #else | |
31 | /* not the MS compiler, so try Metrowerks' platform macros */ | |
32 | #ifndef __APPLE__ | |
33 | ||
34 | diff -ur teckit-2.5.8/source/Public-headers/TECkit_Engine.h teckit-src/source/Public-headers/TECkit_Engine.h | |
35 | --- teckit-2.5.8/source/Public-headers/TECkit_Engine.h Tue Dec 05 07:20:20 2017 | |
36 | +++ teckit-src/source/Public-headers/TECkit_Engine.h Tue Jul 24 07:42:14 2018 | |
37 | @@ -80,6 +80,9 @@ | |
38 | #ifdef _WIN32 | |
39 | /* MS compiler has predefined _WIN32, so assume Windows target */ | |
40 | #include <windows.h> | |
41 | +#undef WINAPI | |
42 | +#define WINAPI | |
43 | +#define EXPORTED | |
44 | #else | |
45 | /* not the MS compiler, so try Metrowerks' platform macros */ | |
46 | #ifndef __APPLE__ |
0 | diff -ur teckit-2.5.8/bin/Makefile.am teckit-src/bin/Makefile.am | |
1 | --- teckit-2.5.8/bin/Makefile.am Tue Dec 05 07:20:20 2017 | |
2 | +++ teckit-src/bin/Makefile.am Tue Jul 24 07:44:12 2018 | |
0 | diff -ur teckit-2.5.10/bin/Makefile.am teckit-src/bin/Makefile.am | |
1 | --- teckit-2.5.10/bin/Makefile.am Tue May 05 23:09:53 2020 | |
2 | +++ teckit-src/bin/Makefile.am Wed May 06 09:09:23 2020 | |
3 | 3 | @@ -1,6 +1,6 @@ |
4 | 4 | AUTOMAKE_OPTIONS = -Wno-portability |
5 | 5 |
0 | diff -ur teckit-2.5.10/source/Compiler.cpp teckit-src/source/Compiler.cpp | |
1 | --- teckit-2.5.10/source/Compiler.cpp Tue May 05 23:09:53 2020 | |
2 | +++ teckit-src/source/Compiler.cpp Wed May 06 09:00:34 2020 | |
3 | @@ -189,7 +189,7 @@ | |
4 | free(table); | |
5 | } | |
6 | ||
7 | -char* | |
8 | +const char* | |
9 | WINAPI | |
10 | TECkit_GetUnicodeName(UInt32 usv) | |
11 | { | |
12 | diff -ur teckit-2.5.10/source/Compiler.h teckit-src/source/Compiler.h | |
13 | --- teckit-2.5.10/source/Compiler.h Tue May 05 23:09:53 2020 | |
14 | +++ teckit-src/source/Compiler.h Wed May 06 08:59:40 2020 | |
15 | @@ -229,7 +229,7 @@ | |
16 | vector<UInt32> byteClassLines; | |
17 | vector<UInt32> uniClassLines; | |
18 | ||
19 | - long passType; | |
20 | + UInt32 passType; | |
21 | UInt32 uniDefault; | |
22 | UInt8 byteDefault; | |
23 | bool supplementaryChars; | |
24 | diff -ur teckit-2.5.10/source/Engine.cpp teckit-src/source/Engine.cpp | |
25 | --- teckit-2.5.10/source/Engine.cpp Tue May 05 23:09:53 2020 | |
26 | +++ teckit-src/source/Engine.cpp Wed May 06 09:06:24 2020 | |
27 | @@ -51,12 +51,6 @@ | |
28 | # define NOSERVICE | |
29 | # define NOMCX | |
30 | # include <windows.h> | |
31 | - | |
32 | - BOOL WINAPI | |
33 | - DllMain(HINSTANCE /*hInst*/, DWORD /*wDataSeg*/, LPVOID /*lpReserved*/) | |
34 | - { | |
35 | - return true; | |
36 | - } | |
37 | #endif | |
38 | ||
39 | #include "Engine.h" | |
40 | diff -ur teckit-2.5.10/source/Public-headers/TECkit_Compiler.h teckit-src/source/Public-headers/TECkit_Compiler.h | |
41 | --- teckit-2.5.10/source/Public-headers/TECkit_Compiler.h Tue May 05 23:09:53 2020 | |
42 | +++ teckit-src/source/Public-headers/TECkit_Compiler.h Wed May 06 09:07:40 2020 | |
43 | @@ -29,6 +29,9 @@ | |
44 | #ifdef _WIN32 | |
45 | /* MS compiler has predefined _WIN32, so assume Windows target */ | |
46 | #include <windows.h> // apparently just using windef.h fails on VC++6 | |
47 | +#undef WINAPI | |
48 | +#define WINAPI | |
49 | +#define EXPORTED | |
50 | #else | |
51 | /* not the MS compiler, so try Metrowerks' platform macros */ | |
52 | #ifndef __APPLE__ | |
53 | @@ -55,7 +58,7 @@ | |
54 | #define kCompilerOpts_Compress 0x00000010 /* generate compressed mapping table */ | |
55 | #define kCompilerOpts_XML 0x00000020 /* instead of a compiled binary table, generate an XML representation of the mapping */ | |
56 | ||
57 | -typedef void (CALLBACK *TECkit_ErrorFn)(void* userData, char* msg, char* param, UInt32 line); | |
58 | +typedef void (CALLBACK *TECkit_ErrorFn)(void* userData, const char* msg, const char* param, UInt32 line); | |
59 | ||
60 | TECkit_Status | |
61 | WINAPI EXPORTED | |
62 | @@ -74,7 +77,7 @@ | |
63 | TECkit_GetCompilerVersion(); | |
64 | ||
65 | /* new APIs for looking up Unicode names (as NUL-terminated C strings) */ | |
66 | -char* | |
67 | +const char* | |
68 | WINAPI EXPORTED | |
69 | TECkit_GetUnicodeName(UInt32 usv); | |
70 | /* returns the Unicode name of usv, if available, else NULL */ | |
71 | diff -ur teckit-2.5.10/source/Public-headers/TECkit_Engine.h teckit-src/source/Public-headers/TECkit_Engine.h | |
72 | --- teckit-2.5.10/source/Public-headers/TECkit_Engine.h Tue May 05 23:09:53 2020 | |
73 | +++ teckit-src/source/Public-headers/TECkit_Engine.h Wed May 06 09:08:34 2020 | |
74 | @@ -79,6 +79,9 @@ | |
75 | #ifdef _WIN32 | |
76 | /* MS compiler has predefined _WIN32, so assume Windows target */ | |
77 | #include <windows.h> | |
78 | +#undef WINAPI | |
79 | +#define WINAPI | |
80 | +#define EXPORTED | |
81 | #else | |
82 | /* not the MS compiler, so try Metrowerks' platform macros */ | |
83 | #ifndef __APPLE__ | |
84 | diff -ur teckit-2.5.10/source/Sample-tools/TECkit_Compile.cpp teckit-src/source/Sample-tools/TECkit_Compile.cpp | |
85 | --- teckit-2.5.10/source/Sample-tools/TECkit_Compile.cpp Tue May 05 23:09:53 2020 | |
86 | +++ teckit-src/source/Sample-tools/TECkit_Compile.cpp Wed May 06 09:05:22 2020 | |
87 | @@ -24,13 +24,13 @@ | |
88 | #endif | |
89 | ||
90 | extern "C" { | |
91 | - static void CALLBACK errFunc(void* userData, char* msg, char* param, UInt32 line); | |
92 | + static void CALLBACK errFunc(void* userData, const char* msg, const char* param, UInt32 line); | |
93 | }; | |
94 | ||
95 | static | |
96 | void | |
97 | CALLBACK | |
98 | -errFunc(void* /*userData*/, char* msg, char* param, UInt32 line) | |
99 | +errFunc(void* /* userData */, const char* msg, const char* param, UInt32 line) | |
100 | { | |
101 | fprintf(stderr, "%s", msg); | |
102 | if (param != 0) |