update to 8.6.9

author: Andrew Sun 2019-03-08 21:37:26 -0500
committer: Andrew Sun 2019-03-08 21:37:26 -0500
commit: c443ce37cf52b7f2a964a9d72556ea95eb9df7bc (patch)
tree: 6c036d362e4b51a141378747d50eb86b2caf5917
parent: b932705eb9b7d11eb890c8c4e54946e9998b58ce (diff)
download: aur-c443ce37cf52b7f2a964a9d72556ea95eb9df7bc.tar.gz
5 files changed, 34 insertions, 194 deletions
diff --git a/.SRCINFO b/.SRCINFO
index f185f37c3c9a..2449d05b9e12 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = mingw-w64-tcl
 	pkgdesc = The Tcl scripting language (mingw-w64)
-	pkgver = 8.6.8
+	pkgver = 8.6.9
 	pkgrel = 1
 	url = http://tcl.sourceforge.net
 	arch = any
@@ -12,7 +12,7 @@ pkgbase = mingw-w64-tcl
 	options = staticlibs
 	options = !strip
 	options = !buildflags
-	source = http://downloads.sourceforge.net/sourceforge/tcl/tcl8.6.8-src.tar.gz
+	source = http://downloads.sourceforge.net/sourceforge/tcl/tcl8.6.9-src.tar.gz
 	source = 001-fix-relocation.patch
 	source = 002-fix-forbidden-colon-in-paths.mingw.patch
 	source = 004-use-system-zlib.mingw.patch
@@ -21,17 +21,15 @@ pkgbase = mingw-w64-tcl
 	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 = ad0cd2de2c87b9ba8086b43957a0de3eb2eb565c7159d5f53ccbba3feb915f4e
 	sha256sums = cfcf9b3816f8bb063b514ac7f63a5ba73108f27e16fdf8e8312dc5f0683083f6
 	sha256sums = 70bf0d8e84985f4e8ee63447ad37d5e50376eaf35ace51112761cacbbd596c4c
-	sha256sums = 931485d71969096c1d03c8bed24fae3922d143fe50820d913e2567492ad6ac41
+	sha256sums = 01bf81675bb189314be5e024f58d20aafb3d2a35c1d2c4353045bbebd1e7a926
 	sha256sums = 2b0f41f6704aa964dbfafa0a65dd5ce0ab97e82ff5cbbe2a95a2e8d644cc5550
 	sha256sums = 5c0162fbb018c03b3e4b907bd0098ab5282314bc212e3929a0416126637e1350
 	sha256sums = f1833c3164229b017417d2ab2ce4cb066252fc1ad256de2313f0239481c7cc37
 	sha256sums = 3ec2702efb1be6873d6ffd2ffb357637588f835f8817ae65cf0373020fcc7359
-	sha256sums = 9c66ffe2de1d543f5291367d562ed5ee94e7e67345b281605788d7d9e02b8e7b
-	sha256sums = 2cd861f04321622722c87f7247a0586e547e4daf95a7dfe94ecd2cbfe45c37fd
+	sha256sums = e49a314ff0262e487f15fa1cb6253e22e25e8b18dad0b057d600e833efa947a7
 
 pkgname = mingw-w64-tcl
 
