update to 8.6.8

author: Andrew Sun 2018-06-14 20:20:18 -0400
committer: Andrew Sun 2018-06-14 20:20:18 -0400
commit: b932705eb9b7d11eb890c8c4e54946e9998b58ce (patch)
tree: 5cd7a8eb97d0579d64ea66ef5d336f5bb6f259d3
parent: 6e3d6d05ec9ccdb183d2f8e671e7f31dbaa28e29 (diff)
download: aur-b932705eb9b7d11eb890c8c4e54946e9998b58ce.tar.gz
14 files changed, 487 insertions, 227 deletions
diff --git a/.SRCINFO b/.SRCINFO
index bf423bd782db..f185f37c3c9a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,29 +1,37 @@
-# Generated by mksrcinfo v8
-# Mon Nov 13 18:08:21 UTC 2017
 pkgbase = mingw-w64-tcl
 	pkgdesc = The Tcl scripting language (mingw-w64)
-	pkgver = 8.6.7
+	pkgver = 8.6.8
 	pkgrel = 1
 	url = http://tcl.sourceforge.net
 	arch = any
 	license = custom
-	makedepends = mingw-w64-gcc
+	makedepends = mingw-w64-configure
 	makedepends = tcl
 	depends = mingw-w64-crt
 	depends = mingw-w64-zlib
 	options = staticlibs
 	options = !strip
 	options = !buildflags
-	source = http://downloads.sourceforge.net/sourceforge/tcl/tcl8.6.7-src.tar.gz
-	source = tcl-8.5.14-autopath.patch
-	source = tcl-8.5.14-hidden.patch
-	source = tcl-8.6.1-mingwexcept.patch
-	source = tcl-mingw-w64-compatibility.patch
-	sha256sums = 7c6b8f84e37332423cfe5bae503440d88450da8cc1243496249faa5268026ba5
-	sha256sums = 3cb435f768052acabe5b1fbef5ae9a8d0967b0f86f7695fb4bae8953ee470357
-	sha256sums = a809617939336a0068c5dd567f2c25489b2824ca25ad20f9cbf4e74c81396d2e
-	sha256sums = 77b7509f3677fe659a70994f664444c1f0e99899bd3e73cba71caa4ccb24ebd4
-	sha256sums = 866fe923b7d43339bea8a8484299ba71ebdb3a7213508809f2adae4eff60a382
+	source = http://downloads.sourceforge.net/sourceforge/tcl/tcl8.6.8-src.tar.gz
+	source = 001-fix-relocation.patch
+	source = 002-fix-forbidden-colon-in-paths.mingw.patch
+	source = 004-use-system-zlib.mingw.patch
+	source = 005-no-xc.mingw.patch
+	source = 006-proper-implib-name.mingw.patch
+	source = 007-install.mingw.patch
+	source = 008-tcl-8.5.14-hidden.patch
+	source = 009-fix-using-gnu-print.patch
+	source = 010-dont-link-shared-with--static-libgcc.patch
+	sha256sums = c43cb0c1518ce42b00e7c8f6eaddd5195c53a98f94adc717234a65cbcfd3f96a
+	sha256sums = cfcf9b3816f8bb063b514ac7f63a5ba73108f27e16fdf8e8312dc5f0683083f6
+	sha256sums = 70bf0d8e84985f4e8ee63447ad37d5e50376eaf35ace51112761cacbbd596c4c
+	sha256sums = 931485d71969096c1d03c8bed24fae3922d143fe50820d913e2567492ad6ac41
+	sha256sums = 2b0f41f6704aa964dbfafa0a65dd5ce0ab97e82ff5cbbe2a95a2e8d644cc5550
+	sha256sums = 5c0162fbb018c03b3e4b907bd0098ab5282314bc212e3929a0416126637e1350
+	sha256sums = f1833c3164229b017417d2ab2ce4cb066252fc1ad256de2313f0239481c7cc37
+	sha256sums = 3ec2702efb1be6873d6ffd2ffb357637588f835f8817ae65cf0373020fcc7359
+	sha256sums = 9c66ffe2de1d543f5291367d562ed5ee94e7e67345b281605788d7d9e02b8e7b
+	sha256sums = 2cd861f04321622722c87f7247a0586e547e4daf95a7dfe94ecd2cbfe45c37fd
 
 pkgname = mingw-w64-tcl
 
