diff options
| -rw-r--r-- | Mac/BuildScript/bpo-44828-filedialog-crash-monterey-8612rc1.patch | 10 | ||||
| -rwxr-xr-x | Mac/BuildScript/build-installer.py | 8 | ||||
| -rw-r--r-- | Misc/NEWS.d/next/macOS/2021-12-05-23-52-03.bpo-45732.-BWrnh.rst | 1 |
3 files changed, 5 insertions, 14 deletions
diff --git a/Mac/BuildScript/bpo-44828-filedialog-crash-monterey-8612rc1.patch b/Mac/BuildScript/bpo-44828-filedialog-crash-monterey-8612rc1.patch deleted file mode 100644 index e70e2c3..0000000 --- a/Mac/BuildScript/bpo-44828-filedialog-crash-monterey-8612rc1.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- tk8.6.12/macosx/tkMacOSXDialog.c 2021-10-29 17:08:23.000000000 +0000 -+++ tk8.6.12-patched/macosx/tkMacOSXDialog.c 2021-11-02 19:04:59.000000000 +0000 -@@ -379,6 +379,7 @@ - [NSApp tkFilePanelDidEnd:panel - returnCode:modalReturnCode - contextInfo:callbackInfo ]; -+ [parent endSheet:panel]; - } - } else { - modalReturnCode = [panel runModal]; diff --git a/Mac/BuildScript/build-installer.py b/Mac/BuildScript/build-installer.py index 1f6fcaf..5365f62 100755 --- a/Mac/BuildScript/build-installer.py +++ b/Mac/BuildScript/build-installer.py @@ -265,11 +265,11 @@ def library_recipes(): tk_patches = ['tk868_on_10_8_10_9.patch'] else: - tcl_tk_ver='8.6.12rc1' - tcl_checksum='82fd1637c0f7d4b76cb909f8abc373ec' + tcl_tk_ver='8.6.12' + tcl_checksum='87ea890821d2221f2ab5157bc5eb885f' - tk_checksum='d63c3b91b86cd8b6fa54e83ef2c5153e' - tk_patches = ['bpo-44828-filedialog-crash-monterey-8612rc1.patch'] + tk_checksum='1d6dcf6120356e3d211e056dff5e462a' + tk_patches = [ ] result.extend([ diff --git a/Misc/NEWS.d/next/macOS/2021-12-05-23-52-03.bpo-45732.-BWrnh.rst b/Misc/NEWS.d/next/macOS/2021-12-05-23-52-03.bpo-45732.-BWrnh.rst new file mode 100644 index 0000000..eb47985 --- /dev/null +++ b/Misc/NEWS.d/next/macOS/2021-12-05-23-52-03.bpo-45732.-BWrnh.rst @@ -0,0 +1 @@ +Update python.org macOS installer to use Tcl/Tk 8.6.12. |