tcl: updated to 8.6.11

niXman · May 3, 2021 · 6ec5b92 · 6ec5b92
1 parent fd4d938
commit 6ec5b92
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 67 deletions.
diff --git a/patches/tcl/006-proper-implib-name.mingw.patch b/patches/tcl/006-proper-implib-name.mingw.patch
diff --git a/patches/tcl/007-install.mingw.patch b/patches/tcl/007-install.mingw.patch
@@ -20,9 +20,8 @@ diff -Naur tcl8.6.5-orig/win/Makefile.in tcl8.6.5/win/Makefile.in
 +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 \
+ CC_SWITCHES = ${CFLAGS} ${CFLAGS_WARNING} ${SHLIB_CFLAGS} \
+ -I"${ZLIB_DIR_NATIVE}" -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}
 

diff --git a/patches/tcl/009-fix-using-gnu-print.patch b/patches/tcl/009-fix-using-gnu-print.patch
@@ -1,15 +1,13 @@
-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
+diff -Naur tcl8.6.5-orig/win/Makefile.in tcl8.6.5/win/Makefile.in
+--- tcl8.6.11-orig/win/Makefile.in
++++ tcl8.6.11/win/Makefile.in
++++ #<buffer Makefile.in>
+@@ -85,7 +85,7 @@
+ #CFLAGS = 		$(CFLAGS_DEBUG)
+ #CFLAGS = 		$(CFLAGS_OPTIMIZE)
+ #CFLAGS = 		$(CFLAGS_DEBUG) $(CFLAGS_OPTIMIZE)
+-CFLAGS = 		@CFLAGS@ @CFLAGS_DEFAULT@ -D_ATL_XP_TARGETING=1 -D__USE_MINGW_ANSI_STDIO=0 -DMP_FIXED_CUTOFFS -DMP_NO_STDINT
++CFLAGS = 		@CFLAGS@ @CFLAGS_DEFAULT@ -D_ATL_XP_TARGETING=1 -DMP_FIXED_CUTOFFS -DMP_NO_STDINT
 
- #ifdef _WIN64
-+# ifdef __USE_MINGW_ANSI_STDIO
-+#         define TCL_I_MODIFIER        "I64"
-+# else
- #         define TCL_I_MODIFIER        "I"
-+# endif
- #else
- #         define TCL_I_MODIFIER        ""
- #endif
+ # To compile without backward compatibility and deprecated code uncomment the
+ # following
diff --git a/scripts/tcl.sh b/scripts/tcl.sh
@@ -35,7 +35,7 @@
 
 # **************************************************************************
 
-PKG_VERSION=8.6.10
+PKG_VERSION=8.6.11
 PKG_NAME=tcl${PKG_VERSION}
 PKG_DIR_NAME=tcl${PKG_VERSION}
 PKG_SUBDIR_NAME=win
@@ -52,7 +52,6 @@ PKG_PATCHES=(
 	tcl/002-fix-forbidden-colon-in-paths.mingw.patch
 	tcl/004-use-system-zlib.mingw.patch
 	tcl/005-no-xc.mingw.patch
-	tcl/006-proper-implib-name.mingw.patch
 	tcl/007-install.mingw.patch
 	tcl/008-tcl-8.5.14-hidden.patch
 	tcl/009-fix-using-gnu-print.patch