<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/ccf1fe3859bef7d4c3fac397f1051b41227ef87c">https://github.com/macports/macports-ports/commit/ccf1fe3859bef7d4c3fac397f1051b41227ef87c</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 ccf1fe3 cmake-devel: update to 033728e8 (20190302)
</span>ccf1fe3 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit ccf1fe3859bef7d4c3fac397f1051b41227ef87c
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Sun Mar 3 07:27:49 2019 -0500
<span style='display:block; white-space:pre;color:#404040;'> cmake-devel: update to 033728e8 (20190302)
</span>---
devel/cmake/Portfile | 10 ++++-----
.../files/patch-fix_cxx14_17_checks.devel.diff | 24 ++++++++++++++++++----
devel/cmake/files/patch-qt4gui.devel.diff | 2 +-
devel/cmake/files/patch-qt5gui.devel.diff | 2 +-
4 files changed, 27 insertions(+), 11 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/cmake/Portfile b/devel/cmake/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e8df685..6248250 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/cmake/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/cmake/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -65,11 +65,11 @@ if {${subport} eq ${name}} {
</span>
# devel
<span style='display:block; white-space:pre;background:#ffe0e0;'>- version 20190225
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set commit f259e8759ce300cd505e30cda1b5fca3ba100cc5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 cbe34263f094adac639c892c109372cfcace7e31 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 32f6a272f6a32ac276a0cd6c75666eb0b777a8cac1b1cd54d1324b6395f0acb2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 6626973
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 20190302
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set commit 033728e86780d61215ebcab442d9a130bdd0461c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 0bf338596f65d5d26f4693c8fd0e196cea547d58 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 38cad7834156e1ca5c38f949bc2cc49a8897da50246ac1eb0e518e10ab441152 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 6608637
</span> revision 0
use_bzip2 yes
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/cmake/files/patch-fix_cxx14_17_checks.devel.diff b/devel/cmake/files/patch-fix_cxx14_17_checks.devel.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 8c2d890..2930d38 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/cmake/files/patch-fix_cxx14_17_checks.devel.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/cmake/files/patch-fix_cxx14_17_checks.devel.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,8 @@
</span> --- Source/Checks/cm_cxx14_check.cpp.orig
+++ Source/Checks/cm_cxx14_check.cpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,8 +1,16 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,15 +1,16 @@
</span> -#include <cstdio>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <iterator>
</span> +// actually use c++14 feature to force the compiler to do something,
+// since it might otherwise try to optimize all of this out even if it
+// doesn't understand it.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -14,8 +15,14 @@
</span> +main
+(void)
{
<span style='display:block; white-space:pre;background:#e0ffe0;'>+- int a[] = { 0, 1, 2 };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- auto ai = std::cbegin(a);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int b[] = { 2, 1, 0 };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- auto bi = std::cend(b);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span> - std::unique_ptr<int> u(new int(0));
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- return *u;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return *u + *ai + *(bi - 1);
</span> + std::unique_ptr < int > foo = std::make_unique < int > (4);
+ std::cout << "std::make_unique < int >(4) is '"
+ << *foo << "'" << std::endl;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,8 +30,9 @@
</span> }
--- Source/Checks/cm_cxx17_check.cpp.orig
+++ Source/Checks/cm_cxx17_check.cpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,22 +1,27 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,31 +1,27 @@
</span> -#include <cstdio>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <iterator>
</span> -#include <memory>
-#include <unordered_map>
+// requires c++17 or newer, so will fail tests of c++14 or earlier
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -38,6 +46,14 @@
</span>
-int main()
-{
<span style='display:block; white-space:pre;background:#e0ffe0;'>+- int a[] = { 0, 1, 2 };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- auto ai = std::cbegin(a);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int b[] = { 2, 1, 0 };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- auto bi = std::cend(b);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- auto ci = std::size(a);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span> - std::unique_ptr<int> u(new int(0));
-
-#ifdef _MSC_VER
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -56,7 +72,7 @@
</span> + return {};
+}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- return *u;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return *u + *ai + *(bi - 1) + (3 - static_cast<int>(ci));
</span> +int
+main
+(void)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/cmake/files/patch-qt4gui.devel.diff b/devel/cmake/files/patch-qt4gui.devel.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 36ea580..47912f3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/cmake/files/patch-qt4gui.devel.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/cmake/files/patch-qt4gui.devel.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -157,7 +157,7 @@
</span> install(CODE "
--- CMakeLists.txt.orig
+++ CMakeLists.txt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -699,12 +699,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -691,12 +691,6 @@
</span> set(CMAKE_BUNDLE_VERSION
"${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}.${CMake_VERSION_PATCH}")
set(CMAKE_BUNDLE_LOCATION "${CMAKE_INSTALL_PREFIX}")
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/cmake/files/patch-qt5gui.devel.diff b/devel/cmake/files/patch-qt5gui.devel.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 9953fd9..28071b3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/cmake/files/patch-qt5gui.devel.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/cmake/files/patch-qt5gui.devel.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -78,7 +78,7 @@
</span> install(CODE "
--- CMakeLists.txt.orig
+++ CMakeLists.txt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -699,12 +699,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -691,12 +691,6 @@
</span> set(CMAKE_BUNDLE_VERSION
"${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}.${CMake_VERSION_PATCH}")
set(CMAKE_BUNDLE_LOCATION "${CMAKE_INSTALL_PREFIX}")
</pre><pre style='margin:0'>
</pre>