update patches from texlive

to texlive-bin-2018.20180907.48586/libs/teckit/TLpatches

9 files changed, 115 insertions, 63 deletions

diff --git a/debian/patches/ChangeLog b/debian/patches/ChangeLog
index ffb9e3a..2eb695c 100644
--- a/debian/patches/ChangeLog
+++ b/debian/patches/ChangeLog
@@ -1,3 +1,29 @@
+2018-07-24  Akira Kakuto  <kakuto@.fuk.kindai.ac.jp>
+
+	Imported TECkit-2.5.8 source tree (teckit) from
+	https://github.com/silnrsi/teckit/archive/2.5.8.tar.gz.
+	patch-02-warning, patch-03-warnings, patch-04-pragmas,
+	patch-05-static, and patch patch-06-dont-build-sfconv: Adapted.
+
+2017-06-27  Akira Kakuto  <kakuto@.fuk.kindai.ac.jp>
+
+	Imported TECkit-2.5.7 source tree (teckit) from
+	https://github.com/silnrsi/teckit/archive/2.5.7.tar.gz.
+	patch-02-warning, patch-03-warnings, patch-04-pragmas,
+	patch-05-static, and patch patch-06-dont-build-sfconv: Adapted.
+
+2017-01-11  Norbert Preining  <norbert@preining.info>
+
+	Remove SFconv directory, contains non-free ConvertUTF.{c,h}
+	Add patch patch-06-dont-build-sfconv to not build sfconv.
+
+2016-12-30  Akira Kakuto  <kakuto@.fuk.kindai.ac.jp>
+
+	Imported TECkit-2.5.6 source tree (teckit) from
+	https://github.com/silnrsi/teckit/archive/2.5.6.tar.gz.
+	patch-02-warning, patch-03-warnings, patch-04-pragmas, and
+	patch-05-static: Adapted.
+
 2014-07-18  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	Imported TECkit-2.5.4 source tree (teckit) from
diff --git a/debian/patches/README.patches b/debian/patches/README.patches
index ff5ba16..32fcf71 100644
--- a/debian/patches/README.patches
+++ b/debian/patches/README.patches
@@ -1,5 +1,5 @@
 These patches have come from the texlive-bin source
 
-texlive-bin-2015.20150524.37493/libs/teckit/TECkit-2.5.4-PATCHES
+texlive-bin-2018.20180907.48586/libs/teckit/TLpatches
 
-2015-11-14
+2018-10-31
diff --git a/debian/patches/TL-Changes b/debian/patches/TL-Changes
index 1d3e207..9667ecd 100644
--- a/debian/patches/TL-Changes
+++ b/debian/patches/TL-Changes
@@ -1,6 +1,5 @@
-Changes applied to the TECkit-2.5.4/ tree obtained from:
-	http://scripts.sil.org/svn-public/teckit/TRUNK
-	(svn r139 2014-07-09 14:47:39 UTC).
+Changes applied to the TECkit-2.5.8/ tree obtained from:
+	https://github.com/silnrsi/teckit/archive/2.5.8.tar.gz.
 
 Removed execute permissions from:
 	installed-top.pc.in
@@ -8,20 +7,22 @@ Removed execute permissions from:
 	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/
+	aclocal.m4
+	bin/Makefile.in
+	compile
+	config.guess
+	config.sub
+	configure
+	decomp
+	docs/Makefile.in
+	install-sh
+	lib/Makefile.in
+	ltmain.sh
+	Makefile.in
+	missing
+	test/Makefile.in
+	test-driver
+	SFconv/
 	zlib-1.2.3/
 
 Converted Dos/Win line ends to native:
@@ -33,7 +34,3 @@ Converted Dos/Win line ends to native:
 	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/debian/patches/patch-02-warning b/debian/patches/patch-02-warning
index 31e29ec..05b1fe1 100644
--- a/debian/patches/patch-02-warning
+++ b/debian/patches/patch-02-warning
@@ -1,8 +1,8 @@
 	Avoid compiler warning.
 
-diff -ur TECkit-2.5.4.orig/source/Compiler.h TECkit-2.5.4/source/Compiler.h
---- TECkit-2.5.4.orig/source/Compiler.h	2014-07-01 02:13:39.000000000 +0200
-+++ TECkit-2.5.4/source/Compiler.h	2014-07-18 10:59:53.000000000 +0200
+diff -ur teckit-2.5.8/source/Compiler.h teckit-src/source/Compiler.h
+--- teckit-2.5.8/source/Compiler.h	Tue Dec 05 07:20:20 2017
++++ teckit-src/source/Compiler.h	Tue Jul 24 07:21:23 2018
 @@ -230,7 +230,7 @@
  		vector<UInt32>		byteClassLines;
  		vector<UInt32>		uniClassLines;
