<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/e7365db3a7b3164c64fa1e931a4d2945a1ed8693">https://github.com/macports/macports-ports/commit/e7365db3a7b3164c64fa1e931a4d2945a1ed8693</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 e7365db phantomjs: Fix build on Sierra
</span>e7365db is described below
<span style='display:block; white-space:pre;color:#808000;'>commit e7365db3a7b3164c64fa1e931a4d2945a1ed8693
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Tue Apr 4 14:47:44 2017 -0500
<span style='display:block; white-space:pre;color:#404040;'> phantomjs: Fix build on Sierra
</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/52365
</span>---
www/phantomjs/Portfile | 3 ++-
www/phantomjs/files/xcrun.patch | 24 ++++++++++++++++++++++++
2 files changed, 26 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/phantomjs/Portfile b/www/phantomjs/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 6ca5bc9..06d47c7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/phantomjs/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/phantomjs/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,7 +30,8 @@ depends_lib port:openssl
</span>
patchfiles patch-tools_preconfig.sh.diff \
patch-qcocoaapplicationdelegate.mm.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-src__tools__qlalr__lalr.cpp.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-src__tools__qlalr__lalr.cpp.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xcrun.patch
</span>
use_configure no
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/phantomjs/files/xcrun.patch b/www/phantomjs/files/xcrun.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..9f45282
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/phantomjs/files/xcrun.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,24 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix build failure with Xcode 8 beta 2 and later.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/qt/qtbase/commit/77a71c32c9d19b87f79b208929e71282e8d8b5d9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/qt/qtbase/configure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/qt/qtbase/configure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -511,7 +511,7 @@ if [ "$BUILD_ON_MAC" = "yes" ]; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ exit 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if ! /usr/bin/xcrun -find xcrun >/dev/null 2>&1; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if ! /usr/bin/xcrun -find xcodebuild >/dev/null 2>&1; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo >&2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo " Xcode not set up properly. You may need to confirm the license" >&2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo " agreement by running /usr/bin/xcodebuild without arguments." >&2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/qt/qtbase/mkspecs/features/mac/default_pre.prf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/qt/qtbase/mkspecs/features/mac/default_pre.prf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -12,7 +12,7 @@ isEmpty(QMAKE_XCODE_DEVELOPER_PATH) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ error("Xcode is not installed in $${QMAKE_XCODE_DEVELOPER_PATH}. Please use xcode-select to choose Xcode installation path.")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Make sure Xcode is set up properly
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- isEmpty($$list($$system("/usr/bin/xcrun -find xcrun 2>/dev/null"))): \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ isEmpty($$list($$system("/usr/bin/xcrun -find xcodebuild 2>/dev/null"))): \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ error("Xcode not set up properly. You may need to confirm the license agreement by running /usr/bin/xcodebuild.")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>