<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/21a37b040826f3afa11f2a9a551807e0c21c3679">https://github.com/macports/macports-ports/commit/21a37b040826f3afa11f2a9a551807e0c21c3679</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 21a37b0 cmake: update release to 3.16.0 and devel to 20191129-ca2a3929
</span>21a37b0 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 21a37b040826f3afa11f2a9a551807e0c21c3679
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Fri Nov 29 09:32:00 2019 -0500
<span style='display:block; white-space:pre;color:#404040;'> cmake: update release to 3.16.0 and devel to 20191129-ca2a3929
</span>---
devel/cmake/Portfile | 21 +++---
...h-Source_CMakeVersionCompute.cmake.release.diff | 12 ---
.../patch-fix-system-prefix-path.release.diff | 4 +-
.../files/patch-fix_cxx14_17_checks.release.diff | 86 ++++++++--------------
devel/cmake/files/patch-qt4gui.release.diff | 2 +-
devel/cmake/files/patch-qt5gui.release.diff | 2 +-
6 files changed, 45 insertions(+), 82 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 a255403..bb571f9 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;'>@@ -44,16 +44,16 @@ dist_subdir cmake
</span>
subport cmake-devel {}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set branch 3.15
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set branch 3.16
</span>
if {${subport} eq ${name}} {
# release
<span style='display:block; white-space:pre;background:#ffe0e0;'>- version ${branch}.5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 f264ed805dc48ae211c212032fc4aeb96318f226 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 fbdd7cef15c0ced06bb13024bfda0ecc0dedbcaaaa6b8a5d368c75255243beb4 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 9271925
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version ${branch}.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 e03aac7bb7460a2f9c2da96c91ee8371a04dc7cf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 6da56556c63cab6e9a3e1656e8763ed4a841ac9859fefb63cbe79472e67e8c5f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 9107654
</span> revision 0
master_sites ${homepage}/files/v${branch}/
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -66,7 +66,6 @@ if {${subport} eq ${name}} {
</span> patchfiles-append \
patch-Modules-noArchCheck.release.diff \
patch-CMakeFindFrameworks.cmake.release.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-Source_CMakeVersionCompute.cmake.release.diff \
</span> patch-Source_Modules_FindLibUV.cmake.release.diff \
patch-fix_cxx14_17_checks.release.diff \
patch-fix-system-prefix-path.release.diff
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -79,11 +78,11 @@ if {${subport} eq ${name}} {
</span>
# devel
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set commit cf598311ce9c6edb2b7d2a1de945ba7f2418c2fb
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version 20191117-[string range ${commit} 0 7]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 4f0482bd92c6eedbe492fd88923f8f323a0956b8 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 d5b44f2589c7004c0db4b9e1a10105c691a183e5c544fc03de1a31742f127b64 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 7104442
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set commit ca2a3929c2c7d479b12bab96d1910eff87380861
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 20191129-[string range ${commit} 0 7]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 b1d81d03495284e96f33a72c880fa0172af2f024 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 e58f3f5e7995f169b553bb27641db47d632a11b2f509cf08135269eca0f70f86 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 7113568
</span> revision 0
use_bzip2 yes
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/cmake/files/patch-Source_CMakeVersionCompute.cmake.release.diff b/devel/cmake/files/patch-Source_CMakeVersionCompute.cmake.release.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index eec9810..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/cmake/files/patch-Source_CMakeVersionCompute.cmake.release.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,12 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Source/CMakeVersionCompute.cmake.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Source/CMakeVersionCompute.cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -10,6 +10,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(CMake_VERSION_IS_DIRTY 0) # may be set to 1 by CMakeVersionSource
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(CMake_VERSION_IS_RELEASE 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- include(${CMake_SOURCE_DIR}/Source/CMakeVersionSource.cmake)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if(NOT CMake_VERSION_IS_DIRTY)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set(CMake_VERSION_IS_DIRTY 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Compute the full version string.
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/cmake/files/patch-fix-system-prefix-path.release.diff b/devel/cmake/files/patch-fix-system-prefix-path.release.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 230c7e1..7ade0d2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/cmake/files/patch-fix-system-prefix-path.release.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/cmake/files/patch-fix-system-prefix-path.release.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span> --- Modules/Platform/Darwin.cmake.orig
+++ Modules/Platform/Darwin.cmake
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -219,6 +219,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -203,6 +203,12 @@
</span> ${_apps_paths})
unset(_apps_paths)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -13,7 +13,7 @@
</span> include(Platform/UnixPaths)
if(_CMAKE_OSX_SYSROOT_PATH AND EXISTS ${_CMAKE_OSX_SYSROOT_PATH}/usr/include)
list(APPEND CMAKE_SYSTEM_PREFIX_PATH ${_CMAKE_OSX_SYSROOT_PATH}/usr)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -226,7 +232,3 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -210,7 +216,3 @@
</span> list(APPEND _CMAKE_${lang}_IMPLICIT_INCLUDE_DIRECTORIES_INIT ${_CMAKE_OSX_SYSROOT_PATH}/usr/include)
endforeach()
endif()
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/cmake/files/patch-fix_cxx14_17_checks.release.diff b/devel/cmake/files/patch-fix_cxx14_17_checks.release.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 2930d38..1a488b1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/cmake/files/patch-fix_cxx14_17_checks.release.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/cmake/files/patch-fix_cxx14_17_checks.release.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,68 +1,40 @@
</span> --- Source/Checks/cm_cxx14_check.cpp.orig
+++ Source/Checks/cm_cxx14_check.cpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,15 +1,16 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include <cstdio>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include <iterator>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,9 +1,18 @@
</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:#ffe0e0;'>-+
</span> +#include <iostream>
<span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <cstdio>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <iterator>
</span> #include <memory>
<span style='display:block; white-space:pre;background:#ffe0e0;'>--int main()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+int
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+main
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+(void)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int main()
</span> {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- int a[] = { 0, 1, 2 };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- auto ai = std::cbegin(a);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- int b[] = { 2, 1, 0 };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- auto bi = std::cend(b);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- std::unique_ptr<int> u(new int(0));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- 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:#ffe0e0;'>-+ return 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><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> --- Source/Checks/cm_cxx17_check.cpp.orig
+++ Source/Checks/cm_cxx17_check.cpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,31 +1,27 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include <cstdio>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include <iterator>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include <memory>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include <unordered_map>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// requires c++17 or newer, so will fail tests of c++14 or earlier
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <optional>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifdef _MSC_VER
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# include <comdef.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,3 +1,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// actually use c++14 feature to force the compiler to do something,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// since it might otherwise try to optimize all of this out even if it
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// doesn't understand it.
</span> +#include <iostream>
+#include <string>
<span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <cstdio>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <iterator>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <memory>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -8,6 +14,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # include <comdef.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>--int main()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- int a[] = { 0, 1, 2 };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- auto ai = std::cbegin(a);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- int b[] = { 2, 1, 0 };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- auto bi = std::cend(b);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- auto ci = std::size(a);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- std::unique_ptr<int> u(new int(0));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifdef _MSC_VER
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- // clang-cl has problems instantiating this constructor in C++17 mode
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- // error: indirection requires pointer operand ('const _GUID' invalid)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- // return *_IID;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- IUnknownPtr ptr{};
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- IDispatchPtr disp(ptr);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif
</span> +std::optional < std::string >
+create
+(bool b) {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -71,17 +43,21 @@
</span> + }
+ return {};
+}
<span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int main()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int a[] = { 0, 1, 2 };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -28,6 +43,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ IDispatchPtr disp(ptr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- return *u + *ai + *(bi - 1) + (3 - static_cast<int>(ci));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+int
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+main
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+(void)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{
</span> + std::cout << "create(false) returned "
+ << create(false).value_or("empty")
+ << std::endl;
+ std::cout << "create(true) returned "
+ << create(true).value_or("empty")
+ << std::endl;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ std::optional<int> oi = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return *u + *ai + *(bi - 1) + (3 - static_cast<int>(ci)) + oi.value();
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/cmake/files/patch-qt4gui.release.diff b/devel/cmake/files/patch-qt4gui.release.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 7b5b8bd..8ebd30e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/cmake/files/patch-qt4gui.release.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/cmake/files/patch-qt4gui.release.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;'>-@@ -708,12 +708,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -732,12 +732,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.release.diff b/devel/cmake/files/patch-qt5gui.release.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 1b4b793..6342f75 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/cmake/files/patch-qt5gui.release.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/cmake/files/patch-qt5gui.release.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;'>-@@ -708,12 +708,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -732,12 +732,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>