diff --git a/debian/patches/patch-03-warnings b/debian/patches/patch-03-warnings
index f157ad0..011670a 100644
--- a/debian/patches/patch-03-warnings
+++ b/debian/patches/patch-03-warnings
@@ -1,8 +1,8 @@
 	Avoid more compiler warnings.
 
-diff -ur TECkit-2.5.4.orig/source/Compiler.cpp TECkit-2.5.4/source/Compiler.cpp
---- TECkit-2.5.4.orig/source/Compiler.cpp	2014-07-01 02:13:39.000000000 +0200
-+++ TECkit-2.5.4/source/Compiler.cpp	2014-07-18 11:01:30.000000000 +0200
+diff -ur teckit-2.5.8/source/Compiler.cpp teckit-src/source/Compiler.cpp
+--- teckit-2.5.8/source/Compiler.cpp	Tue Dec 05 07:20:20 2017
++++ teckit-src/source/Compiler.cpp	Tue Jul 24 07:23:53 2018
 @@ -189,14 +189,14 @@
  		free(table);
  }
@@ -29,10 +29,11 @@ diff -ur TECkit-2.5.4.orig/source/Compiler.cpp TECkit-2.5.4/source/Compiler.cpp
  	errorState = true;
  	++errorCount;
  }
-diff -ur TECkit-2.5.4.orig/source/Engine.cpp TECkit-2.5.4/source/Engine.cpp
---- TECkit-2.5.4.orig/source/Engine.cpp	2014-07-01 02:13:39.000000000 +0200
-+++ TECkit-2.5.4/source/Engine.cpp	2014-07-18 11:01:30.000000000 +0200
-@@ -1087,7 +1087,7 @@
+
+diff -ur teckit-2.5.8/source/Engine.cpp teckit-src/source/Engine.cpp
+--- teckit-2.5.8/source/Engine.cpp	Tue Dec 05 07:20:20 2017
++++ teckit-src/source/Engine.cpp	Tue Jul 24 07:39:17 2018
+@@ -1093,7 +1075,7 @@
  			if (matchElems == 0 && allowInsertion == false)
  				continue;
  			patternLength = matchElems + READ(rule->postLength);
@@ -41,7 +42,7 @@ diff -ur TECkit-2.5.4.orig/source/Engine.cpp TECkit-2.5.4/source/Engine.cpp
  			direction = 1;
  			infoLimit = matchElems;
  
