diff options
| author | Ned Deily <nad@python.org> | 2021-11-02 21:01:37 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-02 21:01:37 (GMT) |
| commit | 4a8b4051734fd2ce46e15e6369811132ac3a5697 (patch) | |
| tree | 45c21fc6c6965ceae9d72e9ef482c00b9fb543ef /Mac | |
| parent | 38982ab13629a0802ea721a5917da0b98d0d5a0a (diff) | |
| download | cpython-4a8b4051734fd2ce46e15e6369811132ac3a5697.zip cpython-4a8b4051734fd2ce46e15e6369811132ac3a5697.tar.gz cpython-4a8b4051734fd2ce46e15e6369811132ac3a5697.tar.bz2 | |
bpo-44828: macOS installer: avoid leaving a zombie Save panel in Tk 8.6.12rc1 (GH-29367)
Diffstat (limited to 'Mac')
| -rw-r--r-- | Mac/BuildScript/bpo-44828-filedialog-crash-monterey-8612rc1.patch | 10 | ||||
| -rwxr-xr-x | Mac/BuildScript/build-installer.py | 2 |
2 files changed, 11 insertions, 1 deletions
diff --git a/Mac/BuildScript/bpo-44828-filedialog-crash-monterey-8612rc1.patch b/Mac/BuildScript/bpo-44828-filedialog-crash-monterey-8612rc1.patch new file mode 100644 index 0000000..e70e2c3 --- /dev/null +++ b/Mac/BuildScript/bpo-44828-filedialog-crash-monterey-8612rc1.patch @@ -0,0 +1,10 @@ +--- 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 9db2616..1f6fcaf 100755 --- a/Mac/BuildScript/build-installer.py +++ b/Mac/BuildScript/build-installer.py @@ -269,7 +269,7 @@ def library_recipes(): tcl_checksum='82fd1637c0f7d4b76cb909f8abc373ec' tk_checksum='d63c3b91b86cd8b6fa54e83ef2c5153e' - tk_patches = [ ] + tk_patches = ['bpo-44828-filedialog-crash-monterey-8612rc1.patch'] result.extend([ |