<pre style='margin:0'>
Marcus Calhoun-Lopez (MarcusCalhoun-Lopez) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/25e75561f5aff16201dd1e53428b2577f6090eaf">https://github.com/macports/macports-ports/commit/25e75561f5aff16201dd1e53428b2577f6090eaf</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 25e7556  fltk: fix using Xcode 10 using upstream patches
</span>25e7556 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 25e75561f5aff16201dd1e53428b2577f6090eaf
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Wed Oct 10 23:22:23 2018 -0700

<span style='display:block; white-space:pre;color:#404040;'>    fltk: fix using Xcode 10 using upstream patches
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    See https://github.com/fltk/fltk/commit/f76d2a2bf8c35c0c313f05bbd6deda49dd344efc
</span>---
 aqua/fltk/Portfile                          | 16 +++++++++++++---
 aqua/fltk/files/patch-fix_empty_window.diff | 22 ++++++++++++++++++++++
 2 files changed, 35 insertions(+), 3 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/fltk/Portfile b/aqua/fltk/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index fbcfce6..6761bcd 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/fltk/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/fltk/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -38,7 +38,8 @@ if {${subport} eq ${name}} {
</span>     # again on 10.11.
 
     version         1.3.4
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    set ver_bump    1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    revision        1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    set ver_bump    2
</span>     master_sites    http://fltk.org/pub/fltk/${version}/
     if {${ver_bump} == 0} {
         worksrcdir      ${name}-${version}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -47,8 +48,9 @@ if {${subport} eq ${name}} {
</span>     }
     distname        ${worksrcdir}-source
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    checksums       rmd160 06abc605fe4f27a8086c01c7d7941ea152132760 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    sha256 7fb2c8882433ce694e6900c94fda505e8f4ed3fa9c7e597007098a33b85c53f4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    checksums       rmd160  bc0441ae6ee2b961b339c4b1a484cebd6b4ab608 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    sha256  25d349c18c99508737d48f225a2eb26a43338f9247551cab72a317fa42cda910 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    size    5281263
</span> 
     livecheck.regex "Stable Release.*?\n.*?VERSION=(\\d+(\\.\\d+)*)'"
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -79,6 +81,14 @@ depends_lib     port:jpeg \
</span> patchfiles-append \
         patch-fluid-Makefile.diff
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${subport} eq "fltk"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # see https://github.com/fltk/fltk/commit/f76d2a2bf8c35c0c313f05bbd6deda49dd344efc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    if {[vercmp ${xcodeversion} 10.0] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            patch-fix_empty_window.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> #if {${subport} eq "fltk"} {
 #    patchfiles-append \
 #        patch-src-Makefile.release.diff \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/fltk/files/patch-fix_empty_window.diff b/aqua/fltk/files/patch-fix_empty_window.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..8e7d210
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/fltk/files/patch-fix_empty_window.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;'>+--- src/Fl_cocoa.mm.orig   2017-09-14 12:42:23.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/Fl_cocoa.mm        2018-10-10 23:04:17.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3301,14 +3301,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   fl_window = i->xid;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   Fl_X::set_high_resolution( i->mapped_to_retina() );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   current_ = this;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  NSGraphicsContext *nsgc;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  if (fl_mac_os_version >= 100400)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    nsgc = [fl_window graphicsContext]; // 10.4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    nsgc = through_Fl_X_flush ? [NSGraphicsContext currentContext] : [NSGraphicsContext graphicsContextWithWindow:fl_window];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  NSGraphicsContext *nsgc = through_Fl_X_flush ? [NSGraphicsContext currentContext] : [NSGraphicsContext graphicsContextWithWindow:fl_window];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  if (!nsgc) { // this occurs on 10.14 when through_Fl_X_flush==0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++      [[fl_window contentView] lockFocus];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++      nsgc = [NSGraphicsContext currentContext];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   i->gc = (CGContextRef)[nsgc graphicsPort];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   fl_gc = i->gc;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   CGContextSaveGState(fl_gc); // native context
</span></pre><pre style='margin:0'>

</pre>