-@@ -2184,7 +2184,7 @@
+@@ -2194,7 +2168,7 @@
  				status = kStatus_BadMappingVersion;
  			else {
  				const Byte*	namePtr;
@@ -50,9 +51,10 @@ diff -ur TECkit-2.5.4.orig/source/Engine.cpp TECkit-2.5.4/source/Engine.cpp
  					UInt16	copyBytes = *nameLength < bufferSize ? *nameLength : bufferSize;
  					if (copyBytes > 0)
  						memcpy(nameBuffer, namePtr, copyBytes);
-diff -ur TECkit-2.5.4.orig/source/Engine.h TECkit-2.5.4/source/Engine.h
---- TECkit-2.5.4.orig/source/Engine.h	2014-07-01 02:13:39.000000000 +0200
-+++ TECkit-2.5.4/source/Engine.h	2014-07-18 11:01:30.000000000 +0200
+
+diff -ur teckit-2.5.8/source/Engine.h teckit-src/source/Engine.h
+--- teckit-2.5.8/source/Engine.h	Tue Dec 05 07:20:20 2017
++++ teckit-src/source/Engine.h	Tue Jul 24 07:29:14 2018
 @@ -117,7 +117,7 @@
  
  	UInt32				match(int index, int repeats, int textLoc);
@@ -62,10 +64,11 @@ diff -ur TECkit-2.5.4.orig/source/Engine.h TECkit-2.5.4/source/Engine.h
  	int					patternLength;
  	int					direction;
  	MatchInfo			info[256];
-diff -ur TECkit-2.5.4.orig/source/Public-headers/TECkit_Compiler.h TECkit-2.5.4/source/Public-headers/TECkit_Compiler.h
---- TECkit-2.5.4.orig/source/Public-headers/TECkit_Compiler.h	2014-07-01 02:13:39.000000000 +0200
-+++ TECkit-2.5.4/source/Public-headers/TECkit_Compiler.h	2014-07-18 11:01:30.000000000 +0200
-@@ -56,7 +56,7 @@
+
+diff -ur teckit-2.5.8/source/Public-headers/TECkit_Compiler.h teckit-src/source/Public-headers/TECkit_Compiler.h
+--- teckit-2.5.8/source/Public-headers/TECkit_Compiler.h	Tue Dec 05 07:20:20 2017
++++ teckit-src/source/Public-headers/TECkit_Compiler.h	Tue Jul 24 07:41:00 2018
+@@ -56,7 +59,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 */
  
@@ -74,7 +77,7 @@ diff -ur TECkit-2.5.4.orig/source/Public-headers/TECkit_Compiler.h TECkit-2.5.4/
  
  TECkit_Status
  WINAPI EXPORTED
-@@ -75,7 +75,7 @@
+@@ -75,7 +78,7 @@
  TECkit_GetCompilerVersion();
  
  /* new APIs for looking up Unicode names (as NUL-terminated C strings) */
@@ -83,9 +86,11 @@ diff -ur TECkit-2.5.4.orig/source/Public-headers/TECkit_Compiler.h TECkit-2.5.4/
  WINAPI EXPORTED
  TECkit_GetUnicodeName(UInt32 usv);
  	/* returns the Unicode name of usv, if available, else NULL */
-diff -ur TECkit-2.5.4.orig/source/Sample-tools/TECkit_Compile.cpp TECkit-2.5.4/source/Sample-tools/TECkit_Compile.cpp
---- TECkit-2.5.4.orig/source/Sample-tools/TECkit_Compile.cpp	2014-07-01 02:13:39.000000000 +0200
-+++ TECkit-2.5.4/source/Sample-tools/TECkit_Compile.cpp	2014-07-18 11:07:05.000000000 +0200
+
+
+diff -ur teckit-2.5.8/source/Sample-tools/TECkit_Compile.cpp teckit-src/source/Sample-tools/TECkit_Compile.cpp
+--- teckit-2.5.8/source/Sample-tools/TECkit_Compile.cpp	Tue Dec 05 07:20:20 2017
++++ teckit-src/source/Sample-tools/TECkit_Compile.cpp	Tue Jul 24 07:34:18 2018
 @@ -24,13 +24,13 @@
  #endif
  
@@ -98,7 +103,7 @@ diff -ur TECkit-2.5.4.orig/source/Sample-tools/TECkit_Compile.cpp TECkit-2.5.4/s
  void
  CALLBACK
 -errFunc(void* /*userData*/, char* msg, char* param, UInt32 line)
-+errFunc(void* /*userData*/, const char* msg, const char* param, UInt32 line)
++errFunc(void* /* userData */, const char* msg, const char* param, UInt32 line)
  {
  	fprintf(stderr, "%s", msg);
  	if (param != 0)
diff --git a/debian/patches/patch-04-pragmas b/debian/patches/patch-04-pragmas
index fc75d22..601f397 100644
--- a/debian/patches/patch-04-pragmas
+++ b/debian/patches/patch-04-pragmas
@@ -1,50 +1,60 @@
 	Remove the '#pragma's, they seem to cause problems for MSVC
 	and are certainly not needed otherwise.
 
-diff -ur TECkit-2.5.4.orig/source/Engine.cpp TECkit-2.5.4/source/Engine.cpp
---- TECkit-2.5.4.orig/source/Engine.cpp	2014-07-18 11:01:30.000000000 +0200
-+++ TECkit-2.5.4/source/Engine.cpp	2014-07-18 11:11:09.000000000 +0200
-@@ -102,8 +102,6 @@
+diff -ur teckit-2.5.8/source/Engine.cpp teckit-src/source/Engine.cpp
+--- teckit-2.5.8/source/Engine.cpp	Tue Dec 05 07:20:20 2017
++++ teckit-src/source/Engine.cpp	Tue Jul 24 07:39:17 2018
+@@ -102,10 +96,6 @@
  #endif
  }
  
+-#ifndef __GNUC__
 -#pragma mark --- class Stage ---
+-#endif
 -
  Stage::Stage()
  	: oBuffer(0)
  	, oBufSize(0)
-@@ -125,8 +123,6 @@
+@@ -127,10 +117,6 @@
  	return 0;
  }
  
+-#ifndef __GNUC__
 -#pragma mark --- class Normalizer ---
+-#endif
 -
  #include "NormalizationData.c"
  
  Normalizer::Normalizer(bool compose)
-@@ -396,8 +392,6 @@
+@@ -400,10 +386,6 @@
  	return c;
  }
  
+-#ifndef __GNUC__
 -#pragma mark --- class Pass ---
+-#endif
 -
  Pass::Pass(const TableHeader* inTable, Converter* cnv)
  	: converter(cnv)
  	, tableHeader(inTable)
-@@ -1282,8 +1276,6 @@
+@@ -1288,10 +1270,6 @@
  	return 0;
  }
  
+-#ifndef __GNUC__
 -#pragma mark --- class Converter ---
+-#endif
 -
  Converter::Converter(const Byte* inTable, UInt32 inTableSize, bool inForward,
  						UInt16 inForm, UInt16 outForm)
  	: table(0)
-@@ -1934,8 +1926,6 @@
+@@ -1942,10 +1920,6 @@
  	return true;
  }
  
+-#ifndef __GNUC__
 -#pragma mark --- Public "C" API functions ---
