<pre style='margin:0'>
Marius Schamschula (Schamschula) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/7c4fc91d0d1a18dfbe7194ddc2b05973afbea5a8">https://github.com/macports/macports-ports/commit/7c4fc91d0d1a18dfbe7194ddc2b05973afbea5a8</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 7c4fc91d0d1a18dfbe7194ddc2b05973afbea5a8
</span>Author: Marius Schamschula <mps@macports.org>
AuthorDate: Thu Aug 10 13:04:30 2017 -0500
<span style='display:block; white-space:pre;color:#404040;'> tk: update to version 8.6.7
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/54590
</span>---
x11/tk/Portfile | 13 ++++++-------
x11/tk/files/patch-macosx-tkMacOSXXStubs.c.diff | 21 ---------------------
2 files changed, 6 insertions(+), 28 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 064b740..9dca689 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;'>@@ -3,7 +3,7 @@
</span> PortSystem 1.0
name tk
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 8.6.6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 8.6.7
</span> categories x11
license Tcl/Tk
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,11 +23,11 @@ distname ${name}${version}-src
</span> distfiles-append tcl${version}-src${extract.suffix}
checksums tk${version}-src.tar.gz \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 619c250050bf8216855ea1c646207d1d147a95b8 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 d62c371a71b4744ed830e3c21d27968c31dba74dd2c45f36b9b071e6d88eb19d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 647f3f69c625e7b879862195131eb42135e6feb6 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 061de2a354f9b7c7d04de3984c90c9bc6dd3a1b8377bb45509f1ad8a8d6337aa \
</span> tcl${version}-src.tar.gz \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 2386a69eb841f8af51c1b124f68e0b812a225cca \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 a265409781e4b3edcc4ef822533071b34c3dc6790b893963809b9fe221befe07
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 5f114bbd95c7208f929fe9ddb3432636d376844c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 7c6b8f84e37332423cfe5bae503440d88450da8cc1243496249faa5268026ba5
</span>
depends_build port:pkgconfig
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -40,8 +40,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-tkMacOSXXStubs.c.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-unix-Makefile.in.diff
</span>
post-patch {
reinplace s|@TCL_SRC_DIR@|${workpath}/tcl${version}/|g ${worksrcpath}/Makefile.in
<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 ffc5c5f..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,21 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- macosx/tkMacOSXXStubs.c.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ macosx/tkMacOSXXStubs.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -891,15 +891,17 @@ XGetImage(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int bytes_per_row = 4*width;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int size;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- MacDrawable *macDraw = (MacDrawable *) d;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ int scalefactor = 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if __MAC_OS_X_VERSION_MAX_ALLOWED >= 1070
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- NSWindow *win = TkMacOSXDrawableWindow(d);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* This code assumes that backing scale factors are integers. Currently
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * Retina displays use a scale factor of 2.0 and normal displays use 1.0.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * We do not support any other values here.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- int scalefactor = 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (win && [win respondsToSelector:@selector(backingScaleFactor)]) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- scalefactor = ([win backingScaleFactor] == 2.0) ? 2 : 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int scaled_height = height * scalefactor;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int scaled_width = width * scalefactor;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>
</pre>