diff -r adb296e4bcaa Mac/BuildScript/README.txt --- a/Mac/BuildScript/README.txt Thu Dec 01 10:27:11 2016 +0200 +++ b/Mac/BuildScript/README.txt Thu Dec 01 15:13:58 2016 +0200 @@ -75,7 +75,7 @@ 2. 64-bit / 32-bit, x86_64 and i386 uni * libcrypto and libssl from Apple OpenSSL 0.9.8 * readline module links with Apple BSD editline (libedit) - - requires ActiveState Tcl/Tk 8.5.15 (or later) to be installed for building + - requires ActiveState Tcl/Tk 8.5.19 (or later) to be installed for building - recommended build environment: diff -r adb296e4bcaa Mac/BuildScript/build-installer.py --- a/Mac/BuildScript/build-installer.py Thu Dec 01 10:27:11 2016 +0200 +++ b/Mac/BuildScript/build-installer.py Thu Dec 01 15:13:58 2016 +0200 @@ -258,9 +258,9 @@ def library_recipes(): if False: # if getDeptargetTuple() > (10, 5): result.extend([ dict( - name="Tcl 8.5.15", - url="ftp://ftp.tcl.tk/pub/tcl//tcl8_5/tcl8.5.15-src.tar.gz", - checksum='f3df162f92c69b254079c4d0af7a690f', + name="Tcl 8.5.19", + url="ftp://ftp.tcl.tk/pub/tcl//tcl8_5/tcl8.5.19-src.tar.gz", + checksum='4f4e1c919f6a6dbb37e9a12d429769a6', buildDir="unix", configure_pre=[ '--enable-shared', @@ -274,12 +274,9 @@ def library_recipes(): }, ), dict( - name="Tk 8.5.15", - url="ftp://ftp.tcl.tk/pub/tcl//tcl8_5/tk8.5.15-src.tar.gz", - checksum='55b8e33f903210a4e1c8bce0f820657f', - patches=[ - "issue19373_tk_8_5_15_source.patch", - ], + name="Tk 8.5.19", + url="ftp://ftp.tcl.tk/pub/tcl//tcl8_5/tk8.5.19-src.tar.gz", + checksum='e89df710447cce0fc0bde65667c12f85', buildDir="unix", configure_pre=[ '--enable-aqua', diff -r adb296e4bcaa Misc/NEWS --- a/Misc/NEWS Thu Dec 01 10:27:11 2016 +0200 +++ b/Misc/NEWS Thu Dec 01 15:13:58 2016 +0200 @@ -325,6 +325,8 @@ Tools/Demos Windows ------- +- Issue #27647: Update bundled Tcl/Tk to 8.6.6 and Tix to 8.4.3.6. + - Issue #27932: Prevent memory leak in win32_ver(). - Issue #27888: Prevent Windows installer from displaying console windows and diff -r adb296e4bcaa PC/VC6/readme.txt --- a/PC/VC6/readme.txt Thu Dec 01 10:27:11 2016 +0200 +++ b/PC/VC6/readme.txt Thu Dec 01 15:13:58 2016 +0200 @@ -63,14 +63,14 @@ unpack into new subdirectories of dist\. _tkinter Python wrapper for the Tk windowing system. Requires building - Tcl/Tk first. Following are instructions for Tcl/Tk 8.5.2. + Tcl/Tk first. Following are instructions for Tcl/Tk 8.5.19. Get source ---------- In the dist directory, run - svn export http://svn.python.org/projects/external/tcl-8.5.2.1 tcl8.5.2 - svn export http://svn.python.org/projects/external/tk-8.5.2.0 tk8.5.2 - svn export http://svn.python.org/projects/external/tix-8.4.3.1 tix8.4.3 + svn export http://svn.python.org/projects/external/tcl-8.5.19.0 tcl8.5.19 + svn export http://svn.python.org/projects/external/tk-8.5.19.0 tk8.5.19 + svn export http://svn.python.org/projects/external/tix-8.4.3.6 tix8.4.3 Debug Build ----------- @@ -79,9 +79,9 @@ unpack into new subdirectories of dist\. Build Tcl first (done here w/ MSVC 6 on Win2K) --------------- If your environment doesn't have struct _stat64, you need to apply - tcl852.patch in this directory to dist\tcl8.5.2\generic\tcl.h. + tcl852.patch in this directory to dist\tcl8.5.19\generic\tcl.h. - cd dist\tcl8.5.2\win + cd dist\tcl8.5.19\win run vcvars32.bat nmake -f makefile.vc nmake -f makefile.vc INSTALLDIR=..\..\tcltk install @@ -98,9 +98,9 @@ unpack into new subdirectories of dist\. Build Tk -------- - cd dist\tk8.5.2\win - nmake -f makefile.vc TCLDIR=..\..\tcl8.5.2 - nmake -f makefile.vc TCLDIR=..\..\tcl8.5.2 INSTALLDIR=..\..\tcltk install + cd dist\tk8.5.19\win + nmake -f makefile.vc TCLDIR=..\..\tcl8.5.19 + nmake -f makefile.vc TCLDIR=..\..\tcl8.5.19 INSTALLDIR=..\..\tcltk install XXX Should we compile with OPTS=threads? diff -r adb296e4bcaa PC/VS7.1/readme.txt --- a/PC/VS7.1/readme.txt Thu Dec 01 10:27:11 2016 +0200 +++ b/PC/VS7.1/readme.txt Thu Dec 01 15:13:58 2016 +0200 @@ -69,16 +69,16 @@ unpack into new subdirectories of dist\. Get source ---------- In the dist directory, run - svn export http://svn.python.org/projects/external/tcl8.4.12 - svn export http://svn.python.org/projects/external/tk8.4.12 - svn export http://svn.python.org/projects/external/tix-8.4.0 + svn export http://svn.python.org/projects/external/tcl-8.5.19.0 tcl8.5.19 + svn export http://svn.python.org/projects/external/tk-8.5.19.0 tk8.5.19 + svn export http://svn.python.org/projects/external/tix-8.4.3.6 tix8.4.3 Build Tcl first (done here w/ MSVC 7.1 on Windows XP) --------------- Use "Start -> All Programs -> Microsoft Visual Studio .NET 2003 -> Visual Studio .NET Tools -> Visual Studio .NET 2003 Command Prompt" to get a shell window with the correct environment settings - cd dist\tcl8.4.12\win + cd dist\tcl8.5.19\win nmake -f makefile.vc nmake -f makefile.vc INSTALLDIR=..\..\tcltk install @@ -93,9 +93,9 @@ unpack into new subdirectories of dist\. Build Tk -------- - cd dist\tk8.4.12\win - nmake -f makefile.vc TCLDIR=..\..\tcl8.4.12 - nmake -f makefile.vc TCLDIR=..\..\tcl8.4.12 INSTALLDIR=..\..\tcltk install + cd dist\tk8.5.19\win + nmake -f makefile.vc TCLDIR=..\..\tcl8.5.19 + nmake -f makefile.vc TCLDIR=..\..\tcl8.5.19 INSTALLDIR=..\..\tcltk install XXX Should we compile with OPTS=threads? @@ -103,7 +103,7 @@ unpack into new subdirectories of dist\. XXX directory. Is all of that really needed for Python use of Tcl/Tk? Optional: run tests, via - nmake -f makefile.vc TCLDIR=..\..\tcl8.4.12 test + nmake -f makefile.vc TCLDIR=..\..\tcl8.5.19 test On WinXP Pro, wholly up to date as of 30-Aug-2004: all.tcl: Total 8420 Passed 6826 Skipped 1581 Failed 13 @@ -112,7 +112,7 @@ unpack into new subdirectories of dist\. Built Tix --------- - cd dist\tix-8.4.0\win + cd dist\tix8.4.3\win nmake -f python.mak nmake -f python.mak install @@ -375,7 +375,7 @@ Extension modules The changes required are: _tkinter - The tix makefile (tix-8.4.0\win\makefile.vc) must be modified to + The tix makefile (tix8.4.3\win\makefile.vc) must be modified to remove references to TOOLS32. The relevant lines should be changed to read: cc32 = cl.exe diff -r adb296e4bcaa PC/VS8.0/build_tkinter.py --- a/PC/VS8.0/build_tkinter.py Thu Dec 01 10:27:11 2016 +0200 +++ b/PC/VS8.0/build_tkinter.py Thu Dec 01 15:13:58 2016 +0200 @@ -11,14 +11,9 @@ import sys here = os.path.abspath(os.path.dirname(__file__)) par = os.path.pardir -if 1: - TCL = "tcl8.4.16" - TK = "tk8.4.16" - TIX = "tix-8.4.0" -else: - TCL = "tcl8.5b3" - TK = "tcl8.5b3" - TIX = "Tix8.4.2" +TCL = "tcl8.5.19" +TK = "tk8.5.19" +TIX = "tix-8.4.3" ROOT = os.path.abspath(os.path.join(here, par, par, par)) # Windows 2000 compatibility: WINVER 0x0500 diff -r adb296e4bcaa PC/VS9.0/build.bat --- a/PC/VS9.0/build.bat Thu Dec 01 10:27:11 2016 +0200 +++ b/PC/VS9.0/build.bat Thu Dec 01 15:13:58 2016 +0200 @@ -70,9 +70,9 @@ if '%build_tkinter%'=='true' ( set tcl_dbg_ext= set debug_flag=0 ) - set tcldir=%externals_dir%\tcl-8.5.15.0 - set tkdir=%externals_dir%\tk-8.5.15.0 - set tixdir=%externals_dir%\tix-8.4.3.5 + set tcldir=%externals_dir%\tcl-8.5.19.0 + set tkdir=%externals_dir%\tk-8.5.19.0 + set tixdir=%externals_dir%\tix-8.4.3.6 ) if '%build_tkinter%'=='true' ( if not exist "%tcltkdir%\bin\tcl85%tcl_dbg_ext%.dll" ( diff -r adb296e4bcaa PC/VS9.0/build_tkinter.py --- a/PC/VS9.0/build_tkinter.py Thu Dec 01 10:27:11 2016 +0200 +++ b/PC/VS9.0/build_tkinter.py Thu Dec 01 15:13:58 2016 +0200 @@ -11,9 +11,9 @@ import sys here = os.path.abspath(os.path.dirname(__file__)) par = os.path.pardir -TCL = "tcl8.5.2" -TK = "tk8.5.2" -TIX = "tix-8.4.0.x" +TCL = "tcl8.5.19" +TK = "tk8.5.19" +TIX = "tix-8.4.3.6" ROOT = os.path.abspath(os.path.join(here, par, par)) # Windows 2000 compatibility: WINVER 0x0500 diff -r adb296e4bcaa PCbuild/get_externals.bat --- a/PCbuild/get_externals.bat Thu Dec 01 10:27:11 2016 +0200 +++ b/PCbuild/get_externals.bat Thu Dec 01 15:13:58 2016 +0200 @@ -60,9 +60,9 @@ if NOT "%IncludeBsddb%"=="false" set lib if NOT "%IncludeSSL%"=="false" set libraries=%libraries% nasm-2.11.06 if NOT "%IncludeSSL%"=="false" set libraries=%libraries% openssl-1.0.2j set libraries=%libraries% sqlite-3.8.11.0 -if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tcl-8.5.15.0 -if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tk-8.5.15.0 -if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tix-8.4.3.5 +if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tcl-8.5.19.0 +if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tk-8.5.19.0 +if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tix-8.4.3.6 for %%e in (%libraries%) do ( if exist %%e ( diff -r adb296e4bcaa PCbuild/readme.txt --- a/PCbuild/readme.txt Thu Dec 01 10:27:11 2016 +0200 +++ b/PCbuild/readme.txt Thu Dec 01 15:13:58 2016 +0200 @@ -222,7 +222,7 @@ are: Homepage: http://www.sqlite.org/ _tkinter - Wraps version 8.5.15 of the Tk windowing system. + Wraps version 8.5.19 of the Tk windowing system. Homepage: http://www.tcl.tk/ diff -r adb296e4bcaa PCbuild/tcltk.props --- a/PCbuild/tcltk.props Thu Dec 01 10:27:11 2016 +0200 +++ b/PCbuild/tcltk.props Thu Dec 01 15:13:58 2016 +0200 @@ -4,7 +4,7 @@ 8 5 - 15 + 19 0 $(TclMajorVersion) $(TclMinorVersion) @@ -13,7 +13,7 @@ 8 4 3 - 5 + 6 $(ExternalsDir)tcl-$(TclMajorVersion).$(TclMinorVersion).$(TclPatchLevel).$(TclRevision)\ $(ExternalsDir)tk-$(TkMajorVersion).$(TkMinorVersion).$(TkPatchLevel).$(TkRevision)\ $(ExternalsDir)tix-$(TixMajorVersion).$(TixMinorVersion).$(TixPatchLevel).$(TixRevision)\