8000 gh-110950: add upstream Tk fixes to macOS installer. by chrstphrchvz · Pull Request #111041 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

gh-110950: add upstream Tk fixes to macOS installer. #111041

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Nov 21, 2023
Merged

gh-110950: add upstream Tk fixes to macOS installer. #111041

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2cae8a5
gh-110950: add upstream fix to macOS installer
chrstphrchvz Oct 18, 2023
37ecff3
Update backport_gh110950_fix.patch
chrstphrchvz Oct 18, 2023
745ebbe
Add missing newline at end of NEWS
chrstphrchvz Oct 18, 2023
b220624
Merge branch 'main' into patch-gh110950
ned-deily Nov 21, 2023
36cee17
Include Tk patches from gh-71383 and gh-92603
ned-deily Nov 21, 2023
5c93794
Merge branch 'main' into patch-gh110950
ned-deily Nov 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
gh-110950: add upstream fix to macOS installer
  • Loading branch information
@chrstphrchvz
chrstphrchvz authored Oct 18, 2023
commit 2cae8a59f39d0df6dd3d11a8d7cfab4802ed6977
23 changes: 23 additions & 0 deletions Mac/BuildScript/backport_gh110950_fix.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
From https://core.tcl-lang.org/tk/info/ed7cfbac8db11aa0

diff --git a/macosx/tkMacOSXInit.c b/macosx/tkMacOSXInit.c
index 71d7c3385..e6a68356c 100644
--- a/macosx/tkMacOSXInit.c
+++ b/macosx/tkMacOSXInit.c
@@ -128,6 +128,16 @@ static int TkMacOSXGetAppPathCmd(ClientData cd, Tcl_Interp *ip,
observe(NSApplicationDidChangeScreenParametersNotification, displayChanged:);
observe(NSTextInputContextKeyboardSelectionDidChangeNotification, keyboardChanged:);
#undef observe
+}
+
+
+/*
+ * Fix for 10b38a7a7c.
+ */
+
+- (BOOL)applicationSupportsSecureRestorableState:(NSApplication *)app
+{
+ return YES;
}

-(void)applicationWillFinishLaunching:(NSNotification *)aNotification
4 changes: 2 additions & 2 deletions Mac/BuildScript/build-installer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,14 +261,14 @@ def library_recipes():
tcl_checksum='81656d3367af032e0ae6157eff134f89'

tk_checksum='5e0faecba458ee1386078fb228d008ba'
tk_patches = ['tk868_on_10_8_10_9.patch']
tk_patches = ['tk868_on_10_8_10_9.patch', 'backport_gh110950_fix.patch']

else:
tcl_tk_ver='8.6.13'
tcl_checksum='43a1fae7412f61ff11de2cfd05d28cfc3a73762f354a417c62370a54e2caf066'

tk_checksum='2e65fa069a23365440a3c56c556b8673b5e32a283800d8d9b257e3f584ce0675'
tk_patches = [ ]
tk_patches = ['backport_gh110950_fix.patch']


base_url = "https://prdownloads.sourceforge.net/tcl/{what}{version}-src.tar.gz"
Expand Down
3 changes: 3 additions & 0 deletions Misc/NEWS.d/next/macOS/2023-10-18-17-26-36.gh-issue-110950.sonoma.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Update macOS installer to include an upstream Tcl/Tk fix for the
``Secure coding is not enabled for restorable state!`` warning
encountered in Tkinter on macOS 14 Sonoma.
0