+-#endif
 -
  TECkit_Status
  WINAPI
diff --git a/debian/patches/patch-05-static b/debian/patches/patch-05-static
index 2e90b8f..e3a646c 100644
--- a/debian/patches/patch-05-static
+++ b/debian/patches/patch-05-static
@@ -1,8 +1,9 @@
 	For TeX Live we build a static library and not a Dll.
 
-diff -ur TECkit-2.5.4.orig/source/Engine.cpp TECkit-2.5.4/source/Engine.cpp
---- TECkit-2.5.4.orig/source/Engine.cpp	2014-07-18 11:11:09.000000000 +0200
-+++ TECkit-2.5.4/source/Engine.cpp	2014-07-18 11:18:02.000000000 +0200
+
+diff -ur teckit-2.5.8/source/Engine.cpp teckit-src/source/Engine.cpp
+--- teckit-2.5.8/source/Engine.cpp	Tue Dec 05 07:20:20 2017
++++ teckit-src/source/Engine.cpp	Tue Jul 24 07:39:17 2018
 @@ -51,12 +51,6 @@
  #	define NOSERVICE
  #	define NOMCX
@@ -16,9 +17,10 @@ diff -ur TECkit-2.5.4.orig/source/Engine.cpp TECkit-2.5.4/source/Engine.cpp
  #endif
  
  #include "Engine.h"
-diff -ur TECkit-2.5.4.orig/source/Public-headers/TECkit_Compiler.h TECkit-2.5.4/source/Public-headers/TECkit_Compiler.h
---- TECkit-2.5.4.orig/source/Public-headers/TECkit_Compiler.h	2014-07-18 11:01:30.000000000 +0200
-+++ TECkit-2.5.4/source/Public-headers/TECkit_Compiler.h	2014-07-18 11:18:02.000000000 +0200
+
+diff -ur teckit-2.5.8/source/Public-headers/TECkit_Compiler.h teckit-src/source/Public-headers/TECkit_Compiler.h
+--- teckit-2.5.8/source/Public-headers/TECkit_Compiler.h	Tue Dec 05 07:20:20 2017
++++ teckit-src/source/Public-headers/TECkit_Compiler.h	Tue Jul 24 07:41:00 2018
 @@ -30,6 +30,9 @@
  #ifdef _WIN32
  /* MS compiler has predefined _WIN32, so assume Windows target  */
@@ -29,9 +31,10 @@ diff -ur TECkit-2.5.4.orig/source/Public-headers/TECkit_Compiler.h TECkit-2.5.4/
  #else
  /* not the MS compiler, so try Metrowerks' platform macros */
  #ifndef __APPLE__
-diff -ur TECkit-2.5.4.orig/source/Public-headers/TECkit_Engine.h TECkit-2.5.4/source/Public-headers/TECkit_Engine.h
---- TECkit-2.5.4.orig/source/Public-headers/TECkit_Engine.h	2014-07-01 02:13:39.000000000 +0200
-+++ TECkit-2.5.4/source/Public-headers/TECkit_Engine.h	2014-07-18 11:18:02.000000000 +0200
+
+diff -ur teckit-2.5.8/source/Public-headers/TECkit_Engine.h teckit-src/source/Public-headers/TECkit_Engine.h
+--- teckit-2.5.8/source/Public-headers/TECkit_Engine.h	Tue Dec 05 07:20:20 2017
++++ teckit-src/source/Public-headers/TECkit_Engine.h	Tue Jul 24 07:42:14 2018
 @@ -80,6 +80,9 @@
  #ifdef _WIN32
  /* MS compiler has predefined _WIN32, so assume Windows target  */
diff --git a/debian/patches/patch-06-dont-build-sfconv b/debian/patches/patch-06-dont-build-sfconv
new file mode 100644
index 0000000..86288ad
--- /dev/null
+++ b/debian/patches/patch-06-dont-build-sfconv
@@ -0,0 +1,10 @@
+diff -ur teckit-2.5.8/bin/Makefile.am teckit-src/bin/Makefile.am
+--- teckit-2.5.8/bin/Makefile.am	Tue Dec 05 07:20:20 2017
++++ teckit-src/bin/Makefile.am	Tue Jul 24 07:44:12 2018
+@@ -1,6 +1,6 @@
+ AUTOMAKE_OPTIONS = -Wno-portability
+ 
+-bin_PROGRAMS = teckit_compile txtconv sfconv
++bin_PROGRAMS = teckit_compile txtconv
+ 
+ AM_CPPFLAGS  = -I$(top_srcdir)/source/Public-headers
diff --git a/debian/patches/series b/debian/patches/series
index d6f4327..ab9da36 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ patch-02-warning
 patch-03-warnings
 patch-04-pragmas
 #patch-05-static
+#patch-06-dont-build-sfconv