<pre style='margin:0'>
Marcus Calhoun-Lopez (MarcusCalhoun-Lopez) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/7ee034c7d475ea25adb558a15e8e423bb31cd80c">https://github.com/macports/macports-ports/commit/7ee034c7d475ea25adb558a15e8e423bb31cd80c</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 7ee034c tk +quartz: add patch to fix unresponsive menus
</span>7ee034c is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 7ee034c7d475ea25adb558a15e8e423bb31cd80c
</span>Author: Christopher Chavez <chrischavez@gmx.us>
AuthorDate: Sun Mar 15 05:00:51 2020 -0500
<span style='display:block; white-space:pre;color:#404040;'> tk +quartz: add patch to fix unresponsive menus
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Backport fix for unresponsive menu bar when Tk Aqua is started
</span><span style='display:block; white-space:pre;color:#404040;'> on 10.15 Catalina
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Patch taken from https://core.tcl-lang.org/tk/info/5bb1439eeb
</span><span style='display:block; white-space:pre;color:#404040;'> Fix will appear in Tk 8.6.11; patch can be dropped then
</span>---
x11/tk/Portfile | 7 +++-
x11/tk/files/patch-macosx-tkMacOSXInit.c.diff | 47 +++++++++++++++++++++++++++
2 files changed, 53 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/tk/Portfile b/x11/tk/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 6354619..617398f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/tk/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/tk/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup muniversal 1.0
</span>
name tk
version 8.6.10
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories x11
license Tcl/Tk
maintainers {mcalhoun @MarcusCalhoun-Lopez} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,6 +41,11 @@ patchfiles patch-unix-Makefile.in.diff
</span> # see https://trac.macports.org/ticket/57594
patchfiles-append patch-dyld_fallback_library_path.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Fix for unresponsive menus at startup on 10.15 Catalina (+quartz)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# see https://core.tcl-lang.org/tk/info/5bb1439eeb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Remove when updating to 8.6.11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-macosx-tkMacOSXInit.c.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.args --mandir=${prefix}/share/man --with-tcl=${prefix}/lib
# see https://trac.macports.org/ticket/58447
configure.cppflags-replace -I${prefix}/include -isystem${prefix}/include
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/tk/files/patch-macosx-tkMacOSXInit.c.diff b/x11/tk/files/patch-macosx-tkMacOSXInit.c.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..b3ba2fc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/tk/files/patch-macosx-tkMacOSXInit.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,47 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Upstream-Status: Backport (taken from https://core.tcl-lang.org/tk/info/5bb1439eeb)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Index: macosx/tkMacOSXInit.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+==================================================================
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- macosx/tkMacOSXInit.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ macosx/tkMacOSXInit.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -118,18 +118,16 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * It is not safe to force activation of the NSApp until this method is
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * called. Activating too early can cause the menu bar to be unresponsive.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * The call to activateIgnoringOtherApps was moved here to avoid this.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * However, with the release of macOS 10.15 (Catalina) this was no longer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * sufficient. (See ticket bf93d098d7.) Apparently apps were being
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * activated automatically, and this was sometimes being done too early.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * As a workaround we deactivate and then reactivate the app, even though
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * Apple says that "Normally, you shouldn’t invoke this method".
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * However, with the release of macOS 10.15 (Catalina) that was no longer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * sufficient. (See ticket bf93d098d7.) The call to setActivationPolicy
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * needed to be moved into this function as well.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- [NSApp deactivate];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ [NSApp setActivationPolicy:NSApplicationActivationPolicyRegular];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [NSApp activateIgnoringOtherApps: YES];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * Process events to ensure that the root window is fully initialized. See
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * ticket 56a1823c73.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -176,16 +174,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * Be our own delegate.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [self setDelegate:self];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * Make sure we are allowed to open windows.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- [NSApp setActivationPolicy:NSApplicationActivationPolicyRegular];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * If no icon has been set from an Info.plist file, use the Wish icon from
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * the Tk framework.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>