Package list teckit / cca0e90
update patches from texlive to texlive-bin-2018.20180907.48586/libs/teckit/TLpatches Daniel Glassey 2 years ago
9 changed file(s) with 115 addition(s) and 63 deletion(s). Raw diff Collapse all Expand all
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
026 2014-07-18 Peter Breitenlohner <peb@mppmu.mpg.de>
127
228 Imported TECkit-2.5.4 source tree (teckit) from
00 These patches have come from the texlive-bin source
11
2 texlive-bin-2015.20150524.37493/libs/teckit/TECkit-2.5.4-PATCHES
2 texlive-bin-2018.20180907.48586/libs/teckit/TLpatches
33
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.
32
43 Removed execute permissions from:
54 installed-top.pc.in
76 uninstalled-top.pc.in
87
98 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/
2425 zlib-1.2.3/
2526
2627 Converted Dos/Win line ends to native:
3233 test/ISO-8859-1.map
3334 test/Mrk-GNT.sf
3435 test/mrk.sf.legacy.txt.orig
35
36 Added newline at end of file:
37 source/Carbon.r
38
00 Avoid compiler warning.
11
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
55 @@ -230,7 +230,7 @@
66 vector<UInt32> byteClassLines;
77 vector<UInt32> uniClassLines;
00 Avoid more compiler warnings.
11
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
55 @@ -189,14 +189,14 @@
66 free(table);
77 }
2828 errorState = true;
2929 ++errorCount;
3030 }
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 @@
3536 if (matchElems == 0 && allowInsertion == false)
3637 continue;
3738 patternLength = matchElems + READ(rule->postLength);
4041 direction = 1;
4142 infoLimit = matchElems;
4243
43 @@ -2184,7 +2184,7 @@
44 @@ -2194,7 +2168,7 @@
4445 status = kStatus_BadMappingVersion;
4546 else {
4647 const Byte* namePtr;
4950 UInt16 copyBytes = *nameLength < bufferSize ? *nameLength : bufferSize;
5051 if (copyBytes > 0)
5152 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
5557 @@ -117,7 +117,7 @@
5658
5759 UInt32 match(int index, int repeats, int textLoc);
6163 int patternLength;
6264 int direction;
6365 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 @@
6871 #define kCompilerOpts_Compress 0x00000010 /* generate compressed mapping table */
6972 #define kCompilerOpts_XML 0x00000020 /* instead of a compiled binary table, generate an XML representation of the mapping */
7073
7376
7477 TECkit_Status
7578 WINAPI EXPORTED
76 @@ -75,7 +75,7 @@
79 @@ -75,7 +78,7 @@
7780 TECkit_GetCompilerVersion();
7881
7982 /* new APIs for looking up Unicode names (as NUL-terminated C strings) */
8285 WINAPI EXPORTED
8386 TECkit_GetUnicodeName(UInt32 usv);
8487 /* 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
8893 @@ -24,13 +24,13 @@
8994 #endif
9095
97102 void
98103 CALLBACK
99104 -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)
101106 {
102107 fprintf(stderr, "%s", msg);
103108 if (param != 0)
00 Remove the '#pragma's, they seem to cause problems for MSVC
11 and are certainly not needed otherwise.
22
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 @@
77 #endif
88 }
99
10 -#ifndef __GNUC__
1011 -#pragma mark --- class Stage ---
12 -#endif
1113 -
1214 Stage::Stage()
1315 : oBuffer(0)
1416 , oBufSize(0)
15 @@ -125,8 +123,6 @@
17 @@ -127,10 +117,6 @@
1618 return 0;
1719 }
1820
21 -#ifndef __GNUC__
1922 -#pragma mark --- class Normalizer ---
23 -#endif
2024 -
2125 #include "NormalizationData.c"
2226
2327 Normalizer::Normalizer(bool compose)
24 @@ -396,8 +392,6 @@
28 @@ -400,10 +386,6 @@
2529 return c;
2630 }
2731
32 -#ifndef __GNUC__
2833 -#pragma mark --- class Pass ---
34 -#endif
2935 -
3036 Pass::Pass(const TableHeader* inTable, Converter* cnv)
3137 : converter(cnv)
3238 , tableHeader(inTable)
33 @@ -1282,8 +1276,6 @@
39 @@ -1288,10 +1270,6 @@
3440 return 0;
3541 }
3642
43 -#ifndef __GNUC__
3744 -#pragma mark --- class Converter ---
45 -#endif
3846 -
3947 Converter::Converter(const Byte* inTable, UInt32 inTableSize, bool inForward,
4048 UInt16 inForm, UInt16 outForm)
4149 : table(0)
42 @@ -1934,8 +1926,6 @@
50 @@ -1942,10 +1920,6 @@
4351 return true;
4452 }
4553
54 -#ifndef __GNUC__
4655 -#pragma mark --- Public "C" API functions ---
56 -#endif
4757 -
4858 TECkit_Status
4959 WINAPI
00 For TeX Live we build a static library and not a Dll.
11
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
56 @@ -51,12 +51,6 @@
67 # define NOSERVICE
78 # define NOMCX
1516 #endif
1617
1718 #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
2123 @@ -30,6 +30,9 @@
2224 #ifdef _WIN32
2325 /* MS compiler has predefined _WIN32, so assume Windows target */
2830 #else
2931 /* not the MS compiler, so try Metrowerks' platform macros */
3032 #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
3437 @@ -80,6 +80,9 @@
3538 #ifdef _WIN32
3639 /* 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
11 patch-03-warnings
22 patch-04-pragmas
33 #patch-05-static
4 #patch-06-dont-build-sfconv