diff --git a/001-fix-relocation.patch b/001-fix-relocation.patch
new file mode 100644
index 000000000000..89715d11b362
--- /dev/null
+++ b/001-fix-relocation.patch
@@ -0,0 +1,20 @@
+--- tcl8.6.7/win/tclWinInit.orig.c	2017-05-08 18:06:31.000000000 +0200
++++ tcl8.6.7/win/tclWinInit.c	2017-11-29 00:00:42.764038800 +0100
+@@ -366,7 +366,7 @@
+     end = strrchr(name, '\\');
+     *end = '\0';
+     p = strrchr(name, '\\');
+-    if (p != NULL) {
++    if (p != NULL && !strcmp(p+1, "bin")) {
+ 	end = p;
+     }
+     *end = '\\';
+@@ -417,7 +417,7 @@
+     end = strrchr(name, '\\');
+     *end = '\0';
+     p = strrchr(name, '\\');
+-    if (p != NULL) {
++    if (p != NULL && !strcmp(p+1, "bin")) {
+ 	end = p;
+     }
+     *end = '\\';
diff --git a/002-fix-forbidden-colon-in-paths.mingw.patch b/002-fix-forbidden-colon-in-paths.mingw.patch
new file mode 100644
index 000000000000..333e8b00a951
--- /dev/null
+++ b/002-fix-forbidden-colon-in-paths.mingw.patch
@@ -0,0 +1,12 @@
+diff -Naur tcl8.6.5-orig/unix/installManPage tcl8.6.5/unix/installManPage
+--- tcl8.6.5-orig/unix/installManPage	2016-03-01 04:59:35.000000000 +0300
++++ tcl8.6.5/unix/installManPage	2016-03-03 08:47:43.725911500 +0300
+@@ -103,7 +103,7 @@
+     Target=$Target.$Section$Suffix
+     rm -f $Dir/$Target $Dir/$Target.*
+     if test -z "$First" ; then
+-	First=$Target
++	First=$(echo $Target | sed -e 's/:/-/g')
+ 	sed -e "/man\.macros/r $SrcDir/man.macros" -e "/man\.macros/d" \
+ 	    $ManPage > $Dir/$First
+ 	chmod 444 $Dir/$First
diff --git a/004-use-system-zlib.mingw.patch b/004-use-system-zlib.mingw.patch
new file mode 100644
index 000000000000..9e338917f5e8
--- /dev/null
+++ b/004-use-system-zlib.mingw.patch
@@ -0,0 +1,77 @@
+diff -Naur tcl8.6.5-orig/win/configure.in tcl8.6.5/win/configure.in
+--- tcl8.6.5-orig/win/configure.in	2016-03-01 04:59:35.000000000 +0300
++++ tcl8.6.5/win/configure.in	2016-03-03 08:47:47.115572500 +0300
+@@ -127,16 +127,7 @@
+   tcl_ok=yes
+ ])
+ AS_IF([test "$tcl_ok" = "yes"], [
+-  AC_SUBST(ZLIB_DLL_FILE,[\${ZLIB_DLL_FILE}])
+-  AS_IF([test "$do64bit" = "yes"], [
+-    AS_IF([test "$GCC" == "yes"],[
+-      AC_SUBST(ZLIB_LIBS,[\${ZLIB_DIR_NATIVE}/win64/libz.dll.a])
+-    ], [
+-      AC_SUBST(ZLIB_LIBS,[\${ZLIB_DIR_NATIVE}/win64/zdll.lib])
+-    ])
+-  ], [
+-    AC_SUBST(ZLIB_LIBS,[\${ZLIB_DIR_NATIVE}/win32/zdll.lib])
+-  ])
++    AC_SUBST(ZLIB_LIBS,[-lz])
+ ], [
+   AC_SUBST(ZLIB_OBJS,[\${ZLIB_OBJS}])
+ ])
+diff -Naur tcl8.6.5-orig/win/Makefile.in tcl8.6.5/win/Makefile.in
+--- tcl8.6.5-orig/win/Makefile.in	2016-03-01 04:59:35.000000000 +0300
++++ tcl8.6.5/win/Makefile.in	2016-03-03 08:47:47.129571100 +0300
+@@ -146,9 +146,8 @@
+ REG_LIB_FILE		= @LIBPREFIX@tclreg$(REGVER)${LIBSUFFIX}
+ TEST_DLL_FILE		= tcltest$(VER)${DLLSUFFIX}
+ TEST_LIB_FILE		= @LIBPREFIX@tcltest$(VER)${LIBSUFFIX}
+-ZLIB_DLL_FILE		= zlib1.dll
+ 
+-SHARED_LIBRARIES 	= $(TCL_DLL_FILE) @ZLIB_DLL_FILE@
++SHARED_LIBRARIES 	= $(TCL_DLL_FILE)
+ STATIC_LIBRARIES	= $(TCL_LIB_FILE)
+ 
+ TCLSH			= tclsh$(VER)${EXESUFFIX}
+@@ -188,7 +187,7 @@
+ SHLIB_LD_LIBS	= @SHLIB_LD_LIBS@
+ SHLIB_CFLAGS	= @SHLIB_CFLAGS@
+ SHLIB_SUFFIX	= @SHLIB_SUFFIX@
+-LIBS		= @LIBS@ $(shell $(CYGPATH) '@ZLIB_LIBS@')
++LIBS		= @LIBS@ @ZLIB_LIBS@
+ 
+ RMDIR		= rm -rf
+ MKDIR		= mkdir -p
+@@ -446,7 +445,7 @@
+ 	@MAKE_STUB_LIB@ ${STUB_OBJS}
+ 	@POST_MAKE_LIB@
+ 
+-${TCL_DLL_FILE}: ${TCL_OBJS} tcl.$(RES) @ZLIB_DLL_FILE@
++${TCL_DLL_FILE}: ${TCL_OBJS} tcl.$(RES)
+ 	@$(RM) ${TCL_DLL_FILE} $(TCL_LIB_FILE)
+ 	@MAKE_DLL@ ${TCL_OBJS} tcl.$(RES) $(SHLIB_LD_LIBS)
+ 	@VC_MANIFEST_EMBED_DLL@
+@@ -466,14 +465,6 @@
+ 	@$(RM) ${TEST_DLL_FILE} ${TEST_LIB_FILE}
+ 	@MAKE_DLL@ ${TCLTEST_OBJS} $(TCL_STUB_LIB_FILE) $(SHLIB_LD_LIBS)
+ 
+-# use pre-built zlib1.dll
+-${ZLIB_DLL_FILE}: ${TCL_STUB_LIB_FILE}
+-	@if test "@ZLIB_LIBS@set" != "${ZLIB_DIR_NATIVE}/win32/zdll.libset" ; then \
+-		$(COPY) $(ZLIB_DIR)/win64/${ZLIB_DLL_FILE} ${ZLIB_DLL_FILE}; \
+-	else \
+-		$(COPY) $(ZLIB_DIR)/win32/${ZLIB_DLL_FILE} ${ZLIB_DLL_FILE}; \
+-	fi;
+-
+ # Add the object extension to the implicit rules. By default .obj is not
+ # automatically added.
+ 
+@@ -579,7 +570,7 @@
+ 		else true; \
+ 		fi; \
+ 	    done;
+-	@for i in $(TCL_DLL_FILE) $(ZLIB_DLL_FILE) $(TCLSH); \
++	@for i in $(TCL_DLL_FILE) $(TCLSH); \
+ 	    do \
+ 	    if [ -f $$i ]; then \
+ 		echo "Installing $$i to $(BIN_INSTALL_DIR)/"; \
diff --git a/005-no-xc.mingw.patch b/005-no-xc.mingw.patch
new file mode 100644
index 000000000000..77a92fd47dd9
--- /dev/null
+++ b/005-no-xc.mingw.patch
@@ -0,0 +1,19 @@
+diff -Naur tcl8.6.5-orig/win/configure.in tcl8.6.5/win/configure.in
+--- tcl8.6.5-orig/win/configure.in	2016-03-03 08:47:47.861497900 +0300
++++ tcl8.6.5/win/configure.in	2016-03-03 08:47:47.952488800 +0300
+@@ -105,15 +105,7 @@
+ 
+ SC_CONFIG_CFLAGS
+ 
+-# Cross-compiling
+-case ${host_alias} in
+-*mingw32*)
+-    TCL_EXE="tclsh"
+-    ;;
+-*)
+     TCL_EXE="TCL_LIBRARY=\"\${LIBRARY_DIR}\"; export TCL_LIBRARY; ./\${TCLSH}"
+-    ;;
+-esac
+ 
+ #------------------------------------------------------------------------
+ #	Add stuff for zlib; note that this is mostly done in the makefile now
diff --git a/006-proper-implib-name.mingw.patch b/006-proper-implib-name.mingw.patch
new file mode 100644
index 000000000000..01f459f79447
--- /dev/null
+++ b/006-proper-implib-name.mingw.patch
@@ -0,0 +1,47 @@
+diff -Naur tcl8.6.5-orig/win/configure.in tcl8.6.5/win/configure.in
+--- tcl8.6.5-orig/win/configure.in	2016-03-03 08:47:48.632420800 +0300
++++ tcl8.6.5/win/configure.in	2016-03-03 08:47:48.753408700 +0300
+@@ -284,7 +284,12 @@
+ eval "TCL_BUILD_STUB_LIB_PATH=\"`$CYGPATH $(pwd)`/${TCL_STUB_LIB_FILE}\""
+ eval "TCL_STUB_LIB_PATH=\"${libdir}/${TCL_STUB_LIB_FILE}\""
+ 
+-eval "TCL_LIB_FILE=\"${LIBPREFIX}tcl${VER}${LIBSUFFIX}\""
++if test ${SHARED_BUILD} = 0 ; then
++ eval "TCL_LIB_FILE=\"${LIBPREFIX}tcl${VER}${LIBSUFFIX}\""
++else
++ eval "TCL_LIB_FILE=\"${LIBPREFIX}tcl${VER}${DLLSUFFIX}.a\""
++fi
++
+ eval "TCL_BUILD_LIB_SPEC=\"-L`$CYGPATH $(pwd)` -ltcl${VER}${FLAGSUFFIX}\""
+ eval "TCL_LIB_SPEC=\"-L${libdir} -ltcl${VER}${FLAGSUFFIX}\""
+ 
+diff -Naur tcl8.6.5-orig/win/Makefile.in tcl8.6.5/win/Makefile.in
+--- tcl8.6.5-orig/win/Makefile.in	2016-03-03 08:47:47.868497200 +0300
++++ tcl8.6.5/win/Makefile.in	2016-03-03 08:47:48.739410100 +0300
+@@ -141,11 +141,11 @@
+ TCL_DLL_FILE		= @TCL_DLL_FILE@
+ TCL_LIB_FILE		= @TCL_LIB_FILE@
+ DDE_DLL_FILE		= tcldde$(DDEVER)${DLLSUFFIX}
+-DDE_LIB_FILE		= @LIBPREFIX@tcldde$(DDEVER)${LIBSUFFIX}
++DDE_LIB_FILE		= @LIBPREFIX@tcldde$(DDEVER)${DLLSUFFIX}${LIBSUFFIX}
+ REG_DLL_FILE		= tclreg$(REGVER)${DLLSUFFIX}
+-REG_LIB_FILE		= @LIBPREFIX@tclreg$(REGVER)${LIBSUFFIX}
++REG_LIB_FILE		= @LIBPREFIX@tclreg$(REGVER)${DLLSUFFIX}${LIBSUFFIX}
+ TEST_DLL_FILE		= tcltest$(VER)${DLLSUFFIX}
+-TEST_LIB_FILE		= @LIBPREFIX@tcltest$(VER)${LIBSUFFIX}
++TEST_LIB_FILE		= @LIBPREFIX@tcltest$(VER)${DLLSUFFIX}${LIBSUFFIX}
+ 
+ SHARED_LIBRARIES 	= $(TCL_DLL_FILE)
+ STATIC_LIBRARIES	= $(TCL_LIB_FILE)
+diff -Naur tcl8.6.5-orig/win/tcl.m4 tcl8.6.5/win/tcl.m4
+--- tcl8.6.5-orig/win/tcl.m4	2016-03-01 04:59:35.000000000 +0300
++++ tcl8.6.5/win/tcl.m4	2016-03-03 08:47:48.763407700 +0300
+@@ -715,7 +715,7 @@
+ 	SHLIB_LD='${CC} -shared'
+ 	SHLIB_LD_LIBS='${LIBS}'
+ 	MAKE_DLL="\${SHLIB_LD} \$(LDFLAGS) -o \[$]@ ${extra_ldflags} \
+-	    -Wl,--out-implib,\$(patsubst %.dll,lib%.a,\[$]@)"
++	    -Wl,--out-implib,\$(patsubst %.dll,lib%.dll.a,\[$]@)"
+ 	# DLLSUFFIX is separate because it is the building block for
+ 	# users of tclConfig.sh that may build shared or static.
+ 	DLLSUFFIX="\${DBGX}.dll"
diff --git a/007-install.mingw.patch b/007-install.mingw.patch
new file mode 100644
index 000000000000..15a9bad6789f
--- /dev/null
+++ b/007-install.mingw.patch
@@ -0,0 +1,57 @@
+diff -Naur tcl8.6.5-orig/win/Makefile.in tcl8.6.5/win/Makefile.in
+--- tcl8.6.5-orig/win/Makefile.in	2016-03-03 08:47:49.434340600 +0300
++++ tcl8.6.5/win/Makefile.in	2016-03-03 08:47:49.599324100 +0300
+@@ -103,6 +103,8 @@
+ COMPAT_DIR		= $(TOP_DIR)/compat
+ PKGS_DIR		= $(TOP_DIR)/pkgs
+ ZLIB_DIR		= $(COMPAT_DIR)/zlib
++BUILD_DIR		= @builddir@
++UNIX_DIR		= $(TOP_DIR)/unix
+ 
+ # Converts a POSIX path to a Windows native path.
+ CYGPATH			= @CYGPATH@
+@@ -195,8 +197,14 @@
+ RM		= rm -f
+ COPY		= cp
+ 
++INSTALL			= $(SHELL) $(UNIX_DIR)/install-sh -c
++INSTALL_PROGRAM		= ${INSTALL}
++INSTALL_LIBRARY		= ${INSTALL}
++INSTALL_DATA		= ${INSTALL} -m 644
++INSTALL_DATA_DIR	= ${INSTALL} -d -m 755
++
+ CC_SWITCHES = ${CFLAGS} ${CFLAGS_WARNING} ${TCL_SHLIB_CFLAGS} \
+--I"${ZLIB_DIR_NATIVE}" -I"${GENERIC_DIR_NATIVE}" -DTCL_TOMMATH \
++-I"${GENERIC_DIR_NATIVE}" -DTCL_TOMMATH \
+ -DMP_PREC=4 -I"${TOMMATH_DIR_NATIVE}" -I"${WIN_DIR_NATIVE}" \
+ ${AC_FLAGS} ${COMPILE_DEBUG_FLAGS} ${NO_DEPRECATED_FLAGS}
+ 
+@@ -673,6 +681,28 @@
+ 	    "$(ROOT_DIR)/library/msgs" "$(SCRIPT_INSTALL_DIR)/msgs"
+ 
+ install-doc: doc
++	@for i in "$(MAN_INSTALL_DIR)" "$(MAN1_INSTALL_DIR)" "$(MAN3_INSTALL_DIR)" "$(MANN_INSTALL_DIR)" ; \
++	    do \
++	    if [ ! -d "$$i" ] ; then \
++		echo "Making directory $$i"; \
++		$(INSTALL_DATA_DIR) "$$i"; \
++		else true; \
++		fi; \
++	    done;
++	@echo "Installing and cross-linking top-level (.1) docs to $(MAN1_INSTALL_DIR)/";
++	@for i in $(TOP_DIR)/doc/*.1; do \
++	    $(SHELL) $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i "$(MAN1_INSTALL_DIR)"; \
++	done
++
++	@echo "Installing and cross-linking C API (.3) docs to $(MAN3_INSTALL_DIR)/";
++	@for i in $(TOP_DIR)/doc/*.3; do \
++	    $(SHELL) $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i "$(MAN3_INSTALL_DIR)"; \
++	done
++
++	@echo "Installing and cross-linking command (.n) docs to $(MANN_INSTALL_DIR)/";
++	@for i in $(TOP_DIR)/doc/*.n; do \
++	    $(SHELL) $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i "$(MANN_INSTALL_DIR)"; \
++	done
+ 
+ # Optional target to install private headers
+ install-private-headers: libraries
diff --git a/tcl-8.5.14-hidden.patch b/008-tcl-8.5.14-hidden.patch
index aa977d03a0fe..0c8055d91c30 100644
--- a/tcl-8.5.14-hidden.patch
+++ b/008-tcl-8.5.14-hidden.patch
@@ -1,8 +1,7 @@
-diff --git a/generic/tclInt.h b/generic/tclInt.h
-index 92251fe..b79edf6 100644
---- a/generic/tclInt.h
-+++ b/generic/tclInt.h
-@@ -2807,7 +2807,7 @@ MODULE_SCOPE void	TclClockInit(Tcl_Interp *interp);
+diff -Naur tcl8.6.5-orig/generic/tclInt.h tcl8.6.5/generic/tclInt.h
+--- tcl8.6.5-orig/generic/tclInt.h	2016-02-25 23:12:37.000000000 +0300
++++ tcl8.6.5/generic/tclInt.h	2016-03-03 08:47:50.393244700 +0300
+@@ -3204,7 +3204,7 @@
  MODULE_SCOPE int	TclClockOldscanObjCmd(
  			    ClientData clientData, Tcl_Interp *interp,
  			    int objc, Tcl_Obj *const objv[]);
@@ -11,8 +10,8 @@ index 92251fe..b79edf6 100644
  			    Tcl_Interp *interp, int objc,
  			    Tcl_Obj *const objv[]);
  MODULE_SCOPE int	Tcl_ConcatObjCmd(ClientData clientData,
-@@ -2968,7 +2968,7 @@ MODULE_SCOPE int	Tcl_RegsubObjCmd(ClientData clientData,
- MODULE_SCOPE int	Tcl_RenameObjCmd(ClientData clientData,
+@@ -3387,7 +3387,7 @@
+ MODULE_SCOPE int	Tcl_RepresentationCmd(ClientData clientData,
  			    Tcl_Interp *interp, int objc,
  			    Tcl_Obj *const objv[]);
 -MODULE_SCOPE int	Tcl_ReturnObjCmd(ClientData clientData,
@@ -20,10 +19,9 @@ index 92251fe..b79edf6 100644
  			    Tcl_Interp *interp, int objc,
  			    Tcl_Obj *const objv[]);
  MODULE_SCOPE int	Tcl_ScanObjCmd(ClientData clientData,
-diff --git a/generic/tclPort.h b/generic/tclPort.h
-index 12a60db..d817154 100644
---- a/generic/tclPort.h
-+++ b/generic/tclPort.h
+diff -Naur tcl8.6.5-orig/generic/tclPort.h tcl8.6.5/generic/tclPort.h
+--- tcl8.6.5-orig/generic/tclPort.h	2016-02-25 23:12:37.000000000 +0300
++++ tcl8.6.5/generic/tclPort.h	2016-03-03 08:47:50.394244600 +0300
 @@ -20,7 +20,7 @@
  #if defined(_WIN32)
  #   include "tclWinPort.h"
diff --git a/009-fix-using-gnu-print.patch b/009-fix-using-gnu-print.patch
new file mode 100644
index 000000000000..a515137080d1
--- /dev/null
+++ b/009-fix-using-gnu-print.patch
@@ -0,0 +1,27 @@
+diff -Naur tcl8.6.5-orig/generic/tcl.h tcl8.6.5/generic/tcl.h
+--- tcl8.6.5-orig/generic/tcl.h	2016-02-29 22:09:35.000000000 +0300
++++ tcl8.6.5/generic/tcl.h	2016-03-03 08:47:51.104173600 +0300
+@@ -389,7 +389,7 @@
+  */
+ 
+ #if !defined(TCL_WIDE_INT_TYPE)&&!defined(TCL_WIDE_INT_IS_LONG)
+-#   if defined(_WIN32)
++#   if defined(_WIN32) && !defined(__USE_MINGW_ANSI_STDIO)
+ #      define TCL_WIDE_INT_TYPE __int64
+ #      ifdef __BORLANDC__
+ #         define TCL_LL_MODIFIER	"L"
+diff -Naur tcl8.6.5-orig/win/tclWinInt.h tcl8.6.5/win/tclWinInt.h
+--- tcl8.6.5-orig/win/tclWinInt.h	2016-02-25 23:12:38.000000000 +0300
++++ tcl8.6.5/win/tclWinInt.h	2016-03-03 08:47:51.129171100 +0300
+@@ -45,7 +45,11 @@
+ #endif
+ 
+ #ifdef _WIN64
++# ifdef __USE_MINGW_ANSI_STDIO
++#         define TCL_I_MODIFIER        "z"
++# else
+ #         define TCL_I_MODIFIER        "I"
++# endif
+ #else
+ #         define TCL_I_MODIFIER        ""
+ #endif
diff --git a/010-dont-link-shared-with--static-libgcc.patch b/010-dont-link-shared-with--static-libgcc.patch
new file mode 100644
index 000000000000..115b6648cfe4
--- /dev/null
+++ b/010-dont-link-shared-with--static-libgcc.patch
@@ -0,0 +1,149 @@
+diff -Naur tcl8.6.8-orig/pkgs/itcl4.1.1/tclconfig/tcl.m4 tcl8.6.8/pkgs/itcl4.1.1/tclconfig/tcl.m4
+--- tcl8.6.8-orig/pkgs/itcl4.1.1/tclconfig/tcl.m4	2016-03-01 04:59:33.000000000 +0300
++++ tcl8.6.8/pkgs/itcl4.1.1/tclconfig/tcl.m4	2016-03-03 08:47:51.861097900 +0300
+@@ -3377,9 +3377,6 @@
+ 		SHLIB_LD_LIBS="${SHLIB_LD_LIBS} \"`${CYGPATH} ${TK_BIN_DIR}/${TK_STUB_LIB_FILE}`\""
+ 	    fi
+ 	    SHLIB_LD_LIBS="${SHLIB_LD_LIBS} \"`${CYGPATH} ${TCL_BIN_DIR}/${TCL_STUB_LIB_FILE}`\""
+-	    if test "$GCC" = "yes"; then
+-		SHLIB_LD_LIBS="${SHLIB_LD_LIBS} -static-libgcc"
+-	    fi
+ 	    eval eval "PKG_LIB_FILE=${PACKAGE_LIB_PREFIX}${PACKAGE_NAME}${SHARED_LIB_SUFFIX}"
+ 	else
+ 	    eval eval "PKG_LIB_FILE=${PACKAGE_LIB_PREFIX}${PACKAGE_NAME}${UNSHARED_LIB_SUFFIX}"
+diff -Naur tcl8.6.8-orig/pkgs/sqlite3.21.0/configure tcl8.6.8/pkgs/sqlite3.21.0/configure
+--- tcl8.6.8/pkgs/sqlite3.21.0/configure.orig	2016-10-06 01:33:13.323973100 -0400
++++ tcl8.6.8/pkgs/sqlite3.21.0/configure	2016-10-06 04:43:23.176595300 -0400
+@@ -8890,9 +8890,6 @@
+ 		SHLIB_LD_LIBS="${SHLIB_LD_LIBS} \"`${CYGPATH} ${TK_BIN_DIR}/${TK_STUB_LIB_FILE}`\""
+ 	    fi
+ 	    SHLIB_LD_LIBS="${SHLIB_LD_LIBS} \"`${CYGPATH} ${TCL_BIN_DIR}/${TCL_STUB_LIB_FILE}`\""
+-	    if test "$GCC" = "yes"; then
+-		SHLIB_LD_LIBS="${SHLIB_LD_LIBS} -static-libgcc"
+-	    fi
+ 	    eval eval "PKG_LIB_FILE=${PACKAGE_LIB_PREFIX}${PACKAGE_NAME}${SHARED_LIB_SUFFIX}"
+ 	else
+ 	    eval eval "PKG_LIB_FILE=${PACKAGE_LIB_PREFIX}${PACKAGE_NAME}${UNSHARED_LIB_SUFFIX}"
+diff -Naur tcl8.6.8-orig/pkgs/sqlite3.21.0/tclconfig/tcl.m4 tcl8.6.8/pkgs/sqlite3.21.0/tclconfig/tcl.m4
+--- tcl8.6.8-orig/pkgs/sqlite3.21.0/tclconfig/tcl.m4	2016-03-01 04:59:34.000000000 +0300
++++ tcl8.6.8/pkgs/sqlite3.21.0/tclconfig/tcl.m4	2016-03-03 08:47:51.902093800 +0300
+@@ -3377,9 +3377,6 @@
+ 		SHLIB_LD_LIBS="${SHLIB_LD_LIBS} \"`${CYGPATH} ${TK_BIN_DIR}/${TK_STUB_LIB_FILE}`\""
+ 	    fi
+ 	    SHLIB_LD_LIBS="${SHLIB_LD_LIBS} \"`${CYGPATH} ${TCL_BIN_DIR}/${TCL_STUB_LIB_FILE}`\""
+-	    if test "$GCC" = "yes"; then
+-		SHLIB_LD_LIBS="${SHLIB_LD_LIBS} -static-libgcc"
+-	    fi
+ 	    eval eval "PKG_LIB_FILE=${PACKAGE_LIB_PREFIX}${PACKAGE_NAME}${SHARED_LIB_SUFFIX}"
+ 	else
+ 	    eval eval "PKG_LIB_FILE=${PACKAGE_LIB_PREFIX}${PACKAGE_NAME}${UNSHARED_LIB_SUFFIX}"
+diff -Naur tcl8.6.8-orig/pkgs/tdbc1.0.6/tclconfig/tcl.m4 tcl8.6.8/pkgs/tdbc1.0.6/tclconfig/tcl.m4
+--- tcl8.6.8-orig/pkgs/tdbc1.0.6/tclconfig/tcl.m4	2015-10-13 14:57:48.000000000 +0300
++++ tcl8.6.8/pkgs/tdbc1.0.6/tclconfig/tcl.m4	2016-03-03 08:47:51.940090000 +0300
+@@ -3377,9 +3377,6 @@
+ 		SHLIB_LD_LIBS="${SHLIB_LD_LIBS} \"`${CYGPATH} ${TK_BIN_DIR}/${TK_STUB_LIB_FILE}`\""
+ 	    fi
+ 	    SHLIB_LD_LIBS="${SHLIB_LD_LIBS} \"`${CYGPATH} ${TCL_BIN_DIR}/${TCL_STUB_LIB_FILE}`\""
+-	    if test "$GCC" = "yes"; then
+-		SHLIB_LD_LIBS="${SHLIB_LD_LIBS} -static-libgcc"
+-	    fi
+ 	    eval eval "PKG_LIB_FILE=${PACKAGE_LIB_PREFIX}${PACKAGE_NAME}${SHARED_LIB_SUFFIX}"
+ 	else
+ 	    eval eval "PKG_LIB_FILE=${PACKAGE_LIB_PREFIX}${PACKAGE_NAME}${UNSHARED_LIB_SUFFIX}"
+diff -Naur tcl8.6.8-orig/pkgs/tdbcmysql1.0.6/tclconfig/tcl.m4 tcl8.6.8/pkgs/tdbcmysql1.0.6/tclconfig/tcl.m4
+--- tcl8.6.8-orig/pkgs/tdbcmysql1.0.6/tclconfig/tcl.m4	2015-10-13 14:57:39.000000000 +0300
++++ tcl8.6.8/pkgs/tdbcmysql1.0.6/tclconfig/tcl.m4	2016-03-03 08:47:51.957088300 +0300
+@@ -3377,9 +3377,6 @@
+ 		SHLIB_LD_LIBS="${SHLIB_LD_LIBS} \"`${CYGPATH} ${TK_BIN_DIR}/${TK_STUB_LIB_FILE}`\""
+ 	    fi
+ 	    SHLIB_LD_LIBS="${SHLIB_LD_LIBS} \"`${CYGPATH} ${TCL_BIN_DIR}/${TCL_STUB_LIB_FILE}`\""
+-	    if test "$GCC" = "yes"; then
+-		SHLIB_LD_LIBS="${SHLIB_LD_LIBS} -static-libgcc"
+-	    fi
+ 	    eval eval "PKG_LIB_FILE=${PACKAGE_LIB_PREFIX}${PACKAGE_NAME}${SHARED_LIB_SUFFIX}"
+ 	else
+ 	    eval eval "PKG_LIB_FILE=${PACKAGE_LIB_PREFIX}${PACKAGE_NAME}${UNSHARED_LIB_SUFFIX}"
+diff -Naur tcl8.6.8-orig/pkgs/tdbcodbc1.0.6/tclconfig/tcl.m4 tcl8.6.8/pkgs/tdbcodbc1.0.6/tclconfig/tcl.m4
+--- tcl8.6.8-orig/pkgs/tdbcodbc1.0.6/tclconfig/tcl.m4	2016-03-01 04:59:34.000000000 +0300
++++ tcl8.6.8/pkgs/tdbcodbc1.0.6/tclconfig/tcl.m4	2016-03-03 08:47:52.006083400 +0300
+@@ -3377,9 +3377,6 @@
+ 		SHLIB_LD_LIBS="${SHLIB_LD_LIBS} \"`${CYGPATH} ${TK_BIN_DIR}/${TK_STUB_LIB_FILE}`\""
+ 	    fi
+ 	    SHLIB_LD_LIBS="${SHLIB_LD_LIBS} \"`${CYGPATH} ${TCL_BIN_DIR}/${TCL_STUB_LIB_FILE}`\""
+-	    if test "$GCC" = "yes"; then
+-		SHLIB_LD_LIBS="${SHLIB_LD_LIBS} -static-libgcc"
+-	    fi
+ 	    eval eval "PKG_LIB_FILE=${PACKAGE_LIB_PREFIX}${PACKAGE_NAME}${SHARED_LIB_SUFFIX}"
+ 	else
+ 	    eval eval "PKG_LIB_FILE=${PACKAGE_LIB_PREFIX}${PACKAGE_NAME}${UNSHARED_LIB_SUFFIX}"
+diff -Naur tcl8.6.8-orig/pkgs/tdbcpostgres1.0.6/configure tcl8.6.8/pkgs/tdbcpostgres1.0.6/configure
+--- tcl8.6.8-orig/pkgs/tdbcpostgres1.0.6/configure	2016-01-28 21:07:18.000000000 +0300
++++ tcl8.6.8/pkgs/tdbcpostgres1.0.6/configure	2016-03-03 08:47:52.078076200 +0300
+@@ -9446,9 +9446,6 @@
+ 		SHLIB_LD_LIBS="${SHLIB_LD_LIBS} \"`${CYGPATH} ${TK_BIN_DIR}/${TK_STUB_LIB_FILE}`\""
+ 	    fi
+ 	    SHLIB_LD_LIBS="${SHLIB_LD_LIBS} \"`${CYGPATH} ${TCL_BIN_DIR}/${TCL_STUB_LIB_FILE}`\""
+-	    if test "$GCC" = "yes"; then
+-		SHLIB_LD_LIBS="${SHLIB_LD_LIBS} -static-libgcc"
+-	    fi
+ 	    eval eval "PKG_LIB_FILE=${PACKAGE_LIB_PREFIX}${PACKAGE_NAME}${SHARED_LIB_SUFFIX}"
+ 	else
+ 	    eval eval "PKG_LIB_FILE=${PACKAGE_LIB_PREFIX}${PACKAGE_NAME}${UNSHARED_LIB_SUFFIX}"
+diff -Naur tcl8.6.8-orig/pkgs/tdbcpostgres1.0.6/tclconfig/tcl.m4 tcl8.6.8/pkgs/tdbcpostgres1.0.6/tclconfig/tcl.m4
+--- tcl8.6.8-orig/pkgs/tdbcpostgres1.0.6/tclconfig/tcl.m4	2016-03-01 04:59:34.000000000 +0300
++++ tcl8.6.8/pkgs/tdbcpostgres1.0.6/tclconfig/tcl.m4	2016-03-03 08:47:52.275056500 +0300
+@@ -3377,9 +3377,6 @@
+ 		SHLIB_LD_LIBS="${SHLIB_LD_LIBS} \"`${CYGPATH} ${TK_BIN_DIR}/${TK_STUB_LIB_FILE}`\""
+ 	    fi
+ 	    SHLIB_LD_LIBS="${SHLIB_LD_LIBS} \"`${CYGPATH} ${TCL_BIN_DIR}/${TCL_STUB_LIB_FILE}`\""
+-	    if test "$GCC" = "yes"; then
+-		SHLIB_LD_LIBS="${SHLIB_LD_LIBS} -static-libgcc"
+-	    fi
+ 	    eval eval "PKG_LIB_FILE=${PACKAGE_LIB_PREFIX}${PACKAGE_NAME}${SHARED_LIB_SUFFIX}"
+ 	else
+ 	    eval eval "PKG_LIB_FILE=${PACKAGE_LIB_PREFIX}${PACKAGE_NAME}${UNSHARED_LIB_SUFFIX}"
+diff -Naur tcl8.6.8-orig/pkgs/tdbcsqlite3-1.0.6/tclconfig/tcl.m4 tcl8.6.8/pkgs/tdbcsqlite3-1.0.6/tclconfig/tcl.m4
+--- tcl8.6.8-orig/pkgs/tdbcsqlite3-1.0.6/tclconfig/tcl.m4	2016-03-01 04:59:34.000000000 +0300
++++ tcl8.6.8/pkgs/tdbcsqlite3-1.0.6/tclconfig/tcl.m4	2016-03-03 08:47:52.327051300 +0300
+@@ -3377,9 +3377,6 @@
+ 		SHLIB_LD_LIBS="${SHLIB_LD_LIBS} \"`${CYGPATH} ${TK_BIN_DIR}/${TK_STUB_LIB_FILE}`\""
+ 	    fi
+ 	    SHLIB_LD_LIBS="${SHLIB_LD_LIBS} \"`${CYGPATH} ${TCL_BIN_DIR}/${TCL_STUB_LIB_FILE}`\""
+-	    if test "$GCC" = "yes"; then
+-		SHLIB_LD_LIBS="${SHLIB_LD_LIBS} -static-libgcc"
+-	    fi
+ 	    eval eval "PKG_LIB_FILE=${PACKAGE_LIB_PREFIX}${PACKAGE_NAME}${SHARED_LIB_SUFFIX}"
+ 	else
+ 	    eval eval "PKG_LIB_FILE=${PACKAGE_LIB_PREFIX}${PACKAGE_NAME}${UNSHARED_LIB_SUFFIX}"
+diff -Naur tcl8.6.8-orig/pkgs/thread2.8.2/tclconfig/tcl.m4 tcl8.6.8/pkgs/thread2.8.2/tclconfig/tcl.m4
+--- tcl8.6.8-orig/pkgs/thread2.8.2/tclconfig/tcl.m4	2016-03-01 04:59:34.000000000 +0300
++++ tcl8.6.8/pkgs/thread2.8.2/tclconfig/tcl.m4	2016-03-03 08:47:52.387045300 +0300
+@@ -3377,9 +3377,6 @@
+ 		SHLIB_LD_LIBS="${SHLIB_LD_LIBS} \"`${CYGPATH} ${TK_BIN_DIR}/${TK_STUB_LIB_FILE}`\""
+ 	    fi
+ 	    SHLIB_LD_LIBS="${SHLIB_LD_LIBS} \"`${CYGPATH} ${TCL_BIN_DIR}/${TCL_STUB_LIB_FILE}`\""
+-	    if test "$GCC" = "yes"; then
+-		SHLIB_LD_LIBS="${SHLIB_LD_LIBS} -static-libgcc"
+-	    fi
+ 	    eval eval "PKG_LIB_FILE=${PACKAGE_LIB_PREFIX}${PACKAGE_NAME}${SHARED_LIB_SUFFIX}"
+ 	else
+ 	    eval eval "PKG_LIB_FILE=${PACKAGE_LIB_PREFIX}${PACKAGE_NAME}${UNSHARED_LIB_SUFFIX}"
+diff -Naur tcl8.6.8-orig/win/tcl.m4 tcl8.6.8/win/tcl.m4
+--- tcl8.6.8-orig/win/tcl.m4	2016-03-03 08:47:49.442339800 +0300
++++ tcl8.6.8/win/tcl.m4	2016-03-03 08:47:52.451038900 +0300
+@@ -635,7 +635,6 @@
+ 
+     if test "${GCC}" = "yes" ; then
+ 	extra_cflags="-pipe"
+-	extra_ldflags="-pipe -static-libgcc"
+ 	AC_CACHE_CHECK(for mingw32 version of gcc,
+ 	    ac_cv_win32,
+ 	    AC_TRY_COMPILE([
+@@ -691,6 +690,7 @@
+ 	if test "${SHARED_BUILD}" = "0" ; then
+ 	    # static
+             AC_MSG_RESULT([using static flags])
++            extra_ldflags="-pipe -static-libgcc"
+ 	    runtime=
+ 	    LIBRARIES="\${STATIC_LIBRARIES}"
+ 	    EXESUFFIX="s\${DBGX}.exe"
diff --git a/PKGBUILD b/PKGBUILD
index cae4d97847f2..1d7b5a61a2a6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,33 +1,48 @@
 pkgname=mingw-w64-tcl
-pkgver=8.6.7
+pkgver=8.6.8
 pkgrel=1
 pkgdesc="The Tcl scripting language (mingw-w64)"
 arch=(any)
 depends=(mingw-w64-crt mingw-w64-zlib)
-makedepends=(mingw-w64-gcc tcl)
+makedepends=(mingw-w64-configure tcl)
 options=(staticlibs !strip !buildflags)
 license=("custom")
 url="http://tcl.sourceforge.net"
 source=("http://downloads.sourceforge.net/sourceforge/tcl/tcl${pkgver}-src.tar.gz"
-"tcl-8.5.14-autopath.patch"
-"tcl-8.5.14-hidden.patch"
-"tcl-8.6.1-mingwexcept.patch"
-"tcl-mingw-w64-compatibility.patch")
-sha256sums=('7c6b8f84e37332423cfe5bae503440d88450da8cc1243496249faa5268026ba5'
-            '3cb435f768052acabe5b1fbef5ae9a8d0967b0f86f7695fb4bae8953ee470357'
-            'a809617939336a0068c5dd567f2c25489b2824ca25ad20f9cbf4e74c81396d2e'
-            '77b7509f3677fe659a70994f664444c1f0e99899bd3e73cba71caa4ccb24ebd4'
-            '866fe923b7d43339bea8a8484299ba71ebdb3a7213508809f2adae4eff60a382')
+        "001-fix-relocation.patch"
+        "002-fix-forbidden-colon-in-paths.mingw.patch"
+        "004-use-system-zlib.mingw.patch"
+        "005-no-xc.mingw.patch"
+        "006-proper-implib-name.mingw.patch"
+        "007-install.mingw.patch"
+        "008-tcl-8.5.14-hidden.patch"
+        "009-fix-using-gnu-print.patch"
+        "010-dont-link-shared-with--static-libgcc.patch")
+sha256sums=('c43cb0c1518ce42b00e7c8f6eaddd5195c53a98f94adc717234a65cbcfd3f96a'
+            'cfcf9b3816f8bb063b514ac7f63a5ba73108f27e16fdf8e8312dc5f0683083f6'
+            '70bf0d8e84985f4e8ee63447ad37d5e50376eaf35ace51112761cacbbd596c4c'
+            '931485d71969096c1d03c8bed24fae3922d143fe50820d913e2567492ad6ac41'
+            '2b0f41f6704aa964dbfafa0a65dd5ce0ab97e82ff5cbbe2a95a2e8d644cc5550'
+            '5c0162fbb018c03b3e4b907bd0098ab5282314bc212e3929a0416126637e1350'
+            'f1833c3164229b017417d2ab2ce4cb066252fc1ad256de2313f0239481c7cc37'
+            '3ec2702efb1be6873d6ffd2ffb357637588f835f8817ae65cf0373020fcc7359'
+            '9c66ffe2de1d543f5291367d562ed5ee94e7e67345b281605788d7d9e02b8e7b'
+            '2cd861f04321622722c87f7247a0586e547e4daf95a7dfe94ecd2cbfe45c37fd')
 
 
 _architectures="i686-w64-mingw32 x86_64-w64-mingw32"
 
 prepare() {
   cd "${srcdir}/tcl${pkgver}"
-  patch -Np1 -i "${srcdir}/tcl-8.5.14-autopath.patch"
-  patch -Np1 -i "${srcdir}/tcl-8.5.14-hidden.patch"
-  #patch -Np1 -i "${srcdir}/tcl-8.6.1-mingwexcept.patch"
-  patch -Np0 -i "${srcdir}/tcl-mingw-w64-compatibility.patch"
+  patch -Np1 -i "${srcdir}/001-fix-relocation.patch"
+  patch -Np1 -i "${srcdir}/002-fix-forbidden-colon-in-paths.mingw.patch"
+  patch -Np1 -i "${srcdir}/004-use-system-zlib.mingw.patch"
+  patch -Np1 -i "${srcdir}/005-no-xc.mingw.patch"
+  patch -Np1 -i "${srcdir}/006-proper-implib-name.mingw.patch"
+  patch -Np1 -i "${srcdir}/007-install.mingw.patch"
+  patch -Np1 -i "${srcdir}/008-tcl-8.5.14-hidden.patch"
+  patch -Np1 -i "${srcdir}/009-fix-using-gnu-print.patch"
+  patch -Np1 -i "${srcdir}/010-dont-link-shared-with--static-libgcc.patch"
 }
 
 build() {
@@ -35,13 +50,12 @@ build() {
 		unset LDFLAGS
     mkdir -p "${srcdir}/${pkgname}-${pkgver}-build-${_arch}"
     cp -r "$srcdir/tcl$pkgver/"* "${srcdir}/${pkgname}-${pkgver}-build-${_arch}/"
-    cd "${srcdir}/${pkgname}-${pkgver}-build-${_arch}"
+    pushd "${srcdir}/${pkgname}-${pkgver}-build-${_arch}"
     [ "${_arch}" = 'x86_64-w64-mingw32' ] && enable64bit='--enable-64bit'
-    "${srcdir}"/${pkgname#mingw-w64-}${pkgver}/win/configure \
-      --prefix=/usr/${_arch} \
-      --build=$CHOST \
-      --host=${_arch} $enable64bit
+    ${_arch}-configure \
+    --enable-threads $enable64bit ../tcl${pkgver}/win
     make
+    popd
   done
 }
 
@@ -49,7 +63,6 @@ package() {
 	for _arch in ${_architectures}; do
     cd "${srcdir}/${pkgname}-${pkgver}-build-${_arch}"
     make -j1 install INSTALL_ROOT="$pkgdir"
-    rm "$pkgdir/usr/${_arch}/bin/zlib1.dll"
     find "$pkgdir/usr/${_arch}" -name '*.exe' -o -name '*.bat' -o -name '*.def' -o -name '*.exp' | xargs -rtl1 rm
     find "$pkgdir/usr/${_arch}" -name '*.dll' | xargs -rtl1 ${_arch}-strip --strip-unneeded
     find "$pkgdir/usr/${_arch}" -name '*.a' -o -name '*.dll' | xargs -rtl1 ${_arch}-strip -g
@@ -59,15 +72,15 @@ package() {
     sed -e "s#${srcdir}/tcl${pkgver}/win#/usr/lib#" \
       -e "s#${srcdir}/tcl${pkgver}#/usr/${_arch}/include/tcl-private#" \
       -i "${pkgdir}/usr/${_arch}/lib/tclConfig.sh"
-		sed -e "s#${srcdir}/tcl${pkgver}/win/pkgs/tdbc1.0.5#/usr/${_arch}/lib/tdbc1.0.5#" \
-				-e "s#${srcdir}/tcl${pkgver}/pkgs/tdbc1.0.5/generic#/usr/${_arch}/include#" \
-				-e "s#${srcdir}/tcl${pkgver}/pkgs/tdbc1.0.5/library#/usr/${_arch}/lib/tcl${pkgver%.*}#" \
-				-e "s#${srcdir}/tcl${pkgver}/pkgs/tdbc1.0.5#/usr/${_arch}/include#" \
-				-i "${pkgdir}/usr/${_arch}/lib/tdbc1.0.5/tdbcConfig.sh"
-		sed -e "s#${srcdir}/tcl${pkgver}/win/pkgs/itcl4.1.0#/usr/${_arch}/lib/itcl4.1.0#" \
-				-e "s#${srcdir}/tcl${pkgver}/pkgs/itcl4.1.0/generic#/usr/${_arch}/include/tcl-private#" \
-				-e "s#${srcdir}/tcl${pkgver}/pkgs/itcl4.1.0#/usr/${_arch}/include/tcl-private#" \
-				-i "${pkgdir}/usr/${_arch}/lib/itcl4.1.0/itclConfig.sh"
+		sed -e "s#${srcdir}/tcl${pkgver}/win/pkgs/tdbc1.0.6#/usr/${_arch}/lib/tdbc1.0.6#" \
+				-e "s#${srcdir}/tcl${pkgver}/pkgs/tdbc1.0.6/generic#/usr/${_arch}/include#" \
+				-e "s#${srcdir}/tcl${pkgver}/pkgs/tdbc1.0.6/library#/usr/${_arch}/lib/tcl${pkgver%.*}#" \
+				-e "s#${srcdir}/tcl${pkgver}/pkgs/tdbc1.0.6#/usr/${_arch}/include#" \
+				-i "${pkgdir}/usr/${_arch}/lib/tdbc1.0.6/tdbcConfig.sh"
+		sed -e "s#${srcdir}/tcl${pkgver}/win/pkgs/itcl4.1.1#/usr/${_arch}/lib/itcl4.1.1#" \
+				-e "s#${srcdir}/tcl${pkgver}/pkgs/itcl4.1.1/generic#/usr/${_arch}/include/tcl-private#" \
+				-e "s#${srcdir}/tcl${pkgver}/pkgs/itcl4.1.1#/usr/${_arch}/include/tcl-private#" \
+				-i "${pkgdir}/usr/${_arch}/lib/itcl4.1.1/itclConfig.sh"
 		mv "$pkgdir/usr/${_arch}/lib/libtcl86.a" "$pkgdir/usr/${_arch}/lib/libtcl86.dll.a"
 		ln -s "/usr/${_arch}/lib/libtcl86.dll.a" "$pkgdir/usr/${_arch}/lib/libtcl.dll.a"
 		ln -s /usr/${_arch}/lib/tclConfig.sh "${pkgdir}/usr/${_arch}/lib/tcl${pkgver%.*.*}/tclConfig.sh"
@@ -80,6 +93,11 @@ package() {
     ) || true
     chmod a-x "${pkgdir}/usr/${_arch}/lib/tcl${pkgver%.*}/encoding/"*.enc
     chmod a-x "${pkgdir}/usr/${_arch}/lib/"*/pkgIndex.tcl
+
+    install -Dm644 ${srcdir}/tcl${pkgver}/win/tcl.m4 ${pkgdir}/usr/${_arch}/share/aclocal/tcl${pkgver%.*}.m4
+
+    mv ${pkgdir}/usr/${_arch}/bin/sqlite3_analyzer{,.sh}
+
   done
 }
 
diff --git a/tcl-8.5.14-autopath.patch b/tcl-8.5.14-autopath.patch
deleted file mode 100644
index cad89f072cfa..000000000000
--- a/tcl-8.5.14-autopath.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-diff --git a/library/auto.tcl b/library/auto.tcl
-index f7cf5f0..feb0a22 100644
---- a/library/auto.tcl
-+++ b/library/auto.tcl
-@@ -84,6 +84,13 @@ proc tcl_findLibrary {basename version patch initScript enVarName varName} {
- 	    lappend dirs $value
- 	}
- 
-+	# 2a. As a sibling of Tcl's script directory
-+	if {[catch {
-+	    ::tcl::pkgconfig get scriptdir,runtime
-+	} value] == 0} {
-+	    lappend dirs [file join [file dirname $value] $basename$version]
-+	}
-+
- 	# 3. Relative to auto_path directories.  This checks relative to the
- 	# Tcl library as well as allowing loading of libraries added to the
- 	# auto_path that is not relative to the core library or binary paths.
-diff --git a/library/init.tcl b/library/init.tcl
-index 071e6df..7713d3e 100644
---- a/library/init.tcl
-+++ b/library/init.tcl
-@@ -47,16 +47,11 @@ if {![info exists auto_path]} {
- }
- namespace eval tcl {
-     variable Dir
--    foreach Dir [list $::tcl_library [file dirname $::tcl_library]] {
-+    foreach Dir [list $::tcl_library] {
- 	if {$Dir ni $::auto_path} {
- 	    lappend ::auto_path $Dir
- 	}
-     }
--    set Dir [file join [file dirname [file dirname \
--	    [info nameofexecutable]]] lib]
--    if {$Dir ni $::auto_path} {
--	lappend ::auto_path $Dir
--    }
-     catch {
- 	foreach Dir $::tcl_pkgPath {
- 	    if {$Dir ni $::auto_path} {
-diff --git a/unix/configure.in b/unix/configure.in
-index e22a7d3..658b3ed 100755
---- a/unix/configure.in
-+++ b/unix/configure.in
-@@ -840,9 +840,9 @@ if test "$FRAMEWORK_BUILD" = "1" ; then
-     test -z "$TCL_MODULE_PATH"  && \
- 	TCL_MODULE_PATH="~/Library/Tcl /Library/Tcl /System/Library/Tcl"
- elif test "$prefix/lib" != "$libdir"; then
--    TCL_PACKAGE_PATH="${libdir} ${prefix}/lib ${TCL_PACKAGE_PATH}"
-+    TCL_PACKAGE_PATH="${libdir}/tcl8.5 ${prefix}/share/tcl8.5 ${libdir}/tk8.5 ${prefix}/share/tk8.5 ${TCL_PACKAGE_PATH}"
- else
--    TCL_PACKAGE_PATH="${prefix}/lib ${TCL_PACKAGE_PATH}"
-+    TCL_PACKAGE_PATH="${libdir}/tcl8.5 ${prefix}/share/tcl8.5 ${libdir}/tk8.5 ${prefix}/share/tk8.5 ${TCL_PACKAGE_PATH}"
- fi
- 
- #--------------------------------------------------------------------
diff --git a/tcl-8.6.1-mingwexcept.patch b/tcl-8.6.1-mingwexcept.patch
deleted file mode 100644
index caae51f9414a..000000000000
--- a/tcl-8.6.1-mingwexcept.patch
+++ /dev/null
@@ -1,96 +0,0 @@
---- tcl8.6.1/win/tclWin32Dll.c.orig	2013-09-28 21:38:26.071200000 +0400
-+++ tcl8.6.1/win/tclWin32Dll.c	2013-09-28 21:39:18.627600000 +0400
-@@ -32,14 +32,14 @@
-  * them by creating an EXCEPTION_REGISTRATION within the activation record.
-  */
- 
--typedef struct EXCEPTION_REGISTRATION {
--    struct EXCEPTION_REGISTRATION *link;
-+typedef struct TCL_EXCEPTION_REGISTRATION {
-+    struct TCL_EXCEPTION_REGISTRATION *link;
-     EXCEPTION_DISPOSITION (*handler)(
- 	    struct _EXCEPTION_RECORD*, void*, struct _CONTEXT*, void*);
-     void *ebp;
-     void *esp;
-     int status;
--} EXCEPTION_REGISTRATION;
-+} TCL_EXCEPTION_REGISTRATION;
- #endif
- 
- /*
-@@ -662,7 +662,7 @@
- 
- #   else
- 
--    EXCEPTION_REGISTRATION registration;
-+    TCL_EXCEPTION_REGISTRATION registration;
- 
-     /*
-      * Execute the CPUID instruction with the given index, and store results
---- tcl8.6.1/win/tclWinChan.c.orig	2013-09-28 21:39:55.755600000 +0400
-+++ tcl8.6.1/win/tclWinChan.c	2013-09-28 21:40:14.647200000 +0400
-@@ -127,14 +127,14 @@
-  * them by creating an EXCEPTION_REGISTRATION within the activation record.
-  */
- 
--typedef struct EXCEPTION_REGISTRATION {
--    struct EXCEPTION_REGISTRATION *link;
-+typedef struct TCL_EXCEPTION_REGISTRATION {
-+    struct TCL_EXCEPTION_REGISTRATION *link;
-     EXCEPTION_DISPOSITION (*handler)(
- 	    struct _EXCEPTION_RECORD*, void*, struct _CONTEXT*, void*);
-     void *ebp;
-     void *esp;
-     int status;
--} EXCEPTION_REGISTRATION;
-+} TCL_EXCEPTION_REGISTRATION;
- #endif
- 
- /*
-@@ -1030,7 +1030,7 @@
- 				 * TCL_WRITABLE to indicate file mode. */
- {
- #if defined(HAVE_NO_SEH) && !defined(_WIN64)
--    EXCEPTION_REGISTRATION registration;
-+    TCL_EXCEPTION_REGISTRATION registration;
- #endif
-     char channelName[16 + TCL_INTEGER_SPACE];
-     Tcl_Channel channel = NULL;
---- tcl8.6.1/win/tclWinFCmd.c.orig	2013-09-28 21:45:10.719600000 +0400
-+++ tcl8.6.1/win/tclWinFCmd.c	2013-09-28 21:47:12.150000000 +0400
-@@ -75,14 +75,14 @@
-  * them by creating an EXCEPTION_REGISTRATION within the activation record.
-  */
- 
--typedef struct EXCEPTION_REGISTRATION {
--    struct EXCEPTION_REGISTRATION *link;
-+typedef struct TCL_EXCEPTION_REGISTRATION {
-+    struct TCL_EXCEPTION_REGISTRATION *link;
-     EXCEPTION_DISPOSITION (*handler)(
- 	    struct _EXCEPTION_RECORD *, void *, struct _CONTEXT *, void *);
-     void *ebp;
-     void *esp;
-     int status;
--} EXCEPTION_REGISTRATION;
-+} TCL_EXCEPTION_REGISTRATION;
- 
- #endif
- 
-@@ -176,7 +176,7 @@
- 				 * (native). */
- {
- #if defined(HAVE_NO_SEH) && !defined(_WIN64)
--    EXCEPTION_REGISTRATION registration;
-+    TCL_EXCEPTION_REGISTRATION registration;
- #endif
-     DWORD srcAttr, dstAttr;
-     int retval = -1;
-@@ -563,7 +563,7 @@
-     const TCHAR *nativeDst)	/* Pathname of file to copy to (native). */
- {
- #if defined(HAVE_NO_SEH) && !defined(_WIN64)
--    EXCEPTION_REGISTRATION registration;
-+    TCL_EXCEPTION_REGISTRATION registration;
- #endif
-     int retval = -1;
- 
diff --git a/tcl-mingw-w64-compatibility.patch b/tcl-mingw-w64-compatibility.patch
deleted file mode 100644
index 76a864349e26..000000000000
--- a/tcl-mingw-w64-compatibility.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- generic/tclPosixStr.c.orig	2011-04-16 14:15:17.040226044 +0200
-+++ generic/tclPosixStr.c	2011-04-16 14:16:16.798302930 +0200
-@@ -337,7 +337,7 @@
- #if defined(EOPNOTSUPP) &&  (!defined(ENOTSUP) || (ENOTSUP != EOPNOTSUPP))
-     case EOPNOTSUPP: return "EOPNOTSUPP";
- #endif
--#if defined(EOVERFLOW) && (!defined(EFBIG) || (EOVERFLOW != EFBIG)) && (!defined(EINVAL) || (EOVERFLOW != EINVAL))
-+#if defined(EOVERFLOW) && (!defined(EFBIG) || (EOVERFLOW != EFBIG)) && (!defined(EINVAL) || (EOVERFLOW != EINVAL)) && !defined(E2BIG)
-     case EOVERFLOW: return "EOVERFLOW";
- #endif
- #ifdef EPERM
-@@ -785,7 +785,7 @@
- #if defined(EOPNOTSUPP) &&  (!defined(ENOTSUP) || (ENOTSUP != EOPNOTSUPP))
-     case EOPNOTSUPP: return "operation not supported on socket";
- #endif
--#if defined(EOVERFLOW) && (!defined(EFBIG) || (EOVERFLOW != EFBIG)) && (!defined(EINVAL) || (EOVERFLOW != EINVAL))
-+#if defined(EOVERFLOW) && (!defined(EFBIG) || (EOVERFLOW != EFBIG)) && (!defined(EINVAL) || (EOVERFLOW != EINVAL)) && !defined(E2BIG)
-     case EOVERFLOW: return "file too big";
- #endif
- #ifdef EPERM
author	Andrew Sun	2018-06-14 20:20:18 -0400
committer	Andrew Sun	2018-06-14 20:20:18 -0400
commit	b932705eb9b7d11eb890c8c4e54946e9998b58ce (patch)
tree	5cd7a8eb97d0579d64ea66ef5d336f5bb6f259d3
parent	6e3d6d05ec9ccdb183d2f8e671e7f31dbaa28e29 (diff)
download	aur-b932705eb9b7d11eb890c8c4e54946e9998b58ce.tar.gz