Skip to content

Commit e2063d6

Browse files
authored
Update macOS installer to use Tk 8.6.12rc1 pre-release. (GH-29354)
1 parent 401d25e commit e2063d6

File tree

4 files changed

+12
-218
lines changed

4 files changed

+12
-218
lines changed

Mac/BuildScript/bpo-44828-filedialog-crash-monterey.patch

Lines changed: 0 additions & 202 deletions
This file was deleted.

Mac/BuildScript/build-installer.py

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -265,11 +265,11 @@ def library_recipes():
265265
tk_patches = ['tk868_on_10_8_10_9.patch']
266266

267267
else:
268-
tcl_tk_ver='8.6.11'
269-
tcl_checksum='8a4c004f48984a03a7747e9ba06e4da4'
268+
tcl_tk_ver='8.6.12rc1'
269+
tcl_checksum='82fd1637c0f7d4b76cb909f8abc373ec'
270270

271-
tk_checksum='c7ee71a2d05bba78dfffd76528dc17c6'
272-
tk_patches = ['bpo-44828-filedialog-crash-monterey.patch']
271+
tk_checksum='d63c3b91b86cd8b6fa54e83ef2c5153e'
272+
tk_patches = [ ]
273273

274274

275275
result.extend([
@@ -729,6 +729,10 @@ def extractArchive(builddir, archiveName):
729729
if ((retval.startswith('tcl') or retval.startswith('tk'))
730730
and retval.endswith('-src')):
731731
retval = retval[:-4]
732+
# Strip rcxx suffix from Tcl/Tk release candidates
733+
retval_rc = retval.find('rc')
734+
if retval_rc > 0:
735+
retval = retval[:retval_rc]
732736
if os.path.exists(retval):
733737
shutil.rmtree(retval)
734738
fp = os.popen("tar zxf %s 2>&1"%(shellQuote(archiveName),), 'r')

Mac/BuildScript/resources/ReadMe.rtf

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\partightenfactor0
1212

1313
\f1\b \cf0 NOTE:
14-
\f0\b0 This is a beta test preview of Python 3.10.0, the next feature release of Python 3. It is not intended for production use.\
14+
\f0\b0 This is an alpha preview of Python 3.11.0, the next feature release of Python 3. It is not intended for production use.\
1515
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural\partightenfactor0
1616
\cf0 \
1717
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural\partightenfactor0
@@ -66,17 +66,9 @@ Due to new security checks on macOS 10.15 Catalina, when launching IDLE macOS ma
6666
\f0\b0 button to proceed.\
6767
\
6868

69-
\f1\b \ul macOS 11 (Big Sur) and Apple Silicon Mac support\
69+
\f1\b \ul Apple Silicon Mac support\
7070
7171
\f0\b0 \ulnone \
72-
For Python 3.10 releases, we provide a new
73-
\f4 universal2
74-
\f0 installer variant that provides universal binaries for both
75-
\f4 ARM64
76-
\f0 and
77-
\f4 Intel 64
78-
\f0 architectures and is also supported on all Macs that support macOS 10.9 or later. Some of the advantages of the new installer variant: native ARM64 code on Apple Silicon Macs should run significantly faster than Rosetta2-emulated code; some operating system functions and options introduced in macOS releases since 10.9 are now exposed when available (primarily in the os module); and the new installer variant includes Tcl/Tk 8.6.11 rather than 8.6.8.\
79-
\
8072
On Apple Silicon Macs, it is possible to run Python either with native ARM64 code or under Intel 64 emulation using Rosetta2. This option might be useful for testing or if binary wheels are not yet available with native ARM64 binaries. To easily force Python to run in emulation mode, invoke it from a command line shell with the
8173
\f4 python3-intel64
8274
\f0 command instead of just

Mac/BuildScript/resources/Welcome.rtf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
}
44
{\colortbl;\red255\green255\blue255;}
55
{\*\expandedcolortbl;;}
6-
\paperw11905\paperh16837\margl1440\margr1440\vieww12200\viewh10880\viewkind0
6+
\paperw11900\paperh16840\margl1440\margr1440\vieww12200\viewh10880\viewkind0
77
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\partightenfactor0
88

99
\f0\fs24 \cf0 This package will install
@@ -26,5 +26,5 @@ At the end of this install, click on
2626
\
2727

2828
\f1\b NOTE:
29-
\f0\b0 This is a beta test preview of Python 3.10.0, the next feature release of Python 3. It is not intended for production use.\
29+
\f0\b0 This is an alpha test preview of Python 3.11.0, the next feature release of Python 3. It is not intended for production use.\
3030
}

0 commit comments

Comments
 (0)