<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/19801d57936afc04d5750a4b7089055c3ab4f866">https://github.com/macports/macports-ports/commit/19801d57936afc04d5750a4b7089055c3ab4f866</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 19801d5 cmake: update release to 3.15.0 and devel to 20190718-ac000e29
</span>19801d5 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 19801d57936afc04d5750a4b7089055c3ab4f866
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Fri Jul 19 10:29:41 2019 -0400
<span style='display:block; white-space:pre;color:#404040;'> cmake: update release to 3.15.0 and devel to 20190718-ac000e29
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> + now require Python3X for +docs;
</span><span style='display:block; white-space:pre;color:#404040;'> + default Python is now 3.6 (was 2.7).
</span>---
devel/cmake/Portfile | 71 ++++++++++------------
.../files/patch-Modules-noArchCheck.release.diff | 14 ++---
.../patch-fix-system-prefix-path.release.diff | 4 +-
.../files/patch-fix_cxx14_17_checks.release.diff | 45 +++++++++-----
devel/cmake/files/patch-qt4gui.release.diff | 20 +++---
devel/cmake/files/patch-qt5gui.release.diff | 18 +++---
6 files changed, 89 insertions(+), 83 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 8b4afd5..c161295 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;'>@@ -41,16 +41,16 @@ dist_subdir cmake
</span>
subport cmake-devel {}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set branch 3.14
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set branch 3.15
</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 dd8c7c0aa7a64584453eec13fbc292c4d7edfd7c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 505ae49ebe3c63c595fa5f814975d8b72848447ee13b6613b0f8b96ebda18c06 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 8854929
</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 7f765e330737c04e99473804cacab752b7609233 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 0678d74a45832cacaea053d85a5685f3ed8352475e6ddf9fcb742ffca00199b5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 9266870
</span> revision 0
master_sites ${homepage}/files/v${branch}/
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -76,11 +76,11 @@ if {${subport} eq ${name}} {
</span>
# devel
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set commit 06f1560a58391d29b10697b2d5462966cd417b2f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version 20190626-[string range ${commit} 0 7]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 25a7d65e775290ea12e63dadaed5698b6c483331 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 60da1b7933845672734ca315cd73cf2a12b6c4eb8e9d91adb0a348a9ae0756cf \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 6956639
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set commit ac000e29da89eec74fc106fc41c48a098f8ff971
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 20190718-[string range ${commit} 0 7]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 df79cfef4476198d82ff28b99e6133910b848316 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 2bef4318f0d9b2c0b89c63a1e2e9d479aba6fb94f80c854ef5a4d3c30eeecb26 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 6993079
</span> revision 0
use_bzip2 yes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -270,60 +270,53 @@ variant docs description {Build documentation: HTML and manpages} {
</span> depends_build-append \
port:py${PYTHON_VERSION_NO_DOT}-sphinx
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # these are required for Py3X, but not Py27
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${PYTHON_VERSION_NO_DOT} ne "27"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${PYTHON_VERSION_NO_DOT}-sphinxcontrib-applehelp \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${PYTHON_VERSION_NO_DOT}-sphinxcontrib-devhelp \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${PYTHON_VERSION_NO_DOT}-sphinxcontrib-htmlhelp \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${PYTHON_VERSION_NO_DOT}-sphinxcontrib-jsmath \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${PYTHON_VERSION_NO_DOT}-sphinxcontrib-qthelp \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${PYTHON_VERSION_NO_DOT}-sphinxcontrib-serializinghtml \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${PYTHON_VERSION_NO_DOT}-sphinxcontrib-websupport
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${PYTHON_VERSION_NO_DOT}-sphinxcontrib-applehelp \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${PYTHON_VERSION_NO_DOT}-sphinxcontrib-devhelp \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${PYTHON_VERSION_NO_DOT}-sphinxcontrib-htmlhelp \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${PYTHON_VERSION_NO_DOT}-sphinxcontrib-jsmath \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${PYTHON_VERSION_NO_DOT}-sphinxcontrib-qthelp \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${PYTHON_VERSION_NO_DOT}-sphinxcontrib-serializinghtml \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${PYTHON_VERSION_NO_DOT}-sphinxcontrib-websupport
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python27 conflicts python34 python35 python36 requires docs \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- description {Build documentation using Sphinx from Python 2.7} {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# cmake 3.15 requires Python3X for +docs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# variant python27 conflicts python34 python35 python36 requires docs \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# description {Build documentation using Sphinx from Python 2.7} {}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python34 conflicts python27 python35 python36 python37 requires docs \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python34 conflicts python35 python36 python37 requires docs \
</span> description {Build documentation using Sphinx from Python 3.4} {}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python35 conflicts python27 python34 python36 python37 requires docs \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python35 conflicts python34 python36 python37 requires docs \
</span> description {Build documentation using Sphinx from Python 3.5} {}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python36 conflicts python27 python34 python35 python37 requires docs \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python36 conflicts python34 python35 python37 requires docs \
</span> description {Build documentation using Sphinx from Python 3.6} {}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python37 conflicts python27 python34 python35 python36 requires docs \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python37 conflicts python34 python35 python36 requires docs \
</span> description {Build documentation using Sphinx from Python 3.7} {}
if {[variant_isset docs]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # default Python is 2.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![variant_isset python27] &&
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ![variant_isset python34] &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # default Python is 3.6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![variant_isset python34] &&
</span> ![variant_isset python35] &&
![variant_isset python36] &&
![variant_isset python37]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants +python27
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants +python36
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # make sure -python27 is not specified alone
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![variant_isset python27] &&
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ![variant_isset python34] &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # make sure -python36 is not specified alone
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![variant_isset python34] &&
</span> ![variant_isset python35] &&
![variant_isset python36] &&
![variant_isset python37]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "\n\nYou must select either the +python27, +python34, +python35, +python36, or +python37 variant when using variant +docs.\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_error "\n\nYou must select either the +python34, +python35, +python36, or +python37 variant when using variant +docs.\n"
</span> return -code error "Invalid variant selection"
}
# determine Python-related variables
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[variant_isset python27]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set PYTHON_VERSION_WITH_DOT "2.7"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } elseif {[variant_isset python34]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[variant_isset python34]} {
</span> set PYTHON_VERSION_WITH_DOT "3.4"
} elseif {[variant_isset python35]} {
set PYTHON_VERSION_WITH_DOT "3.5"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/cmake/files/patch-Modules-noArchCheck.release.diff b/devel/cmake/files/patch-Modules-noArchCheck.release.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 5d79d80..0338cf7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/cmake/files/patch-Modules-noArchCheck.release.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/cmake/files/patch-Modules-noArchCheck.release.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,14 +7,14 @@
</span> -
-# if the installed or the using project don't have CMAKE_SIZEOF_VOID_P set, ignore it:
-if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "" OR "@CMAKE_SIZEOF_VOID_P@" STREQUAL "")
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- return()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return()
</span> -endif()
-
-# check that the installed version has the same 32/64bit-ness as the one which is currently searching:
-if(NOT CMAKE_SIZEOF_VOID_P STREQUAL "@CMAKE_SIZEOF_VOID_P@")
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- math(EXPR installedBits "@CMAKE_SIZEOF_VOID_P@ * 8")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(PACKAGE_VERSION "${PACKAGE_VERSION} (${installedBits}bit)")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(PACKAGE_VERSION_UNSUITABLE TRUE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- math(EXPR installedBits "@CMAKE_SIZEOF_VOID_P@ * 8")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(PACKAGE_VERSION "${PACKAGE_VERSION} (${installedBits}bit)")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(PACKAGE_VERSION_UNSUITABLE TRUE)
</span> -endif()
--- Modules/BasicConfigVersion-ExactVersion.cmake.in.orig
+++ Modules/BasicConfigVersion-ExactVersion.cmake.in
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,7 +25,7 @@
</span> -
-# if the installed or the using project don't have CMAKE_SIZEOF_VOID_P set, ignore it:
-if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "" OR "@CMAKE_SIZEOF_VOID_P@" STREQUAL "")
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- return()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return()
</span> -endif()
-
-# check that the installed version has the same 32/64bit-ness as the one which is currently searching:
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -43,7 +43,7 @@
</span> -
-# if the installed or the using project don't have CMAKE_SIZEOF_VOID_P set, ignore it:
-if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "" OR "@CMAKE_SIZEOF_VOID_P@" STREQUAL "")
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- return()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return()
</span> -endif()
-
-# check that the installed version has the same 32/64bit-ness as the one which is currently searching:
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -61,7 +61,7 @@
</span> -
-# if the installed or the using project don't have CMAKE_SIZEOF_VOID_P set, ignore it:
-if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "" OR "@CMAKE_SIZEOF_VOID_P@" STREQUAL "")
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- return()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return()
</span> -endif()
-
-# check that the installed version has the same 32/64bit-ness as the one which is currently searching:
<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 6c6dbbd..230c7e1 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;'>-@@ -210,6 +210,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -219,6 +219,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;'>-@@ -217,7 +223,3 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -226,7 +232,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 7baa264..2930d38 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;'>@@ -30,7 +30,7 @@
</span> }
--- Source/Checks/cm_cxx17_check.cpp.orig
+++ Source/Checks/cm_cxx17_check.cpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,18 +1,27 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,31 +1,27 @@
</span> -#include <cstdio>
-#include <iterator>
-#include <memory>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -38,6 +38,12 @@
</span> +// requires c++17 or newer, so will fail tests of c++14 or earlier
+#include <optional>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifdef _MSC_VER
</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:#e0ffe0;'>++#include <iostream>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <string>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> -int main()
-{
- int a[] = { 0, 1, 2 };
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -45,30 +51,37 @@
</span> -
- int b[] = { 2, 1, 0 };
- auto bi = std::cend(b);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <iostream>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <string>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span> - auto ci = std::size(a);
<span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- std::unique_ptr<int> u(new int(0));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifdef _MSC_VER
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- // clang-cl has problems instantiating this constructor in C++17 mode
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- // error: indirection requires pointer operand ('const _GUID' invalid)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- // return *_IID;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- IUnknownPtr ptr{};
</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> +std::optional < std::string >
+create
+(bool b) {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (b) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return "foo!";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return {};
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (b) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return "foo!";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return {};
</span> +}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- std::unique_ptr<int> u(new int(0));
</span> - return *u + *ai + *(bi - 1) + (3 - static_cast<int>(ci));
+int
+main
+(void)
+{
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ std::cout << "create(false) returned "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ << create(false).value_or("empty")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ << std::endl;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ std::cout << "create(true) returned "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ << create(true).value_or("empty")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ << std::endl;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ std::cout << "create(false) returned "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ << create(false).value_or("empty")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ << std::endl;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ std::cout << "create(true) returned "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ << create(true).value_or("empty")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ << std::endl;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return 0;
</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 36ea580..7b5b8bd 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;'>@@ -1,8 +1,8 @@
</span> --- Source/QtDialog/CMakeLists.txt.orig
+++ Source/QtDialog/CMakeLists.txt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -6,100 +6,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cmake_policy(SET CMP0020 NEW) # Drop when CMake >= 2.8.11 required
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3,100 +3,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ project(QtDialog)
</span> CMake_OPTIONAL_COMPONENT(cmake-gui)
-find_package(Qt5Widgets QUIET)
-if (Qt5Widgets_FOUND)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -101,7 +101,7 @@
</span> set(QT_MIN_VERSION "4.4.0")
find_package(Qt4 REQUIRED)
if(NOT QT4_FOUND)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -111,8 +17,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -108,8 +14,6 @@ else()
</span>
set(CMake_QT_LIBRARIES ${QT_LIBRARIES})
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -110,7 +110,7 @@
</span> set(SRCS
AddCacheEntry.cxx
AddCacheEntry.h
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -157,7 +61,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -154,7 +58,7 @@ set(SRCS ${SRCS} ${UI_SRCS} ${MOC_SRCS} ${RC_SRCS})
</span> if(WIN32)
set(SRCS ${SRCS} CMakeSetup.rc)
endif()
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -119,7 +119,7 @@
</span> set(SRCS ${SRCS} CMakeSetup.icns)
set(MACOSX_BUNDLE_ICON_FILE CMakeSetup.icns)
set_source_files_properties(CMakeSetup.icns PROPERTIES
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -174,7 +78,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -171,7 +75,7 @@ endif()
</span>
set(CMAKE_INCLUDE_CURRENT_DIR ON)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -128,7 +128,7 @@
</span> target_link_libraries(cmake-gui CMakeLib ${QT_QTMAIN_LIBRARY} ${CMake_QT_LIBRARIES})
if(WIN32)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -200,7 +104,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -197,7 +101,7 @@ Checks: '-*,llvm-twine-local'
</span> ...
")
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -137,7 +137,7 @@
</span> file(STRINGS "${CMake_SOURCE_DIR}/Copyright.txt" copyright_line
LIMIT_COUNT 1 REGEX "^Copyright 2000-20[0-9][0-9] Kitware")
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -246,7 +150,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -243,7 +147,7 @@ if(UNIX AND NOT APPLE)
</span> ${COMPONENT})
endif()
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -146,7 +146,7 @@
</span> install(CODE "
execute_process(COMMAND ln -s \"../MacOS/CMake\" cmake-gui
WORKING_DIRECTORY \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/bin)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -257,7 +161,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -254,7 +158,7 @@ if(CMake_INSTALL_DEPENDENCIES AND (APPLE OR WIN32))
</span> # install rules for including 3rd party libs such as Qt
# if a system Qt is used (e.g. installed in /usr/lib/), it will not be included in the installation
set(fixup_exe "\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/bin/cmake-gui${CMAKE_EXECUTABLE_SUFFIX}")
<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;'>+@@ -708,12 +708,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 9953fd9..1b4b793 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;'>@@ -1,7 +1,7 @@
</span> --- Source/QtDialog/CMakeLists.txt.orig
+++ Source/QtDialog/CMakeLists.txt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -7,7 +7,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4,7 +4,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ project(QtDialog)
</span> CMake_OPTIONAL_COMPONENT(cmake-gui)
find_package(Qt5Widgets QUIET)
-if (Qt5Widgets_FOUND)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -11,7 +11,7 @@
</span> include_directories(${Qt5Widgets_INCLUDE_DIRS})
add_definitions(${Qt5Widgets_DEFINITONS})
macro(qt4_wrap_ui)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -99,19 +101,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -96,19 +98,6 @@ if (Qt5Widgets_FOUND)
</span> get_filename_component(Qt_BIN_DIR "${Qt_BIN_DIR}" PATH)
endif()
endif()
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,7 +31,7 @@
</span>
set(SRCS
AddCacheEntry.cxx
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -157,7 +146,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -154,7 +143,7 @@ set(SRCS ${SRCS} ${UI_SRCS} ${MOC_SRCS} ${RC_SRCS})
</span> if(WIN32)
set(SRCS ${SRCS} CMakeSetup.rc)
endif()
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -40,7 +40,7 @@
</span> set(SRCS ${SRCS} CMakeSetup.icns)
set(MACOSX_BUNDLE_ICON_FILE CMakeSetup.icns)
set_source_files_properties(CMakeSetup.icns PROPERTIES
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -174,7 +163,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -171,7 +160,7 @@ endif()
</span>
set(CMAKE_INCLUDE_CURRENT_DIR ON)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -49,7 +49,7 @@
</span> target_link_libraries(cmake-gui CMakeLib ${QT_QTMAIN_LIBRARY} ${CMake_QT_LIBRARIES})
if(WIN32)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -200,7 +189,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -197,7 +186,7 @@ Checks: '-*,llvm-twine-local'
</span> ...
")
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -58,7 +58,7 @@
</span> file(STRINGS "${CMake_SOURCE_DIR}/Copyright.txt" copyright_line
LIMIT_COUNT 1 REGEX "^Copyright 2000-20[0-9][0-9] Kitware")
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -246,7 +235,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -243,7 +232,7 @@ if(UNIX AND NOT APPLE)
</span> ${COMPONENT})
endif()
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -67,7 +67,7 @@
</span> install(CODE "
execute_process(COMMAND ln -s \"../MacOS/CMake\" cmake-gui
WORKING_DIRECTORY \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/bin)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -257,7 +246,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -254,7 +243,7 @@ if(CMake_INSTALL_DEPENDENCIES AND (APPLE OR WIN32))
</span> # install rules for including 3rd party libs such as Qt
# if a system Qt is used (e.g. installed in /usr/lib/), it will not be included in the installation
set(fixup_exe "\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/bin/cmake-gui${CMAKE_EXECUTABLE_SUFFIX}")
<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;'>+@@ -708,12 +708,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>