update patches from texlive
to texlive-bin-2018.20180907.48586/libs/teckit/TLpatches
Daniel Glassey
5 years ago
0 | 2018-07-24 Akira Kakuto <kakuto@.fuk.kindai.ac.jp> | |
1 | ||
2 | Imported TECkit-2.5.8 source tree (teckit) from | |
3 | https://github.com/silnrsi/teckit/archive/2.5.8.tar.gz. | |
4 | patch-02-warning, patch-03-warnings, patch-04-pragmas, | |
5 | patch-05-static, and patch patch-06-dont-build-sfconv: Adapted. | |
6 | ||
7 | 2017-06-27 Akira Kakuto <kakuto@.fuk.kindai.ac.jp> | |
8 | ||
9 | Imported TECkit-2.5.7 source tree (teckit) from | |
10 | https://github.com/silnrsi/teckit/archive/2.5.7.tar.gz. | |
11 | patch-02-warning, patch-03-warnings, patch-04-pragmas, | |
12 | patch-05-static, and patch patch-06-dont-build-sfconv: Adapted. | |
13 | ||
14 | 2017-01-11 Norbert Preining <norbert@preining.info> | |
15 | ||
16 | Remove SFconv directory, contains non-free ConvertUTF.{c,h} | |
17 | Add patch patch-06-dont-build-sfconv to not build sfconv. | |
18 | ||
19 | 2016-12-30 Akira Kakuto <kakuto@.fuk.kindai.ac.jp> | |
20 | ||
21 | Imported TECkit-2.5.6 source tree (teckit) from | |
22 | https://github.com/silnrsi/teckit/archive/2.5.6.tar.gz. | |
23 | patch-02-warning, patch-03-warnings, patch-04-pragmas, and | |
24 | patch-05-static: Adapted. | |
25 | ||
0 | 26 | 2014-07-18 Peter Breitenlohner <peb@mppmu.mpg.de> |
1 | 27 | |
2 | 28 | Imported TECkit-2.5.4 source tree (teckit) from |
0 | 0 | These patches have come from the texlive-bin source |
1 | 1 | |
2 | texlive-bin-2015.20150524.37493/libs/teckit/TECkit-2.5.4-PATCHES | |
2 | texlive-bin-2018.20180907.48586/libs/teckit/TLpatches | |
3 | 3 | |
4 | 2015-11-14 | |
4 | 2018-10-31 |
0 | Changes applied to the TECkit-2.5.4/ tree obtained from: | |
1 | http://scripts.sil.org/svn-public/teckit/TRUNK | |
2 | (svn r139 2014-07-09 14:47:39 UTC). | |
0 | Changes applied to the TECkit-2.5.8/ tree obtained from: | |
1 | https://github.com/silnrsi/teckit/archive/2.5.8.tar.gz. | |
3 | 2 | |
4 | 3 | Removed execute permissions from: |
5 | 4 | installed-top.pc.in |
7 | 6 | uninstalled-top.pc.in |
8 | 7 | |
9 | 8 | Removed: |
10 | .gitignore | |
11 | SFconv/expat/xmlparse/.cvsignore | |
12 | SFconv/expat/xmlparse/CVS/ | |
13 | SFconv/expat/xmltok/.cvsignore | |
14 | SFconv/expat/xmltok/CVS/ | |
15 | SFconv/expat/xmlwf/CVS/ | |
16 | TECkit.mcp | |
17 | build-mac-binaries.sh | |
18 | build-linux-package.sh | |
19 | build-windows-binaries.sh | |
20 | debian-src/ | |
21 | mac-installer/ | |
22 | perl_binaries/ | |
23 | source/teckitjni/ | |
9 | aclocal.m4 | |
10 | bin/Makefile.in | |
11 | compile | |
12 | config.guess | |
13 | config.sub | |
14 | configure | |
15 | decomp | |
16 | docs/Makefile.in | |
17 | install-sh | |
18 | lib/Makefile.in | |
19 | ltmain.sh | |
20 | Makefile.in | |
21 | missing | |
22 | test/Makefile.in | |
23 | test-driver | |
24 | SFconv/ | |
24 | 25 | zlib-1.2.3/ |
25 | 26 | |
26 | 27 | Converted Dos/Win line ends to native: |
32 | 33 | test/ISO-8859-1.map |
33 | 34 | test/Mrk-GNT.sf |
34 | 35 | test/mrk.sf.legacy.txt.orig |
35 | ||
36 | Added newline at end of file: | |
37 | source/Carbon.r | |
38 |
0 | 0 | Avoid compiler warning. |
1 | 1 | |
2 | diff -ur TECkit-2.5.4.orig/source/Compiler.h TECkit-2.5.4/source/Compiler.h | |
3 | --- TECkit-2.5.4.orig/source/Compiler.h 2014-07-01 02:13:39.000000000 +0200 | |
4 | +++ TECkit-2.5.4/source/Compiler.h 2014-07-18 10:59:53.000000000 +0200 | |
2 | diff -ur teckit-2.5.8/source/Compiler.h teckit-src/source/Compiler.h | |
3 | --- teckit-2.5.8/source/Compiler.h Tue Dec 05 07:20:20 2017 | |
4 | +++ teckit-src/source/Compiler.h Tue Jul 24 07:21:23 2018 | |
5 | 5 | @@ -230,7 +230,7 @@ |
6 | 6 | vector<UInt32> byteClassLines; |
7 | 7 | vector<UInt32> uniClassLines; |
0 | 0 | Avoid more compiler warnings. |
1 | 1 | |
2 | diff -ur TECkit-2.5.4.orig/source/Compiler.cpp TECkit-2.5.4/source/Compiler.cpp | |
3 | --- TECkit-2.5.4.orig/source/Compiler.cpp 2014-07-01 02:13:39.000000000 +0200 | |
4 | +++ TECkit-2.5.4/source/Compiler.cpp 2014-07-18 11:01:30.000000000 +0200 | |
2 | diff -ur teckit-2.5.8/source/Compiler.cpp teckit-src/source/Compiler.cpp | |
3 | --- teckit-2.5.8/source/Compiler.cpp Tue Dec 05 07:20:20 2017 | |
4 | +++ teckit-src/source/Compiler.cpp Tue Jul 24 07:23:53 2018 | |
5 | 5 | @@ -189,14 +189,14 @@ |
6 | 6 | free(table); |
7 | 7 | } |
28 | 28 | errorState = true; |
29 | 29 | ++errorCount; |
30 | 30 | } |
31 | diff -ur TECkit-2.5.4.orig/source/Engine.cpp TECkit-2.5.4/source/Engine.cpp | |
32 | --- TECkit-2.5.4.orig/source/Engine.cpp 2014-07-01 02:13:39.000000000 +0200 | |
33 | +++ TECkit-2.5.4/source/Engine.cpp 2014-07-18 11:01:30.000000000 +0200 | |
34 | @@ -1087,7 +1087,7 @@ | |
31 | ||
32 | diff -ur teckit-2.5.8/source/Engine.cpp teckit-src/source/Engine.cpp | |
33 | --- teckit-2.5.8/source/Engine.cpp Tue Dec 05 07:20:20 2017 | |
34 | +++ teckit-src/source/Engine.cpp Tue Jul 24 07:39:17 2018 | |
35 | @@ -1093,7 +1075,7 @@ | |
35 | 36 | if (matchElems == 0 && allowInsertion == false) |
36 | 37 | continue; |
37 | 38 | patternLength = matchElems + READ(rule->postLength); |
40 | 41 | direction = 1; |
41 | 42 | infoLimit = matchElems; |
42 | 43 | |
43 | @@ -2184,7 +2184,7 @@ | |
44 | @@ -2194,7 +2168,7 @@ | |
44 | 45 | status = kStatus_BadMappingVersion; |
45 | 46 | else { |
46 | 47 | const Byte* namePtr; |
49 | 50 | UInt16 copyBytes = *nameLength < bufferSize ? *nameLength : bufferSize; |
50 | 51 | if (copyBytes > 0) |
51 | 52 | memcpy(nameBuffer, namePtr, copyBytes); |
52 | diff -ur TECkit-2.5.4.orig/source/Engine.h TECkit-2.5.4/source/Engine.h | |
53 | --- TECkit-2.5.4.orig/source/Engine.h 2014-07-01 02:13:39.000000000 +0200 | |
54 | +++ TECkit-2.5.4/source/Engine.h 2014-07-18 11:01:30.000000000 +0200 | |
53 | ||
54 | diff -ur teckit-2.5.8/source/Engine.h teckit-src/source/Engine.h | |
55 | --- teckit-2.5.8/source/Engine.h Tue Dec 05 07:20:20 2017 | |
56 | +++ teckit-src/source/Engine.h Tue Jul 24 07:29:14 2018 | |
55 | 57 | @@ -117,7 +117,7 @@ |
56 | 58 | |
57 | 59 | UInt32 match(int index, int repeats, int textLoc); |
61 | 63 | int patternLength; |
62 | 64 | int direction; |
63 | 65 | MatchInfo info[256]; |
64 | diff -ur TECkit-2.5.4.orig/source/Public-headers/TECkit_Compiler.h TECkit-2.5.4/source/Public-headers/TECkit_Compiler.h | |
65 | --- TECkit-2.5.4.orig/source/Public-headers/TECkit_Compiler.h 2014-07-01 02:13:39.000000000 +0200 | |
66 | +++ TECkit-2.5.4/source/Public-headers/TECkit_Compiler.h 2014-07-18 11:01:30.000000000 +0200 | |
67 | @@ -56,7 +56,7 @@ | |
66 | ||
67 | diff -ur teckit-2.5.8/source/Public-headers/TECkit_Compiler.h teckit-src/source/Public-headers/TECkit_Compiler.h | |
68 | --- teckit-2.5.8/source/Public-headers/TECkit_Compiler.h Tue Dec 05 07:20:20 2017 | |
69 | +++ teckit-src/source/Public-headers/TECkit_Compiler.h Tue Jul 24 07:41:00 2018 | |
70 | @@ -56,7 +59,7 @@ | |
68 | 71 | #define kCompilerOpts_Compress 0x00000010 /* generate compressed mapping table */ |
69 | 72 | #define kCompilerOpts_XML 0x00000020 /* instead of a compiled binary table, generate an XML representation of the mapping */ |
70 | 73 | |
73 | 76 | |
74 | 77 | TECkit_Status |
75 | 78 | WINAPI EXPORTED |
76 | @@ -75,7 +75,7 @@ | |
79 | @@ -75,7 +78,7 @@ | |
77 | 80 | TECkit_GetCompilerVersion(); |
78 | 81 | |
79 | 82 | /* new APIs for looking up Unicode names (as NUL-terminated C strings) */ |
82 | 85 | WINAPI EXPORTED |
83 | 86 | TECkit_GetUnicodeName(UInt32 usv); |
84 | 87 | /* returns the Unicode name of usv, if available, else NULL */ |
85 | diff -ur TECkit-2.5.4.orig/source/Sample-tools/TECkit_Compile.cpp TECkit-2.5.4/source/Sample-tools/TECkit_Compile.cpp | |
86 | --- TECkit-2.5.4.orig/source/Sample-tools/TECkit_Compile.cpp 2014-07-01 02:13:39.000000000 +0200 | |
87 | +++ TECkit-2.5.4/source/Sample-tools/TECkit_Compile.cpp 2014-07-18 11:07:05.000000000 +0200 | |
88 | ||
89 | ||
90 | diff -ur teckit-2.5.8/source/Sample-tools/TECkit_Compile.cpp teckit-src/source/Sample-tools/TECkit_Compile.cpp | |
91 | --- teckit-2.5.8/source/Sample-tools/TECkit_Compile.cpp Tue Dec 05 07:20:20 2017 | |
92 | +++ teckit-src/source/Sample-tools/TECkit_Compile.cpp Tue Jul 24 07:34:18 2018 | |
88 | 93 | @@ -24,13 +24,13 @@ |
89 | 94 | #endif |
90 | 95 | |
97 | 102 | void |
98 | 103 | CALLBACK |
99 | 104 | -errFunc(void* /*userData*/, char* msg, char* param, UInt32 line) |
100 | +errFunc(void* /*userData*/, const char* msg, const char* param, UInt32 line) | |
105 | +errFunc(void* /* userData */, const char* msg, const char* param, UInt32 line) | |
101 | 106 | { |
102 | 107 | fprintf(stderr, "%s", msg); |
103 | 108 | if (param != 0) |
0 | 0 | Remove the '#pragma's, they seem to cause problems for MSVC |
1 | 1 | and are certainly not needed otherwise. |
2 | 2 | |
3 | diff -ur TECkit-2.5.4.orig/source/Engine.cpp TECkit-2.5.4/source/Engine.cpp | |
4 | --- TECkit-2.5.4.orig/source/Engine.cpp 2014-07-18 11:01:30.000000000 +0200 | |
5 | +++ TECkit-2.5.4/source/Engine.cpp 2014-07-18 11:11:09.000000000 +0200 | |
6 | @@ -102,8 +102,6 @@ | |
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 | @@ -102,10 +96,6 @@ | |
7 | 7 | #endif |
8 | 8 | } |
9 | 9 | |
10 | -#ifndef __GNUC__ | |
10 | 11 | -#pragma mark --- class Stage --- |
12 | -#endif | |
11 | 13 | - |
12 | 14 | Stage::Stage() |
13 | 15 | : oBuffer(0) |
14 | 16 | , oBufSize(0) |
15 | @@ -125,8 +123,6 @@ | |
17 | @@ -127,10 +117,6 @@ | |
16 | 18 | return 0; |
17 | 19 | } |
18 | 20 | |
21 | -#ifndef __GNUC__ | |
19 | 22 | -#pragma mark --- class Normalizer --- |
23 | -#endif | |
20 | 24 | - |
21 | 25 | #include "NormalizationData.c" |
22 | 26 | |
23 | 27 | Normalizer::Normalizer(bool compose) |
24 | @@ -396,8 +392,6 @@ | |
28 | @@ -400,10 +386,6 @@ | |
25 | 29 | return c; |
26 | 30 | } |
27 | 31 | |
32 | -#ifndef __GNUC__ | |
28 | 33 | -#pragma mark --- class Pass --- |
34 | -#endif | |
29 | 35 | - |
30 | 36 | Pass::Pass(const TableHeader* inTable, Converter* cnv) |
31 | 37 | : converter(cnv) |
32 | 38 | , tableHeader(inTable) |
33 | @@ -1282,8 +1276,6 @@ | |
39 | @@ -1288,10 +1270,6 @@ | |
34 | 40 | return 0; |
35 | 41 | } |
36 | 42 | |
43 | -#ifndef __GNUC__ | |
37 | 44 | -#pragma mark --- class Converter --- |
45 | -#endif | |
38 | 46 | - |
39 | 47 | Converter::Converter(const Byte* inTable, UInt32 inTableSize, bool inForward, |
40 | 48 | UInt16 inForm, UInt16 outForm) |
41 | 49 | : table(0) |
42 | @@ -1934,8 +1926,6 @@ | |
50 | @@ -1942,10 +1920,6 @@ | |
43 | 51 | return true; |
44 | 52 | } |
45 | 53 | |
54 | -#ifndef __GNUC__ | |
46 | 55 | -#pragma mark --- Public "C" API functions --- |
56 | -#endif | |
47 | 57 | - |
48 | 58 | TECkit_Status |
49 | 59 | WINAPI |
0 | 0 | For TeX Live we build a static library and not a Dll. |
1 | 1 | |
2 | diff -ur TECkit-2.5.4.orig/source/Engine.cpp TECkit-2.5.4/source/Engine.cpp | |
3 | --- TECkit-2.5.4.orig/source/Engine.cpp 2014-07-18 11:11:09.000000000 +0200 | |
4 | +++ TECkit-2.5.4/source/Engine.cpp 2014-07-18 11:18:02.000000000 +0200 | |
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 | |
5 | 6 | @@ -51,12 +51,6 @@ |
6 | 7 | # define NOSERVICE |
7 | 8 | # define NOMCX |
15 | 16 | #endif |
16 | 17 | |
17 | 18 | #include "Engine.h" |
18 | diff -ur TECkit-2.5.4.orig/source/Public-headers/TECkit_Compiler.h TECkit-2.5.4/source/Public-headers/TECkit_Compiler.h | |
19 | --- TECkit-2.5.4.orig/source/Public-headers/TECkit_Compiler.h 2014-07-18 11:01:30.000000000 +0200 | |
20 | +++ TECkit-2.5.4/source/Public-headers/TECkit_Compiler.h 2014-07-18 11:18:02.000000000 +0200 | |
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 | |
21 | 23 | @@ -30,6 +30,9 @@ |
22 | 24 | #ifdef _WIN32 |
23 | 25 | /* MS compiler has predefined _WIN32, so assume Windows target */ |
28 | 30 | #else |
29 | 31 | /* not the MS compiler, so try Metrowerks' platform macros */ |
30 | 32 | #ifndef __APPLE__ |
31 | diff -ur TECkit-2.5.4.orig/source/Public-headers/TECkit_Engine.h TECkit-2.5.4/source/Public-headers/TECkit_Engine.h | |
32 | --- TECkit-2.5.4.orig/source/Public-headers/TECkit_Engine.h 2014-07-01 02:13:39.000000000 +0200 | |
33 | +++ TECkit-2.5.4/source/Public-headers/TECkit_Engine.h 2014-07-18 11:18:02.000000000 +0200 | |
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 | |
34 | 37 | @@ -80,6 +80,9 @@ |
35 | 38 | #ifdef _WIN32 |
36 | 39 | /* MS compiler has predefined _WIN32, so assume Windows target */ |
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 | |
3 | @@ -1,6 +1,6 @@ | |
4 | AUTOMAKE_OPTIONS = -Wno-portability | |
5 | ||
6 | -bin_PROGRAMS = teckit_compile txtconv sfconv | |
7 | +bin_PROGRAMS = teckit_compile txtconv | |
8 | ||
9 | AM_CPPFLAGS = -I$(top_srcdir)/source/Public-headers |