diff --git a/004-use-system-zlib.mingw.patch b/004-use-system-zlib.mingw.patch
index 9e338917f5e8..c7dc2103bf1a 100644
--- a/004-use-system-zlib.mingw.patch
+++ b/004-use-system-zlib.mingw.patch
@@ -6,7 +6,7 @@ diff -Naur tcl8.6.5-orig/win/configure.in tcl8.6.5/win/configure.in
  ])
  AS_IF([test "$tcl_ok" = "yes"], [
 -  AC_SUBST(ZLIB_DLL_FILE,[\${ZLIB_DLL_FILE}])
--  AS_IF([test "$do64bit" = "yes"], [
+-  AS_IF([test "$do64bit" != "no"], [
 -    AS_IF([test "$GCC" == "yes"],[
 -      AC_SUBST(ZLIB_LIBS,[\${ZLIB_DIR_NATIVE}/win64/libz.dll.a])
 -    ], [
@@ -15,7 +15,7 @@ diff -Naur tcl8.6.5-orig/win/configure.in tcl8.6.5/win/configure.in
 -  ], [
 -    AC_SUBST(ZLIB_LIBS,[\${ZLIB_DIR_NATIVE}/win32/zdll.lib])
 -  ])
-+    AC_SUBST(ZLIB_LIBS,[-lz])
++  AC_SUBST(ZLIB_LIBS,[-lz])
  ], [
    AC_SUBST(ZLIB_OBJS,[\${ZLIB_OBJS}])
  ])
diff --git a/009-fix-using-gnu-print.patch b/009-fix-using-gnu-print.patch
index a515137080d1..a350ebacbf84 100644
--- a/009-fix-using-gnu-print.patch
+++ b/009-fix-using-gnu-print.patch
@@ -1,15 +1,3 @@
-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
@@ -18,7 +6,7 @@ diff -Naur tcl8.6.5-orig/win/tclWinInt.h tcl8.6.5/win/tclWinInt.h
  
  #ifdef _WIN64
 +# ifdef __USE_MINGW_ANSI_STDIO
-+#         define TCL_I_MODIFIER        "z"
++#         define TCL_I_MODIFIER        "I64"
 +# else
  #         define TCL_I_MODIFIER        "I"
 +# endif
diff --git a/010-dont-link-shared-with--static-libgcc.patch b/010-dont-link-shared-with--static-libgcc.patch
deleted file mode 100644
index 115b6648cfe4..000000000000
--- a/010-dont-link-shared-with--static-libgcc.patch
+++ /dev/null
@@ -1,149 +0,0 @@
-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 1d7b5a61a2a6..05de69dbbf7a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
 pkgname=mingw-w64-tcl
-pkgver=8.6.8
+pkgver=8.6.9
 pkgrel=1
 pkgdesc="The Tcl scripting language (mingw-w64)"
-arch=(any)
+arch=('any')
 depends=(mingw-w64-crt mingw-w64-zlib)
 makedepends=(mingw-w64-configure tcl)
 options=(staticlibs !strip !buildflags)
@@ -16,18 +16,16 @@ source=("http://downloads.sourceforge.net/sourceforge/tcl/tcl${pkgver}-src.tar.g
         "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'
+        "009-fix-using-gnu-print.patch")
+sha256sums=('ad0cd2de2c87b9ba8086b43957a0de3eb2eb565c7159d5f53ccbba3feb915f4e'
             'cfcf9b3816f8bb063b514ac7f63a5ba73108f27e16fdf8e8312dc5f0683083f6'
             '70bf0d8e84985f4e8ee63447ad37d5e50376eaf35ace51112761cacbbd596c4c'
-            '931485d71969096c1d03c8bed24fae3922d143fe50820d913e2567492ad6ac41'
+            '01bf81675bb189314be5e024f58d20aafb3d2a35c1d2c4353045bbebd1e7a926'
             '2b0f41f6704aa964dbfafa0a65dd5ce0ab97e82ff5cbbe2a95a2e8d644cc5550'
             '5c0162fbb018c03b3e4b907bd0098ab5282314bc212e3929a0416126637e1350'
             'f1833c3164229b017417d2ab2ce4cb066252fc1ad256de2313f0239481c7cc37'
             '3ec2702efb1be6873d6ffd2ffb357637588f835f8817ae65cf0373020fcc7359'
-            '9c66ffe2de1d543f5291367d562ed5ee94e7e67345b281605788d7d9e02b8e7b'
-            '2cd861f04321622722c87f7247a0586e547e4daf95a7dfe94ecd2cbfe45c37fd')
+            'e49a314ff0262e487f15fa1cb6253e22e25e8b18dad0b057d600e833efa947a7')
 
 
 _architectures="i686-w64-mingw32 x86_64-w64-mingw32"
@@ -42,12 +40,17 @@ prepare() {
   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"
+  
+  # Using the static libgcc library is problematic when sharing
+  # resources across dynamic link libraries, so we must use
+  # libgcc*.dll everywhere:
+  echo "Removing -static-libgcc from configure files"
+  find "${srcdir}/tcl${pkgver}" -type f \( -name "tcl.m4" -o -name "configure*" \) -print0 | xargs -0 sed -i 's/-static-libgcc//g'
 }
 
 build() {
   for _arch in ${_architectures}; do
-		unset LDFLAGS
+    unset LDFLAGS
     mkdir -p "${srcdir}/${pkgname}-${pkgver}-build-${_arch}"
     cp -r "$srcdir/tcl$pkgver/"* "${srcdir}/${pkgname}-${pkgver}-build-${_arch}/"
     pushd "${srcdir}/${pkgname}-${pkgver}-build-${_arch}"
@@ -60,7 +63,7 @@ build() {
 }
 
 package() {
-	for _arch in ${_architectures}; do
+  for _arch in ${_architectures}; do
     cd "${srcdir}/${pkgname}-${pkgver}-build-${_arch}"
     make -j1 install INSTALL_ROOT="$pkgdir"
     find "$pkgdir/usr/${_arch}" -name '*.exe' -o -name '*.bat' -o -name '*.def' -o -name '*.exp' | xargs -rtl1 rm
@@ -72,18 +75,18 @@ 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.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"
+        sed -e "s#${srcdir}/tcl${pkgver}/win/pkgs/tdbc1.1.0#/usr/${_arch}/lib/tdbc1.1.0#" \
+      -e "s#${srcdir}/tcl${pkgver}/pkgs/tdbc1.1.0/generic#/usr/${_arch}/include#" \
+        -e "s#${srcdir}/tcl${pkgver}/pkgs/tdbc1.1.0/library#/usr/${_arch}/lib/tcl${pkgver%.*}#" \
+        -e "s#${srcdir}/tcl${pkgver}/pkgs/tdbc1.1.0#/usr/${_arch}/include#" \
+        -i "${pkgdir}/usr/${_arch}/lib/tdbc1.1.0/tdbcConfig.sh"
+    sed -e "s#${srcdir}/tcl${pkgver}/win/pkgs/itcl4.1.2#/usr/${_arch}/lib/itcl4.1.2#" \
+        -e "s#${srcdir}/tcl${pkgver}/pkgs/itcl4.1.2/generic#/usr/${_arch}/include/tcl-private#" \
+        -e "s#${srcdir}/tcl${pkgver}/pkgs/itcl4.1.2#/usr/${_arch}/include/tcl-private#" \
+        -i "${pkgdir}/usr/${_arch}/lib/itcl4.1.2/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"
     mkdir -p "${pkgdir}/usr/${_arch}/include/tcl-private/"{generic,win}
     find generic win -name "*.h" -exec cp -p '{}' "${pkgdir}"/usr/${_arch}/include/tcl-private/'{}' ';'
     ( cd "${pkgdir}/usr/${_arch}/include"
author	Andrew Sun	2019-03-08 21:37:26 -0500
committer	Andrew Sun	2019-03-08 21:37:26 -0500
commit	c443ce37cf52b7f2a964a9d72556ea95eb9df7bc (patch)
tree	6c036d362e4b51a141378747d50eb86b2caf5917
parent	b932705eb9b7d11eb890c8c4e54946e9998b58ce (diff)
download	aur-c443ce37cf52b7f2a964a9d72556ea95eb9df7bc.tar.gz