<pre style='margin:0'>
Chris Jones (cjones051073) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/fa63a7bc869120f6b8051e6dc4831273d348effb">https://github.com/macports/macports-ports/commit/fa63a7bc869120f6b8051e6dc4831273d348effb</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit fa63a7bc869120f6b8051e6dc4831273d348effb
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Sat Dec 14 12:46:37 2019 +0000
<span style='display:block; white-space:pre;color:#404040;'> tk: update to 8.6.10
</span>---
x11/tk/Portfile | 17 +++++++----------
x11/tk/files/patch-macosx-tkMacOSXEntry.c.diff | 22 ----------------------
2 files changed, 7 insertions(+), 32 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 dd0e655..6354619 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.9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 8.6.10
</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,13 +19,11 @@ platforms darwin
</span>
master_sites sourceforge:project/tcl/Tcl/${version}
dist_subdir tcltk
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Errata release 8.6.9.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#distname ${name}${version}-src
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-distname ${name}${version}.1-src
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+distname ${name}${version}-src
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 34ec51e1dbf02459960f77795009743708490831 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 8fcbcd958a8fd727e279f4cac00971eee2ce271dc741650b1fc33375fb74ebb4 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 4364603
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 41abb02f092e419a8466a0ce5ee90a49df96704d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 63df418a859d0a463347f95ded5cd88a3dd3aaa1ceecaeee362194bc30f3e386 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 4444764
</span>
depends_build port:pkgconfig
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -38,8 +36,7 @@ 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:#ffe0e0;'>- patch-macosx-tkMacOSXEntry.c.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+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;color:#808080;'>diff --git a/x11/tk/files/patch-macosx-tkMacOSXEntry.c.diff b/x11/tk/files/patch-macosx-tkMacOSXEntry.c.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 30e6a9b..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/tk/files/patch-macosx-tkMacOSXEntry.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,22 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Fix for spinboxes that break when focused in Tk 8.6.9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-See https://core.tcl.tk/tk/tktview/273b6a4996
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Patch from chw's comment dated 2018-11-19 06:16:24
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Index: macosx/tkMacOSXEntry.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-==================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- macosx/tkMacOSXEntry.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ macosx/tkMacOSXEntry.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -147,10 +147,13 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bounds.origin.x = macDraw->xOff + MAC_OSX_FOCUS_WIDTH;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bounds.origin.y = macDraw->yOff + MAC_OSX_FOCUS_WIDTH;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bounds.size.width = Tk_Width(tkwin) - 2*MAC_OSX_FOCUS_WIDTH;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bounds.size.height = Tk_Height(tkwin) - 2*MAC_OSX_FOCUS_WIDTH;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (!TkMacOSXSetupDrawingContext(d, NULL, 1, &dc)) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (isSpinbox) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ Tk_Width(tkwin) = oldWidth;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ChkErr(HIThemeDrawFrame, &bounds, &info, dc.context, HIOrientation);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- TkMacOSXRestoreDrawingContext(&dc);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (isSpinbox) {
</span></pre><pre style='margin:0'>
</pre>