<pre style='margin:0'>
Mojca Miklavec (mojca) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/4efa46456029152e68909f7bcdf683a3e361aa19">https://github.com/macports/macports-ports/commit/4efa46456029152e68909f7bcdf683a3e361aa19</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 4efa464 tk: allow building +quartz on non-Retina systems
</span>4efa464 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 4efa46456029152e68909f7bcdf683a3e361aa19
</span>Author: Davide Liessi <davide.liessi@gmail.com>
AuthorDate: Mon May 15 23:51:04 2017 +0200
<span style='display:block; white-space:pre;color:#404040;'> tk: allow building +quartz on non-Retina systems
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Building of Tk breaks when building against SDK for 10.6 or older.
</span><span style='display:block; white-space:pre;color:#404040;'> This patch hides the code when `backingScaleFactor` is not known to the API
</span><span style='display:block; white-space:pre;color:#404040;'> at the time of the build.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See: http://core.tcl.tk/tk/tktview/5f44d4f5ea47cb81c6fa66287cb721be80caedc1
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/52090
</span>---
x11/tk/Portfile | 3 ++-
x11/tk/files/patch-macosx-tkMacOSXXStubs.c.diff | 21 +++++++++++++++++++++
2 files changed, 23 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 608840b..e8333f0 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;'>@@ -42,7 +42,8 @@ depends_lib \
</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-tkMacOSXXStubs.c.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>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..ffc5c5f
</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-tkMacOSXXStubs.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,21 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- macosx/tkMacOSXXStubs.c.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ macosx/tkMacOSXXStubs.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -891,15 +891,17 @@ XGetImage(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int bytes_per_row = 4*width;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int size;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MacDrawable *macDraw = (MacDrawable *) d;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int scalefactor = 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if __MAC_OS_X_VERSION_MAX_ALLOWED >= 1070
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NSWindow *win = TkMacOSXDrawableWindow(d);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* This code assumes that backing scale factors are integers. Currently
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * Retina displays use a scale factor of 2.0 and normal displays use 1.0.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * We do not support any other values here.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int scalefactor = 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (win && [win respondsToSelector:@selector(backingScaleFactor)]) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ scalefactor = ([win backingScaleFactor] == 2.0) ? 2 : 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int scaled_height = height * scalefactor;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int scaled_width = width * scalefactor;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>