<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/654c18fdb8a5fed041452271a070b39c51c49c65">https://github.com/macports/macports-ports/commit/654c18fdb8a5fed041452271a070b39c51c49c65</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 654c18f tk: update to 8.6.9.1
</span>654c18f is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 654c18fdb8a5fed041452271a070b39c51c49c65
</span>Author: Christopher Chavez <chrischavez@gmx.us>
AuthorDate: Mon Nov 19 01:49:24 2018 -0600
<span style='display:block; white-space:pre;color:#404040;'> tk: update to 8.6.9.1
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See https://trac.macports.org/ticket/57636#comment:2
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> - Temporarily append ".1" in distname; remove in next release
</span><span style='display:block; white-space:pre;color:#404040;'> - Drop patch-macosx-tkMacOSXXStubs.c.diff (incorporated upstream)
</span><span style='display:block; white-space:pre;color:#404040;'> - Add patch-macosx-tkMacOSXEntry.c.diff to fix spinboxes on +quartz
</span>---
x11/tk/Portfile | 14 +++++++++-----
x11/tk/files/patch-macosx-tkMacOSXEntry.c.diff | 22 ++++++++++++++++++++++
x11/tk/files/patch-macosx-tkMacOSXXStubs.c.diff | 15 ---------------
3 files changed, 31 insertions(+), 20 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 035a586..61ecd1c 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,6 +5,7 @@ PortGroup muniversal 1.0
</span>
name tk
version 8.6.9
<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;'>@@ -18,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.9.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 8039eec71d52de94eef6e425f77073e23de2339e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 f8ecce4a176e04870ba096971c3d12a3d78d4d3745337bc67dd947786e4c191c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 4364576
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 34ec51e1dbf02459960f77795009743708490831 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 8fcbcd958a8fd727e279f4cac00971eee2ce271dc741650b1fc33375fb74ebb4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 4364603
</span>
depends_build port:pkgconfig
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,7 +38,8 @@ depends_lib port:fontconfig \
</span> worksrcdir ${name}${version}/unix
patch.dir ${workpath}/${name}${version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-unix-Makefile.in.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-unix-Makefile.in.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-macosx-tkMacOSXEntry.c.diff
</span>
# see https://trac.macports.org/ticket/57594
patchfiles-append patch-dyld_fallback_library_path.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/tk/files/patch-macosx-tkMacOSXEntry.c.diff b/x11/tk/files/patch-macosx-tkMacOSXEntry.c.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..30e6a9b
</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-tkMacOSXEntry.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,22 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix for spinboxes that break when focused in Tk 8.6.9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+See https://core.tcl.tk/tk/tktview/273b6a4996
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Patch from chw's comment dated 2018-11-19 06:16:24
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Index: macosx/tkMacOSXEntry.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+==================================================================
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- macosx/tkMacOSXEntry.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ macosx/tkMacOSXEntry.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -147,10 +147,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bounds.origin.x = macDraw->xOff + MAC_OSX_FOCUS_WIDTH;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bounds.origin.y = macDraw->yOff + MAC_OSX_FOCUS_WIDTH;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bounds.size.width = Tk_Width(tkwin) - 2*MAC_OSX_FOCUS_WIDTH;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bounds.size.height = Tk_Height(tkwin) - 2*MAC_OSX_FOCUS_WIDTH;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!TkMacOSXSetupDrawingContext(d, NULL, 1, &dc)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (isSpinbox) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Tk_Width(tkwin) = oldWidth;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ChkErr(HIThemeDrawFrame, &bounds, &info, dc.context, HIOrientation);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TkMacOSXRestoreDrawingContext(&dc);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (isSpinbox) {
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/tk/files/patch-macosx-tkMacOSXXStubs.c.diff b/x11/tk/files/patch-macosx-tkMacOSXXStubs.c.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index e63788c..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/tk/files/patch-macosx-tkMacOSXXStubs.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,15 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Fix build failure with +quartz variant on OS X 10.8 and 10.9.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Even though Gestalt was deprecated in OS X 10.8, it should work fine
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-through OS X 10.9, and its replacement NSOperatingSystemVersion was
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-not introduced until OS X 10.10.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- macosx/tkMacOSXXStubs.c.orig 2017-12-06 09:25:08.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ macosx/tkMacOSXXStubs.c 2018-01-06 19:34:17.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -175,7 +175,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int major, minor, patch;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if MAC_OS_X_VERSION_MIN_REQUIRED < 1080
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if MAC_OS_X_VERSION_MIN_REQUIRED < 101000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Gestalt(gestaltSystemVersionMajor, (SInt32*)&major);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Gestalt(gestaltSystemVersionMinor, (SInt32*)&minor);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Gestalt(gestaltSystemVersionBugFix, (SInt32*)&patch);
</span></pre><pre style='margin:0'>
</pre>