<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/0a883ad388b2cbecf14f5ed674bfc9b6d2ce6f23">https://github.com/macports/macports-ports/commit/0a883ad388b2cbecf14f5ed674bfc9b6d2ce6f23</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 0a883ad tk: Fix +quartz build failure on OS X 10.8 and 10.9
</span>0a883ad is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 0a883ad388b2cbecf14f5ed674bfc9b6d2ce6f23
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Sat Jan 6 19:47:13 2018 -0600
<span style='display:block; white-space:pre;color:#404040;'> tk: Fix +quartz build failure on OS X 10.8 and 10.9
</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/55649
</span>---
x11/tk/Portfile | 3 ++-
x11/tk/files/patch-macosx-tkMacOSXXStubs.c.diff | 15 +++++++++++++++
2 files changed, 17 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 39ce804..d7e0631 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;'>@@ -40,7 +40,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-macosx-tkMacOSXXStubs.c.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 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>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..e63788c
</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,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix build failure with +quartz variant on OS X 10.8 and 10.9.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Even though Gestalt was deprecated in OS X 10.8, it should work fine
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+through OS X 10.9, and its replacement NSOperatingSystemVersion was
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+not introduced until OS X 10.10.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- macosx/tkMacOSXXStubs.c.orig 2017-12-06 09:25:08.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ macosx/tkMacOSXXStubs.c 2018-01-06 19:34:17.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -175,7 +175,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int major, minor, patch;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if MAC_OS_X_VERSION_MIN_REQUIRED < 1080
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if MAC_OS_X_VERSION_MIN_REQUIRED < 101000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Gestalt(gestaltSystemVersionMajor, (SInt32*)&major);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Gestalt(gestaltSystemVersionMinor, (SInt32*)&minor);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Gestalt(gestaltSystemVersionBugFix, (SInt32*)&patch);
</span></pre><pre style='margin:0'>
</pre>