<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/40237cb4a80044fb114899c29e4b9950c5e4fef0">https://github.com/macports/macports-ports/commit/40237cb4a80044fb114899c29e4b9950c5e4fef0</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 40237cb4a80 cmake-devel: update to 3.23.0-rc5
</span>40237cb4a80 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 40237cb4a80044fb114899c29e4b9950c5e4fef0
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Wed Mar 23 20:02:42 2022 -0400
<span style='display:block; white-space:pre;color:#404040;'> cmake-devel: update to 3.23.0-rc5
</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/64866
</span>---
devel/cmake-devel/Portfile | 8 +++---
.../files/patch-cmake-leopard-tiger.diff | 30 +++++++---------------
devel/cmake-devel/files/patch-qt5gui.diff | 2 +-
3 files changed, 14 insertions(+), 26 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/cmake-devel/Portfile b/devel/cmake-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 01b3a48b242..e1223df8e38 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/cmake-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/cmake-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,10 +36,10 @@ homepage https://cmake.org
</span> platforms darwin freebsd
gitlab.instance https://gitlab.kitware.com
<span style='display:block; white-space:pre;background:#ffe0e0;'>-gitlab.setup cmake cmake 3.22.3 v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 d387828ba82c0866598268c18a591988157cc4d4 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 14601e27b198b194bdaa0c645c00c446dfa12f443f9e85edf09c4e14f3970635 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 7531154
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+gitlab.setup cmake cmake 3.23.0-rc5 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 67359c6c313f9ea7e2f4c23ea06ad5a885e36fa4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 10fca51a68c3fc88695510611da61f290b398fffe22abee320262eff19a4dd94 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 7640729
</span> revision 0
dist_subdir ${my_name}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/cmake-devel/files/patch-cmake-leopard-tiger.diff b/devel/cmake-devel/files/patch-cmake-leopard-tiger.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index aadcdb2b6c3..a93b888c96a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/cmake-devel/files/patch-cmake-leopard-tiger.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/cmake-devel/files/patch-cmake-leopard-tiger.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,16 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Source/cmMachO.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Source/cmMachO.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -6,6 +6,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <iosfwd>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <string>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <memory>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if !defined(CMake_USE_MACH_PARSER)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # error "This file may be included only if CMake_USE_MACH_PARSER is enabled."
</span> --- Utilities/cmlibuv/src/unix/core.c
+++ Utilities/cmlibuv/src/unix/core.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -530,10 +530,24 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -537,10 +537,24 @@
</span> * will unwind the thread when it's in the cancel state. Work around that
* by making the system call directly. Musl libc is unaffected.
*/
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,19 +26,17 @@
</span> #if defined(__LP64__) || TARGET_OS_IPHONE
extern int close$NOCANCEL(int);
return close$NOCANCEL(fd);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -541,7 +555,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -548,7 +562,9 @@
</span> extern int close$NOCANCEL$UNIX2003(int);
return close$NOCANCEL$UNIX2003(fd);
#endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span> +#if defined(GCC_DIAGNOSTIC_AVAILABLE)
#pragma GCC diagnostic pop
+#endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #elif defined(__linux__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return syscall(SYS_close, fd);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1352,8 +1370,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #elif defined(__linux__) && defined(__SANITIZE_THREAD__) && defined(__clang__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ long rc;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ __sanitizer_syscall_pre_close(fd);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1365,8 +1381,12 @@
</span> if (name == NULL)
return UV_EINVAL;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -63,7 +51,7 @@
</span> }
--- Utilities/cmlibuv/src/unix/fs.c
+++ Utilities/cmlibuv/src/unix/fs.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -951,7 +951,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1071,7 +1071,7 @@
</span>
return -1;
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -72,7 +60,7 @@
</span> defined(__DragonFly__) || \
defined(__FreeBSD__) || \
defined(__FreeBSD_kernel__)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1067,7 +1067,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1184,7 +1184,7 @@
</span> ts[0] = uv__fs_to_timespec(req->atime);
ts[1] = uv__fs_to_timespec(req->mtime);
return utimensat(AT_FDCWD, req->path, ts, AT_SYMLINK_NOFOLLOW);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -81,7 +69,7 @@
</span> defined(__DragonFly__) || \
defined(__FreeBSD__) || \
defined(__FreeBSD_kernel__) || \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1328,7 +1328,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1438,7 +1438,7 @@
</span> dst->st_blksize = src->st_blksize;
dst->st_blocks = src->st_blocks;
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/cmake-devel/files/patch-qt5gui.diff b/devel/cmake-devel/files/patch-qt5gui.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 0f0a2b4127b..355f37733d6 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/cmake-devel/files/patch-qt5gui.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/cmake-devel/files/patch-qt5gui.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -53,7 +53,7 @@
</span> <key>CFBundleSignature</key>
--- CMakeLists.txt.orig
+++ CMakeLists.txt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -780,13 +780,20 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -795,13 +795,20 @@
</span> if(APPLE)
set(CMAKE_BUNDLE_VERSION
"${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}.${CMake_VERSION_PATCH}")
</pre><pre style='margin:0'>
</pre>