<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/af3d416600a96fd7b87c83de3cd1fac8c8838bcd">https://github.com/macports/macports-ports/commit/af3d416600a96fd7b87c83de3cd1fac8c8838bcd</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 af3d416 qt59-qtlocation: avoid C++17
</span>af3d416 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit af3d416600a96fd7b87c83de3cd1fac8c8838bcd
</span>Author: Marcus Calhoun-Lopez <marcuscalhounlopez@gmail.com>
AuthorDate: Sun Jun 10 11:44:52 2018 -0700
<span style='display:block; white-space:pre;color:#404040;'> qt59-qtlocation: avoid C++17
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes https://trac.macports.org/ticket/56615
</span><span style='display:block; white-space:pre;color:#404040;'> See https://bugreports.qt.io/browse/QTBUG-67810
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> No revbump because the port either builds successfully or not at all
</span>---
aqua/qt59/Portfile | 4 ++++
aqua/qt59/files/patch-qtlocation-no-cxx17.diff | 10 ++++++++++
2 files changed, 14 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt59/Portfile b/aqua/qt59/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d232f58..568eb21 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt59/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt59/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1231,6 +1231,10 @@ foreach {module module_info} [array get modules] {
</span> reinplace "s|return 0;|return 0;\\\n#error turn off test|g" ${worksrcpath}/config.tests/${test}/main.cpp
}
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://trac.macports.org/ticket/56615
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://bugreports.qt.io/browse/QTBUG-67810
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-qtlocation-no-cxx17.diff
</span> }
# special case
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt59/files/patch-qtlocation-no-cxx17.diff b/aqua/qt59/files/patch-qtlocation-no-cxx17.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..4120b52
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt59/files/patch-qtlocation-no-cxx17.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/3rdparty/mapbox-gl-native/mapbox-gl-native.pro.orig 2017-11-29 10:38:56.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/3rdparty/mapbox-gl-native/mapbox-gl-native.pro 2018-06-10 10:32:18.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3,6 +3,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ load(qt_helper_lib)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CONFIG += qt c++14 exceptions warn_off staticlib object_parallel_to_source
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++CONFIG -= c++1z
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QT += network-private \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gui-private \
</span></pre><pre style='margin:0'>
</pre>