<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/843a0c1f2e29440502a477976aa5648b23db03f7">https://github.com/macports/macports-ports/commit/843a0c1f2e29440502a477976aa5648b23db03f7</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 843a0c1f2e29440502a477976aa5648b23db03f7
</span>Author: Christopher Chavez <chrischavez@gmx.us>
AuthorDate: Sat Jan 16 00:00:28 2021 -0600
<span style='display:block; white-space:pre;color:#404040;'> tk: update to 8.6.11
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: #9521
</span>---
x11/tk/Portfile | 19 +++++------
x11/tk/files/patch-macosx-tkMacOSXInit.c.diff | 47 ---------------------------
2 files changed, 8 insertions(+), 58 deletions(-)
<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 617398f40a5..12edbc58377 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;'>@@ -4,8 +4,8 @@ PortSystem 1.0
</span> PortGroup muniversal 1.0
name tk
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 8.6.10
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 8.6.11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> categories x11
license Tcl/Tk
maintainers {mcalhoun @MarcusCalhoun-Lopez} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,11 +19,13 @@ platforms darwin
</span>
master_sites sourceforge:project/tcl/Tcl/${version}
dist_subdir tcltk
<span style='display:block; white-space:pre;background:#ffe0e0;'>-distname ${name}${version}-src
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Errata release 8.6.11.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#distname ${name}${version}-src
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+distname ${name}${version}.1-src
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 41abb02f092e419a8466a0ce5ee90a49df96704d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 63df418a859d0a463347f95ded5cd88a3dd3aaa1ceecaeee362194bc30f3e386 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 4444764
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 662d6c6e97e5c360e7fe6e66726ecf0e8d2ab9a2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 006cab171beeca6a968b6d617588538176f27be232a2b334a0e96173e89909be \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 4496008
</span>
depends_build port:pkgconfig
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,11 +43,6 @@ 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:#ffe0e0;'>-# Fix for unresponsive menus at startup on 10.15 Catalina (+quartz)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# see https://core.tcl-lang.org/tk/info/5bb1439eeb
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Remove when updating to 8.6.11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-macosx-tkMacOSXInit.c.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index b3ba2fc9185..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/tk/files/patch-macosx-tkMacOSXInit.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,47 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Upstream-Status: Backport (taken from https://core.tcl-lang.org/tk/info/5bb1439eeb)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Index: macosx/tkMacOSXInit.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-==================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- macosx/tkMacOSXInit.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ macosx/tkMacOSXInit.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -118,18 +118,16 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * It is not safe to force activation of the NSApp until this method is
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * called. Activating too early can cause the menu bar to be unresponsive.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * The call to activateIgnoringOtherApps was moved here to avoid this.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- * However, with the release of macOS 10.15 (Catalina) this was no longer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- * sufficient. (See ticket bf93d098d7.) Apparently apps were being
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- * activated automatically, and this was sometimes being done too early.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- * As a workaround we deactivate and then reactivate the app, even though
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- * Apple says that "Normally, you shouldn’t invoke this method".
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * However, with the release of macOS 10.15 (Catalina) that was no longer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * sufficient. (See ticket bf93d098d7.) The call to setActivationPolicy
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * needed to be moved into this function as well.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [NSApp deactivate];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ [NSApp setActivationPolicy:NSApplicationActivationPolicyRegular];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [NSApp activateIgnoringOtherApps: YES];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * Process events to ensure that the root window is fully initialized. See
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * ticket 56a1823c73.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -176,16 +174,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * Be our own delegate.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [self setDelegate:self];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- /*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- * Make sure we are allowed to open windows.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [NSApp setActivationPolicy:NSApplicationActivationPolicyRegular];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * 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:#ffe0e0;'>- * the Tk framework.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>
</pre>