pythongh-99834: Update bundled copy of Tcl/Tk to 8.6.13.0 on Windows (p…

…ythonGH-101307)
mdboom · Jan 31, 2023 · ca386df · ca386df
1 parent c682065
commit ca386df
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 6 deletions.
diff --git a/Misc/NEWS.d/next/Windows/2023-01-25-00-23-31.gh-issue-99834.WN41lc.rst b/Misc/NEWS.d/next/Windows/2023-01-25-00-23-31.gh-issue-99834.WN41lc.rst
@@ -0,0 +1 @@
+Updates bundled copy of Tcl/Tk to 8.6.13.0
diff --git a/PC/layout/main.py b/PC/layout/main.py
@@ -35,7 +35,7 @@
 
 IDLE_DIRS_ONLY = FileNameSet("idlelib")
 
-TCLTK_PYDS_ONLY = FileStemSet("tcl*", "tk*", "_tkinter")
+TCLTK_PYDS_ONLY = FileStemSet("tcl*", "tk*", "_tkinter", "zlib1")
 TCLTK_DIRS_ONLY = FileNameSet("tkinter", "turtledemo")
 TCLTK_FILES_ONLY = FileNameSet("turtle.py")
 

diff --git a/PCbuild/_tkinter.vcxproj b/PCbuild/_tkinter.vcxproj
@@ -111,6 +111,7 @@
  <ItemGroup>
  <_TclTkDLL Include="$(tcltkdir)\bin\$(tclDllName)" />
  <_TclTkDLL Include="$(tcltkdir)\bin\$(tkDllName)" />
+ <_TclTkDLL Include="$(tcltkdir)\bin\$(tclZlibDllName)" />
  </ItemGroup>
  <ItemGroup>
  <ProjectReference Include="pythoncore.vcxproj">

diff --git a/PCbuild/get_externals.bat b/PCbuild/get_externals.bat
@@ -55,8 +55,8 @@ set libraries=%libraries% bzip2-1.0.8
 if NOT "%IncludeLibffiSrc%"=="false" set libraries=%libraries% libffi-3.4.3
 if NOT "%IncludeSSLSrc%"=="false" set libraries=%libraries% openssl-1.1.1s
 set libraries=%libraries% sqlite-3.39.4.0
-if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tcl-core-8.6.12.1
-if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tk-8.6.12.1
+if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tcl-core-8.6.13.0
+if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tk-8.6.13.0
 if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tix-8.4.3.6
 set libraries=%libraries% xz-5.2.5
 set libraries=%libraries% zlib-1.2.13
@@ -78,7 +78,7 @@ echo.Fetching external binaries...
 set binaries=
 if NOT "%IncludeLibffi%"=="false" set binaries=%binaries% libffi-3.4.3
 if NOT "%IncludeSSL%"=="false" set binaries=%binaries% openssl-bin-1.1.1s
-if NOT "%IncludeTkinter%"=="false" set binaries=%binaries% tcltk-8.6.12.1
+if NOT "%IncludeTkinter%"=="false" set binaries=%binaries% tcltk-8.6.13.0
 if NOT "%IncludeSSLSrc%"=="false" set binaries=%binaries% nasm-2.11.06
 
 for %%b in (%binaries%) do (

diff --git a/PCbuild/tcltk.props b/PCbuild/tcltk.props
@@ -4,8 +4,8 @@
  <PropertyGroup>
  <TclMajorVersion>8</TclMajorVersion>
  <TclMinorVersion>6</TclMinorVersion>
- <TclPatchLevel>12</TclPatchLevel>
- <TclRevision>1</TclRevision>
+ <TclPatchLevel>13</TclPatchLevel>
+ <TclRevision>0</TclRevision>
  <TkMajorVersion>$(TclMajorVersion)</TkMajorVersion>
  <TkMinorVersion>$(TclMinorVersion)</TkMinorVersion>
  <TkPatchLevel>$(TclPatchLevel)</TkPatchLevel>
@@ -27,6 +27,7 @@
  <tclShExeName>tclsh$(TclMajorVersion)$(TclMinorVersion)t$(TclDebugExt).exe</tclShExeName>
  <tkDLLName>tk$(TkMajorVersion)$(TkMinorVersion)t$(TclDebugExt).dll</tkDLLName>
  <tkLibName>tk$(TkMajorVersion)$(TkMinorVersion)t$(TclDebugExt).lib</tkLibName>
+ <tclZlibDLLName>zlib1.dll</tclZlibDLLName>
  <tixDLLName>tix$(TixMajorVersion)$(TixMinorVersion)$(TclDebugExt).dll</tixDLLName>
  <tixDLLPath>$(tcltkDir)lib\tix$(TixMajorVersion).$(TixMinorVersion).$(TixPatchLevel)\$(tixDLLName)</tixDLLPath>
  <tcltkLib>$(tcltkDir)lib\tcl$(TclMajorVersion)$(TclMinorVersion)t$(TclDebugExt).lib;$(tcltkDir)lib\tk$(TkMajorVersion)$(TkMinorVersion)t$(TclDebugExt).lib</tcltkLib>

diff --git a/Tools/msi/tcltk/tcltk_files.wxs b/Tools/msi/tcltk/tcltk_files.wxs
@@ -16,6 +16,9 @@
  <Component Id="tk86t.dll" Directory="DLLs" Guid="*">
  <File Name="tk86t.dll" KeyPath="yes" />
  </Component>
+ <Component Id="zlib1.dll" Directory="DLLs" Guid="*">
+ <File Name="zlib1.dll" KeyPath="yes" />
+ </Component>
  </ComponentGroup>
  </Fragment>