bpo-43652: Actually update to Tcl/Tk 8.6.11 on Windows (GH-29397)

This commit is contained in:
Steve Dower 2021-11-04 16:39:07 +00:00 committed by GitHub
parent 87032cfa3d
commit 36b4f9e2a7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 4 deletions

View file

@ -0,0 +1,2 @@
Update Tcl/Tk to 8.6.11, actually this time. The previous update incorrectly
included 8.6.10.

View file

@ -55,8 +55,8 @@ set libraries=%libraries% bzip2-1.0.6
if NOT "%IncludeLibffiSrc%"=="false" set libraries=%libraries% libffi-3.4.2
if NOT "%IncludeSSLSrc%"=="false" set libraries=%libraries% openssl-1.1.1l
set libraries=%libraries% sqlite-3.36.0.0
if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tcl-core-8.6.11.0
if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tk-8.6.11.0
if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tcl-core-8.6.11.1
if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tk-8.6.11.1
if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tix-8.4.3.6
set libraries=%libraries% xz-5.2.2
set libraries=%libraries% zlib-1.2.11
@ -78,7 +78,7 @@ echo.Fetching external binaries...
set binaries=
if NOT "%IncludeLibffi%"=="false" set binaries=%binaries% libffi-3.4.2
if NOT "%IncludeSSL%"=="false" set binaries=%binaries% openssl-bin-1.1.1l
if NOT "%IncludeTkinter%"=="false" set binaries=%binaries% tcltk-8.6.11.0
if NOT "%IncludeTkinter%"=="false" set binaries=%binaries% tcltk-8.6.11.1
if NOT "%IncludeSSLSrc%"=="false" set binaries=%binaries% nasm-2.11.06
for %%b in (%binaries%) do (

View file

@ -5,7 +5,7 @@
<TclMajorVersion>8</TclMajorVersion>
<TclMinorVersion>6</TclMinorVersion>
<TclPatchLevel>11</TclPatchLevel>
<TclRevision>0</TclRevision>
<TclRevision>1</TclRevision>
<TkMajorVersion>$(TclMajorVersion)</TkMajorVersion>
<TkMinorVersion>$(TclMinorVersion)</TkMinorVersion>
<TkPatchLevel>$(TclPatchLevel)</TkPatchLevel>