From c898dbc8fda1ea8a7409693131a04f5e5f7bd280 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Fri, 18 Aug 2023 19:50:28 +0700 Subject: [PATCH] cmake: update to 3.27.3. --- srcpkgs/cmake/patches/nlohmann_json.patch | 23 ------------------- .../patches/no-run-cmake-bootstrap.patch | 11 --------- srcpkgs/cmake/template | 4 ++-- 3 files changed, 2 insertions(+), 36 deletions(-) delete mode 100644 srcpkgs/cmake/patches/nlohmann_json.patch delete mode 100644 srcpkgs/cmake/patches/no-run-cmake-bootstrap.patch diff --git a/srcpkgs/cmake/patches/nlohmann_json.patch b/srcpkgs/cmake/patches/nlohmann_json.patch deleted file mode 100644 index 005c0c3ca0c..00000000000 --- a/srcpkgs/cmake/patches/nlohmann_json.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- a/Tests/CMakeLib/testDebuggerNamedPipe.cxx -+++ b/Tests/CMakeLib/testDebuggerNamedPipe.cxx -@@ -180,13 +180,13 @@ int runTest(int argc, char* argv[]) - auto debuggerResponse = debuggerResponseStream.str(); - - std::vector expectedResponses = { -- R"("event" : "initialized".*"type" : "event")", -- R"("command" : "launch".*"success" : true.*"type" : "response")", -- R"("command" : "configurationDone".*"success" : true.*"type" : "response")", -- R"("reason" : "started".*"threadId" : 1.*"event" : "thread".*"type" : "event")", -- R"("reason" : "exited".*"threadId" : 1.*"event" : "thread".*"type" : "event")", -- R"("exitCode" : 0.*"event" : "exited".*"type" : "event")", -- R"("command" : "disconnect".*"success" : true.*"type" : "response")" -+ R"("event" *: *"initialized".*"type" *: *"event")", -+ R"("command" *: *"launch".*"success" *: *true.*"type" *: *"response")", -+ R"("command" *: *"configurationDone".*"success" *: *true.*"type" *: *"response")", -+ R"("reason" *: *"started".*"threadId" *: *1.*"event" *: *"thread".*"type" *: *"event")", -+ R"("reason" *: *"exited".*"threadId" *: *1.*"event" *: *"thread".*"type" *: *"event")", -+ R"("exitCode" *: *0.*"event" *: *"exited".*"type" *: *"event")", -+ R"("command" *: *"disconnect".*"success" *: *true.*"type" *: *"response")" - }; - - for (auto& regexString : expectedResponses) { diff --git a/srcpkgs/cmake/patches/no-run-cmake-bootstrap.patch b/srcpkgs/cmake/patches/no-run-cmake-bootstrap.patch deleted file mode 100644 index 0e550bce7b9..00000000000 --- a/srcpkgs/cmake/patches/no-run-cmake-bootstrap.patch +++ /dev/null @@ -1,11 +0,0 @@ -We will run cmake ourselves with our flags ---- a/bootstrap -+++ b/bootstrap -@@ -2076,6 +2076,7 @@ export CFLAGS - export CXXFLAGS - export LDFLAGS - -+exit 0 - # Run bootstrap CMake to configure real CMake - cmake_options="-DCMAKE_BOOTSTRAP=1" - if test -n "${cmake_verbose}"; then diff --git a/srcpkgs/cmake/template b/srcpkgs/cmake/template index 3517bb2cc67..412c9867c9b 100644 --- a/srcpkgs/cmake/template +++ b/srcpkgs/cmake/template @@ -1,6 +1,6 @@ # Template file for 'cmake' pkgname=cmake -version=3.27.2 +version=3.27.3 revision=1 build_style=cmake configure_args="-DCMAKE_DOC_DIR=/share/doc/cmake @@ -17,7 +17,7 @@ maintainer="Đoàn Trần Công Danh " license="BSD-3-Clause, ICU" homepage="https://www.cmake.org" distfiles="https://www.cmake.org/files/v${version%.*}/${pkgname}-${version}.tar.gz" -checksum=798e50085d423816fe96c9ef8bee5e50002c9eca09fed13e300de8a91d35c211 +checksum=66afdc0f181461b70b6fedcde9ecc4226c5cd184e7203617c83b7d8e47f49521 if [ "$XBPS_TARGET_LIBC" = musl ]; then configure_args+=" -DCMake_NO_SELF_BACKTRACE=1"