<pre style='margin:0'>
Michael Dickens (michaelld) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/9ba186d029cfa8a440a5c9f3972370130f302dd3">https://github.com/macports/macports-ports/commit/9ba186d029cfa8a440a5c9f3972370130f302dd3</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 9ba186d qt4-mac: fix for building on 10.13 and Xcode 9
</span>9ba186d is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 9ba186d029cfa8a440a5c9f3972370130f302dd3
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Wed Sep 27 15:41:49 2017 -0400
<span style='display:block; white-space:pre;color:#404040;'> qt4-mac: fix for building on 10.13 and Xcode 9
</span>---
aqua/qt4-mac/Portfile | 9 +++++++--
.../patch-src_gui_kernel_qt_cocoa_helpers_mac.mm.diff | 15 +++++++++++++++
2 files changed, 22 insertions(+), 2 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt4-mac/Portfile b/aqua/qt4-mac/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 19370a2..beb5214 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt4-mac/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt4-mac/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -292,15 +292,20 @@ patchfiles-append patch-better-invalid-fonttable-handling.diff
</span>
patchfiles-append patch-fix_pointer_comparison_to_0.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# (30) Fix build on 10.13; comment out assertions
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# won't hurt current builds, but allows building on 10.13 / Xcode 9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-src_gui_kernel_qt_cocoa_helpers_mac.mm.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # error out if trying to build on a new OSX version (> 10.12).
platform darwin {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${MINOR} > 12} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${MINOR} > 13} {
</span> # This project needs to be updated to build with clang++ against libc++
depends_lib
depends_run
pre-fetch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "$name does not currently build on Mac OS X later than 10.12 'Sierra'."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_error "$name does not currently build on Mac OS X later than 10.13 'High Sierra'."
</span> error "unsupported platform"
}
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt4-mac/files/patch-src_gui_kernel_qt_cocoa_helpers_mac.mm.diff b/aqua/qt4-mac/files/patch-src_gui_kernel_qt_cocoa_helpers_mac.mm.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..780a1cb
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt4-mac/files/patch-src_gui_kernel_qt_cocoa_helpers_mac.mm.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;'>+--- src/gui/kernel/qt_cocoa_helpers_mac.mm.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/gui/kernel/qt_cocoa_helpers_mac.mm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -351,9 +351,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Verbatim copy if HIViewDrawCGImage (as shown on Carbon-Dev)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OSStatus err = noErr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- require_action(inContext != NULL, InvalidContext, err = paramErr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- require_action(inBounds != NULL, InvalidBounds, err = paramErr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- require_action(inImage != NULL, InvalidImage, err = paramErr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// require_action(inContext != NULL, InvalidContext, err = paramErr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// require_action(inBounds != NULL, InvalidBounds, err = paramErr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// require_action(inImage != NULL, InvalidImage, err = paramErr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CGContextSaveGState( inContext );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CGContextTranslateCTM (inContext, 0, inBounds->origin.y + CGRectGetMaxY(*inBounds));
</span></pre><pre style='margin:0'>
</pre>