summaryrefslogtreecommitdiff
path: root/Build/source/libs/teckit/TECkit-2.5.3-PATCHES
diff options
context:
space:
mode:
Diffstat (limited to 'Build/source/libs/teckit/TECkit-2.5.3-PATCHES')
-rw-r--r--Build/source/libs/teckit/TECkit-2.5.3-PATCHES/ChangeLog38
-rw-r--r--Build/source/libs/teckit/TECkit-2.5.3-PATCHES/TL-Changes39
-rw-r--r--Build/source/libs/teckit/TECkit-2.5.3-PATCHES/patch-02-warning14
-rw-r--r--Build/source/libs/teckit/TECkit-2.5.3-PATCHES/patch-03-warnings104
4 files changed, 195 insertions, 0 deletions
diff --git a/Build/source/libs/teckit/TECkit-2.5.3-PATCHES/ChangeLog b/Build/source/libs/teckit/TECkit-2.5.3-PATCHES/ChangeLog
new file mode 100644
index 00000000000..24b9b95fcab
--- /dev/null
+++ b/Build/source/libs/teckit/TECkit-2.5.3-PATCHES/ChangeLog
@@ -0,0 +1,38 @@
+2012-03-17 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ Imported TECkit-2.5.3 source tree (teckit) from
+ http://scripts.sil.org/svn-public/teckit/TRUNK
+ (svn r1250 2012-03-1419:45:41 UTC).
+
+ * patch-01-debian-505693, patch-04-case-sensitive (removed):
+ Now in source tree.
+ * patch-02-warning, patch-03-warnings: Adapted.
+
+2010-02-19 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * patch-04-case-sensitive (new): #include <windows.h> instead
+ of <Windows.h> for, e.g., Linux => MinGW32 cross compilation.
+
+2009-10-18 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ Reconstruct TL TECkit sources from distributed tarball.
+ * TL-changes (new): Modifications applied to the distribution.
+ * patch-[0-9][0-9]-*: Patches applied to the distribution.
+
+2009-10-01 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * patch-03-warnings (new): Avoid maximal compiler warnings.
+ source/Sample-tools/TECkit_Compile.cpp, source/Engine.{cpp,h},
+ source/Public-headers/TECkit_Compiler.h, source/Compiler.cpp:
+ Constify.
+
+2009-06-25 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * patch-02-warning (new): Avoid compiler warning.
+ source/Compiler.h: change type of Compiler::Pass.passType
+ long -> UInt32.
+
+2008-11-17 Jonathan Kew <jonathan_kew@sil.org>
+
+ * patch-01-debian-505693 (new): Bug fix.
+
diff --git a/Build/source/libs/teckit/TECkit-2.5.3-PATCHES/TL-Changes b/Build/source/libs/teckit/TECkit-2.5.3-PATCHES/TL-Changes
new file mode 100644
index 00000000000..0de0cf47e7e
--- /dev/null
+++ b/Build/source/libs/teckit/TECkit-2.5.3-PATCHES/TL-Changes
@@ -0,0 +1,39 @@
+Changes applied to the TECkit-2.5.3/ tree obtained from:
+ http://scripts.sil.org/svn-public/teckit/TRUNK
+ (svn r116 2011-05-12 18:24:47 UTC).
+
+Removed execute permissions from:
+ installed-top.pc.in
+ teckit.pc.in
+ uninstalled-top.pc.in
+
+Removed:
+ .gitignore
+ SFconv/expat/xmlparse/.cvsignore
+ SFconv/expat/xmlparse/CVS/
+ SFconv/expat/xmltok/.cvsignore
+ SFconv/expat/xmltok/CVS/
+ SFconv/expat/xmlwf/CVS/
+ TECkit.mcp
+ build-mac-binaries.sh
+ build-linux-package.sh
+ build-windows-binaries.sh
+ debian-src/
+ mac-installer/
+ perl_binaries/
+ source/teckitjni/
+ zlib-1.2.3/
+
+Converted Dos/Win line ends to native:
+ source/Perl/TECkit.xs
+ source/Perl/lib/Encode/TECkit.pm
+ source/Perl/test.pl
+ source/Perl/typemap
+ test/GNT-map.xml
+ test/ISO-8859-1.map
+ test/Mrk-GNT.sf
+ test/mrk.sf.legacy.txt.orig
+
+Added newline at end of file:
+ source/Carbon.r
+
diff --git a/Build/source/libs/teckit/TECkit-2.5.3-PATCHES/patch-02-warning b/Build/source/libs/teckit/TECkit-2.5.3-PATCHES/patch-02-warning
new file mode 100644
index 00000000000..89fb3421805
--- /dev/null
+++ b/Build/source/libs/teckit/TECkit-2.5.3-PATCHES/patch-02-warning
@@ -0,0 +1,14 @@
+ Avoid compiler warning.
+
+diff -ur TECkit-2.5.3.orig/source/Compiler.h TECkit-2.5.3/source/Compiler.h
+--- TECkit-2.5.3.orig/source/Compiler.h 2011-01-13 20:38:34.000000000 +0100
++++ TECkit-2.5.3/source/Compiler.h 2012-03-17 17:39:27.000000000 +0100
+@@ -230,7 +230,7 @@
+ vector<UInt32> byteClassLines;
+ vector<UInt32> uniClassLines;
+
+- long passType;
++ UInt32 passType;
+ UInt32 uniDefault;
+ UInt8 byteDefault;
+ bool supplementaryChars;
diff --git a/Build/source/libs/teckit/TECkit-2.5.3-PATCHES/patch-03-warnings b/Build/source/libs/teckit/TECkit-2.5.3-PATCHES/patch-03-warnings
new file mode 100644
index 00000000000..f90c2f819b6
--- /dev/null
+++ b/Build/source/libs/teckit/TECkit-2.5.3-PATCHES/patch-03-warnings
@@ -0,0 +1,104 @@
+ Avoid more compiler warnings.
+
+diff -ur TECkit-2.5.3.orig/source/Compiler.cpp TECkit-2.5.3/source/Compiler.cpp
+--- TECkit-2.5.3.orig/source/Compiler.cpp 2011-01-13 20:38:34.000000000 +0100
++++ TECkit-2.5.3/source/Compiler.cpp 2012-03-17 17:43:26.000000000 +0100
+@@ -191,14 +191,14 @@
+ free(table);
+ }
+
+-char*
++const char*
+ WINAPI
+ TECkit_GetUnicodeName(UInt32 usv)
+ {
+ const CharName *c = &gUnicodeNames[0];
+ while (c->name != 0)
+ if (c->usv == usv)
+- return (char*)c->name;
++ return c->name;
+ else
+ ++c;
+ return NULL;
+@@ -2133,7 +2133,7 @@
+ cout << " at line " << line << endl;
+ }
+ else
+- (*errorFunction)(errFuncUserData, (char*)msg, (char*)s, line);
++ (*errorFunction)(errFuncUserData, msg, s, line);
+ errorState = true;
+ ++errorCount;
+ }
+diff -ur TECkit-2.5.3.orig/source/Engine.cpp TECkit-2.5.3/source/Engine.cpp
+--- TECkit-2.5.3.orig/source/Engine.cpp 2011-01-13 20:38:34.000000000 +0100
++++ TECkit-2.5.3/source/Engine.cpp 2012-03-17 17:43:26.000000000 +0100
+@@ -1087,7 +1087,7 @@
+ if (matchElems == 0 && allowInsertion == false)
+ continue;
+ patternLength = matchElems + READ(rule->postLength);
+- pattern = (MatchElem*)(rule + 1); // point past the defined struct for the rule header
++ pattern = (const MatchElem*)(rule + 1); // point past the defined struct for the rule header
+ direction = 1;
+ infoLimit = matchElems;
+
+@@ -2185,7 +2185,7 @@
+ status = kStatus_BadMappingVersion;
+ else {
+ const Byte* namePtr;
+- if (getNamePtrFromTable((Byte*)fh, nameID, namePtr, *nameLength)) {
++ if (getNamePtrFromTable((const Byte*)fh, nameID, namePtr, *nameLength)) {
+ UInt16 copyBytes = *nameLength < bufferSize ? *nameLength : bufferSize;
+ if (copyBytes > 0)
+ memcpy(nameBuffer, namePtr, copyBytes);
+diff -ur TECkit-2.5.3.orig/source/Engine.h TECkit-2.5.3/source/Engine.h
+--- TECkit-2.5.3.orig/source/Engine.h 2011-01-13 20:38:34.000000000 +0100
++++ TECkit-2.5.3/source/Engine.h 2012-03-17 17:43:26.000000000 +0100
+@@ -117,7 +117,7 @@
+
+ UInt32 match(int index, int repeats, int textLoc);
+ // returns 0 for no match, 1 for match, or kNeedMoreInput/kInvalidChar
+- MatchElem* pattern;
++ const MatchElem* pattern;
+ int patternLength;
+ int direction;
+ MatchInfo info[256];
+diff -ur TECkit-2.5.3.orig/source/Public-headers/TECkit_Compiler.h TECkit-2.5.3/source/Public-headers/TECkit_Compiler.h
+--- TECkit-2.5.3.orig/source/Public-headers/TECkit_Compiler.h 2011-01-13 20:38:34.000000000 +0100
++++ TECkit-2.5.3/source/Public-headers/TECkit_Compiler.h 2012-03-17 17:43:26.000000000 +0100
+@@ -56,7 +56,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
+@@ -75,7 +75,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.3.orig/source/Sample-tools/TECkit_Compile.cpp TECkit-2.5.3/source/Sample-tools/TECkit_Compile.cpp
+--- TECkit-2.5.3.orig/source/Sample-tools/TECkit_Compile.cpp 2011-01-13 20:38:34.000000000 +0100
++++ TECkit-2.5.3/source/Sample-tools/TECkit_Compile.cpp 2012-03-17 17:43:26.000000000 +0100
+@@ -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)
+ {
+ #pragma unused(userData)
+