From ce0e830528c10e5e9d90a56a7bb7a1bd2dca9ac3 Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Tue, 7 Apr 2020 14:42:29 +0200
Subject: [PATCH] update tcl, tk

---
 plugins/tcl.tk/tk.mk  |  6 +++---
 src/tcl-1-fixes.patch | 29 ++++++++++-------------------
 src/tcl.mk            |  4 ++--
 3 files changed, 15 insertions(+), 24 deletions(-)

diff --git a/plugins/tcl.tk/tk.mk b/plugins/tcl.tk/tk.mk
index 9072198a..da0c929d 100644
--- a/plugins/tcl.tk/tk.mk
+++ b/plugins/tcl.tk/tk.mk
@@ -4,8 +4,8 @@ PKG             := tk
 $(PKG)_WEBSITE  := https://tcl.tk/
 $(PKG)_OWNER    := https://github.com/highperformancecoder
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 8.6.9
-$(PKG)_CHECKSUM := d3f9161e8ba0f107fe8d4df1f6d3a14c30cc3512dfc12a795daa367a27660dac
+$(PKG)_VERSION  := 8.6.10
+$(PKG)_CHECKSUM := 63df418a859d0a463347f95ded5cd88a3dd3aaa1ceecaeee362194bc30f3e386
 $(PKG)_SUBDIR   := tk$($(PKG)_VERSION)
 $(PKG)_FILE     := tk$($(PKG)_VERSION)-src.tar.gz
 $(PKG)_URL      := https://$(SOURCEFORGE_MIRROR)/project/tcl/Tcl/$($(PKG)_VERSION)/$($(PKG)_FILE)
@@ -26,6 +26,6 @@ define $(PKG)_BUILD
         --with-tcl='$(PREFIX)/$(TARGET)/lib' \
         $(if $(findstring x86_64,$(TARGET)), --enable-64bit) \
         CFLAGS='-D__MINGW_EXCPT_DEFINE_PSDK'
-    $(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)' LIBS='-lmincore -lnetapi32 -lz -ltclstub86 -limm32 -lcomctl32 -luuid -lole32'
+    $(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)' LIBS='-lmincore -lnetapi32 -lz -ltclstub86 -limm32 -lcomctl32 -luuid -lole32 -lgdi32 -lcomdlg32'
     $(MAKE) -C '$(BUILD_DIR)' -j 1 install
 endef
diff --git a/src/tcl-1-fixes.patch b/src/tcl-1-fixes.patch
index 7dfeaa1b..56faa721 100644
--- a/src/tcl-1-fixes.patch
+++ b/src/tcl-1-fixes.patch
@@ -13,10 +13,10 @@ diff --git a/win/Makefile.in b/win/Makefile.in
 index 1111111..2222222 100644
 --- a/win/Makefile.in
 +++ b/win/Makefile.in
-@@ -146,9 +146,8 @@ REG_DLL_FILE		= tclreg$(REGVER)${DLLSUFFIX}
- REG_LIB_FILE		= @LIBPREFIX@tclreg$(REGVER)${LIBSUFFIX}
- TEST_DLL_FILE		= tcltest$(VER)${DLLSUFFIX}
- TEST_LIB_FILE		= @LIBPREFIX@tcltest$(VER)${LIBSUFFIX}
+@@ -153,9 +153,8 @@ TEST_LOAD_PRMS		= package ifneeded dde 1.4.2 [list load [file normalize ${DDE_DL
+ 			  package ifneeded registry 1.3.4 [list load [file normalize ${REG_DLL_FILE}] registry]
+ TEST_LOAD_FACILITIES	= package ifneeded Tcltest ${VERSION}@TCL_PATCH_LEVEL@ [list load [file normalize ${TEST_DLL_FILE}] Tcltest];\
+ 			  $(TEST_LOAD_PRMS)
 -ZLIB_DLL_FILE		= zlib1.dll
  
 -SHARED_LIBRARIES 	= $(TCL_DLL_FILE) @ZLIB_DLL_FILE@
@@ -24,7 +24,7 @@ index 1111111..2222222 100644
  STATIC_LIBRARIES	= $(TCL_LIB_FILE)
  
  TCLSH			= tclsh$(VER)${EXESUFFIX}
-@@ -411,7 +410,7 @@ ZLIB_OBJS = \
+@@ -416,7 +415,7 @@ ZLIB_OBJS = \
  	uncompr.$(OBJEXT) \
  	zutil.$(OBJEXT)
  
@@ -33,18 +33,9 @@ index 1111111..2222222 100644
  
  TCL_DOCS = "$(ROOT_DIR_NATIVE)"/doc/*.[13n]
  
-@@ -446,7 +445,7 @@ ${TCL_STUB_LIB_FILE}: ${STUB_OBJS}
- 	@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 @@ ${TEST_DLL_FILE}: ${TCL_STUB_LIB_FILE} ${TCLTEST_OBJS}
- 	@$(RM) ${TEST_DLL_FILE} ${TEST_LIB_FILE}
- 	@MAKE_DLL@ ${TCLTEST_OBJS} $(TCL_STUB_LIB_FILE) $(SHLIB_LD_LIBS)
+@@ -511,14 +510,6 @@ ${TEST_EXE_FILE}: ${TCL_STUB_LIB_FILE} ${TCLTEST_OBJS} tclTestMain.${OBJEXT}
+         tclsh.$(RES) $(CC_EXENAME) $(LDFLAGS_CONSOLE)
+ 	$(COPY) tclsh.exe.manifest ${TEST_EXE_FILE}.manifest
  
 -# use pre-built zlib1.dll
 -${ZLIB_DLL_FILE}: ${TCL_STUB_LIB_FILE}
@@ -57,7 +48,7 @@ index 1111111..2222222 100644
  # Add the object extension to the implicit rules. By default .obj is not
  # automatically added.
  
-@@ -579,7 +570,7 @@ install-binaries: binaries
+@@ -633,7 +624,7 @@ install-binaries: binaries
  		else true; \
  		fi; \
  	    done;
@@ -70,7 +61,7 @@ diff --git a/win/configure.in b/win/configure.in
 index 1111111..2222222 100644
 --- a/win/configure.in
 +++ b/win/configure.in
-@@ -126,20 +126,8 @@ AS_IF([test "${enable_shared+set}" = "set"], [
+@@ -140,20 +140,8 @@ AS_IF([test "${enable_shared+set}" = "set"], [
  ], [
    tcl_ok=yes
  ])
diff --git a/src/tcl.mk b/src/tcl.mk
index e24eb0a0..0b639bbd 100644
--- a/src/tcl.mk
+++ b/src/tcl.mk
@@ -4,8 +4,8 @@ PKG             := tcl
 $(PKG)_WEBSITE  := https://tcl.tk/
 $(PKG)_OWNER    := https://github.com/highperformancecoder
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 8.6.9
-$(PKG)_CHECKSUM := 04abaa207f4bf4f453bea5bbdbcf6cf4bcdba3ed1c5160bfd732c6b8c70c6269
+$(PKG)_VERSION  := 8.6.10
+$(PKG)_CHECKSUM := 5196dbf6638e3df8d5c87b5815c8c2b758496eb6f0e41446596c9a4e638d87ed
 $(PKG)_SUBDIR   := tcl$($(PKG)_VERSION)
 $(PKG)_FILE     := tcl$($(PKG)_VERSION)-src.tar.gz
 $(PKG)_URL      := https://$(SOURCEFORGE_MIRROR)/project/tcl/Tcl/$($(PKG)_VERSION)/$($(PKG)_FILE)