From 388cac7165059d6a6a1b52c3e805580f5d9c1067 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Jul 2024 17:20:33 +0700
Subject: [PATCH] cmake-bootstrap: update to 3.30.0.

---
 .../cmake-bootstrap/patches/no-cpack.patch    | 27 +++++------
 .../cmake-bootstrap/patches/no-network.patch  | 47 ++++++++++---------
 .../patches/no-run-cmake-bootstrap.patch      |  2 +-
 .../cmake-bootstrap/patches/not-needed.patch  | 14 +++---
 srcpkgs/cmake-bootstrap/template              |  4 +-
 5 files changed, 47 insertions(+), 47 deletions(-)

diff --git a/srcpkgs/cmake-bootstrap/patches/no-cpack.patch b/srcpkgs/cmake-bootstrap/patches/no-cpack.patch
index 7b20b60d297..b79c735eb2c 100644
--- a/srcpkgs/cmake-bootstrap/patches/no-cpack.patch
+++ b/srcpkgs/cmake-bootstrap/patches/no-cpack.patch
@@ -1,6 +1,6 @@
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -247,15 +247,13 @@ macro(CMAKE_SETUP_TESTING)
+@@ -254,15 +254,13 @@ macro(CMAKE_SETUP_TESTING)
      if(CMake_TEST_EXTERNAL_CMAKE)
        set(CMAKE_CTEST_COMMAND "${CMake_TEST_EXTERNAL_CMAKE}/ctest")
        set(CMAKE_CMAKE_COMMAND "${CMake_TEST_EXTERNAL_CMAKE}/cmake")
@@ -17,7 +17,7 @@
      endif()
    endif()
  
-@@ -467,7 +465,6 @@ if(NOT CMake_TEST_EXTERNAL_CMAKE)
+@@ -474,7 +472,6 @@ if(NOT CMake_TEST_EXTERNAL_CMAKE)
    add_custom_target(uninstall
      "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")
  
@@ -27,7 +27,7 @@
  
 --- a/Source/CMakeLists.txt
 +++ b/Source/CMakeLists.txt
-@@ -1126,6 +1126,7 @@ endif()
+@@ -1136,6 +1136,7 @@ endif()
  #
  # Build CPackLib
  #
@@ -35,7 +35,7 @@
  add_library(
    CPackLib
    CPack/cmCPackArchiveGenerator.cxx
-@@ -1158,9 +1159,10 @@ target_include_directories(
+@@ -1168,9 +1169,10 @@ target_include_directories(
      "${CMAKE_CURRENT_BINARY_DIR}/CPack"
    )
  target_link_libraries(CPackLib PUBLIC CMakeLib)
@@ -47,7 +47,7 @@
    target_sources(
      CPackLib
      PRIVATE
-@@ -1278,11 +1280,6 @@ add_executable(ctest ctest.cxx)
+@@ -1288,11 +1290,6 @@ add_executable(ctest ctest.cxx)
  target_link_libraries(ctest PRIVATE CTestLib ManifestLib)
  list(APPEND _tools ctest)
  
@@ -61,7 +61,7 @@
    add_subdirectory(CursesDialog)
 --- a/Tests/CMakeLists.txt
 +++ b/Tests/CMakeLists.txt
-@@ -147,7 +147,6 @@ if(BUILD_TESTING)
+@@ -150,7 +150,6 @@ if(BUILD_TESTING)
    endif()
  
    # Look for git to use for tests.
@@ -71,7 +71,7 @@
    # The tool does not work with spaces in the path.
 --- a/Tests/RunCMake/CMakeLists.txt
 +++ b/Tests/RunCMake/CMakeLists.txt
-@@ -908,9 +908,6 @@ add_RunCMake_test(file-GET_RUNTIME_DEPEN
+@@ -929,9 +929,6 @@ add_RunCMake_test(file-GET_RUNTIME_DEPEN
    -DCMAKE_C_COMPILER_ID=${CMAKE_C_COMPILER_ID}
    )
  
@@ -81,7 +81,7 @@
  if(XCODE_VERSION)
    set(ExternalProject_ARGS -DXCODE_VERSION=${XCODE_VERSION})
  endif()
-@@ -932,9 +929,6 @@ add_RunCMake_test(CTestCommandLine -DTES
+@@ -953,9 +950,6 @@ add_RunCMake_test(CTestCommandLine -DTES
  add_RunCMake_test(CacheNewline)
  # Only run this test on unix platforms that support
  # symbolic links
@@ -91,16 +91,15 @@
  
  set(IfacePaths_INCDIRS_ARGS -DTEST_PROP=INCLUDE_DIRECTORIES)
  add_RunCMake_test(IfacePaths_INCDIRS TEST_DIR IfacePaths)
-@@ -1098,8 +1092,6 @@ if(CMAKE_SYSTEM_PROCESSOR STREQUAL "e2k"
+@@ -1132,7 +1126,6 @@ if(CMAKE_SYSTEM_PROCESSOR STREQUAL "e2k"
    endif()
  endif()
  
 -add_RunCMake_test_group(CPack "${cpack_tests}")
--# add a test to make sure symbols are exported from a shared library
- # for MSVC compilers CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS property is used
- add_RunCMake_test(AutoExportDll
-   -DCMAKE_SYSTEM_NAME=${CMAKE_SYSTEM_NAME}
-@@ -1143,29 +1135,6 @@ add_RunCMake_test(PrecompileHeaders -DCM
+ 
+ if(CMake_TEST_CPACK_WIX3 OR CMake_TEST_CPACK_WIX4)
+   add_RunCMake_test(CPack_WIX
+@@ -1189,29 +1182,6 @@ add_RunCMake_test(PrecompileHeaders -DCM
    -DCMAKE_C_COMPILER_VERSION=${CMAKE_C_COMPILER_VERSION})
  
  add_RunCMake_test(UnityBuild -DCMake_TEST_OBJC=${CMake_TEST_OBJC})
diff --git a/srcpkgs/cmake-bootstrap/patches/no-network.patch b/srcpkgs/cmake-bootstrap/patches/no-network.patch
index f68c96b4a1e..aee507fda2b 100644
--- a/srcpkgs/cmake-bootstrap/patches/no-network.patch
+++ b/srcpkgs/cmake-bootstrap/patches/no-network.patch
@@ -1,6 +1,6 @@
 --- a/Source/cmFileCommand.cxx
 +++ b/Source/cmFileCommand.cxx
-@@ -2082,9 +2082,6 @@ bool HandleDownloadCommand(std::vector<s
+@@ -2130,9 +2130,6 @@ bool HandleDownloadCommand(std::vector<s
    res = ::curl_easy_setopt(curl, CURLOPT_FAILONERROR, 1);
    check_curl_result(res, "DOWNLOAD cannot set http failure option: ");
  
@@ -10,12 +10,12 @@
    res = ::curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, cmWriteToFileCallback);
    check_curl_result(res, "DOWNLOAD cannot set write function: ");
  
-@@ -2092,15 +2089,6 @@ bool HandleDownloadCommand(std::vector<s
-                            cmFileCommandCurlDebugCallback);
-   check_curl_result(res, "DOWNLOAD cannot set debug function: ");
+@@ -2153,15 +2150,6 @@ bool HandleDownloadCommand(std::vector<s
+     }
+   }
  
 -  // check to see if TLS verification is requested
--  if (tls_verify) {
+-  if (tls_verify && *tls_verify) {
 -    res = ::curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, 1);
 -    check_curl_result(res, "DOWNLOAD cannot set TLS/SSL Verify on: ");
 -  } else {
@@ -26,7 +26,7 @@
    for (const auto& range : curl_ranges) {
      std::string curl_range = range.first + '-' +
        (range.second.has_value() ? range.second.value() : "");
-@@ -2135,25 +2123,11 @@ bool HandleDownloadCommand(std::vector<s
+@@ -2196,25 +2184,11 @@ bool HandleDownloadCommand(std::vector<s
    res = ::curl_easy_setopt(curl, CURLOPT_DEBUGDATA, &chunkDebug);
    check_curl_result(res, "DOWNLOAD cannot set debug data: ");
  
@@ -52,12 +52,12 @@
    // Need the progress helper's scope to last through the duration of
    // the curl_easy_perform call... so this object is declared at function
    // scope intentionally, rather than inside the "if(showProgress)"
-@@ -2423,15 +2397,6 @@ bool HandleUploadCommand(std::vector<std
-                            cmFileCommandCurlDebugCallback);
-   check_curl_result(res, "UPLOAD cannot set debug function: ");
+@@ -2530,15 +2504,6 @@ bool HandleUploadCommand(std::vector<std
+     }
+   }
  
 -  // check to see if TLS verification is requested
--  if (tls_verify) {
+-  if (tls_verify && *tls_verify) {
 -    res = ::curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, 1);
 -    check_curl_result(res, "UPLOAD cannot set TLS/SSL Verify on: ");
 -  } else {
@@ -68,7 +68,7 @@
    // check to see if a CAINFO file has been specified
    // command arg comes first
    std::string const& cainfo_err = cmCurlSetCAInfo(curl, cainfo);
-@@ -2449,25 +2414,11 @@ bool HandleUploadCommand(std::vector<std
+@@ -2556,25 +2521,11 @@ bool HandleUploadCommand(std::vector<std
    res = ::curl_easy_setopt(curl, CURLOPT_DEBUGDATA, &chunkDebug);
    check_curl_result(res, "UPLOAD cannot set debug data: ");
  
@@ -96,7 +96,7 @@
    // scope intentionally, rather than inside the "if(showProgress)"
 --- a/Tests/RunCMake/CMakeLists.txt
 +++ b/Tests/RunCMake/CMakeLists.txt
-@@ -540,7 +540,6 @@ if(COVERAGE_COMMAND)
+@@ -560,7 +560,6 @@ if(COVERAGE_COMMAND)
    add_RunCMake_test(ctest_coverage -DCOVERAGE_COMMAND=${COVERAGE_COMMAND})
  endif()
  add_RunCMake_test(ctest_start)
@@ -104,14 +104,14 @@
  add_RunCMake_test(ctest_test
    -DIMAGE_DIR=${CMAKE_SOURCE_DIR}/Utilities/Sphinx/static
  )
-@@ -562,7 +561,6 @@ foreach(var
+@@ -584,7 +583,6 @@ foreach(var
      list(APPEND file-DOWNLOAD_ARGS -D${var}=${${var}})
    endif()
  endforeach()
 -add_RunCMake_test(file-DOWNLOAD)
- add_RunCMake_test(file-RPATH -DCMAKE_SYSTEM_NAME=${CMAKE_SYSTEM_NAME})
- add_RunCMake_test(file-STRINGS)
- add_RunCMake_test(find_file -DMINGW=${MINGW})
+ add_RunCMake_test(file-RPATH
+   -DCMAKE_SYSTEM_NAME=${CMAKE_SYSTEM_NAME}
+   -DCMake_TEST_ELF_LARGE=${CMake_TEST_ELF_LARGE}
 --- a/Utilities/cmcurl/CMakeLists.txt
 +++ b/Utilities/cmcurl/CMakeLists.txt
 @@ -29,13 +29,13 @@ set(CURL_DISABLE_DIGEST_AUTH OFF)
@@ -155,18 +155,19 @@
  set(ENABLE_MANUAL OFF CACHE INTERNAL "No curl built-in manual")
  set(ENABLE_THREADED_RESOLVER OFF CACHE INTERNAL "No curl POSIX threaded DNS lookup")
  set(ENABLE_UNICODE OFF)
-@@ -90,8 +90,8 @@ set(HAVE_WIN32_WINNT 0) # we do not need
- set(HTTP_ONLY OFF CACHE INTERNAL "Curl is not http-only")
- set(PICKY_COMPILER OFF CACHE INTERNAL "Enable picky compiler options")
+@@ -92,9 +92,9 @@ set(PICKY_COMPILER OFF CACHE INTERNAL "E
  set(SHARE_LIB_OBJECT OFF)
+ set(USE_ECH OFF)
+ set(USE_HTTPSRR OFF)
 -set(USE_LIBIDN2 ON)
--set(USE_NGHTTP2 ON)
 +set(USE_LIBIDN2 OFF)
+ set(USE_LIBRTMP OFF)
+-set(USE_NGHTTP2 ON)
 +set(USE_NGHTTP2 OFF)
  set(USE_NGTCP2 OFF)
+ set(USE_OPENSSL_QUIC OFF)
  set(USE_QUICHE OFF)
- set(USE_WIN32_IDN OFF)
-@@ -366,11 +366,11 @@ cmake_dependent_option(CURL_DISABLE_FORM
+@@ -371,11 +371,11 @@ cmake_dependent_option(CURL_DISABLE_FORM
                         "NOT CURL_DISABLE_MIME" ON)
  mark_as_advanced(CURL_DISABLE_FORM_API)
  endif()
@@ -180,7 +181,7 @@
  mark_as_advanced(CURL_DISABLE_GOPHER)
  option(CURL_DISABLE_HEADERS_API "disables headers-api support" OFF)
  mark_as_advanced(CURL_DISABLE_HEADERS_API)
-@@ -378,7 +378,7 @@ option(CURL_DISABLE_HSTS "disables HSTS
+@@ -383,7 +383,7 @@ option(CURL_DISABLE_HSTS "disables HSTS
  mark_as_advanced(CURL_DISABLE_HSTS)
  option(CURL_DISABLE_HTTP "disables HTTP" OFF)
  mark_as_advanced(CURL_DISABLE_HTTP)
diff --git a/srcpkgs/cmake-bootstrap/patches/no-run-cmake-bootstrap.patch b/srcpkgs/cmake-bootstrap/patches/no-run-cmake-bootstrap.patch
index 0e550bce7b9..e9817bf0df0 100644
--- a/srcpkgs/cmake-bootstrap/patches/no-run-cmake-bootstrap.patch
+++ b/srcpkgs/cmake-bootstrap/patches/no-run-cmake-bootstrap.patch
@@ -1,7 +1,7 @@
 We will run cmake ourselves with our flags
 --- a/bootstrap
 +++ b/bootstrap
-@@ -2076,6 +2076,7 @@ export CFLAGS
+@@ -2105,6 +2105,7 @@ export CFLAGS
  export CXXFLAGS
  export LDFLAGS
  
diff --git a/srcpkgs/cmake-bootstrap/patches/not-needed.patch b/srcpkgs/cmake-bootstrap/patches/not-needed.patch
index 11671d25e56..fcf6c4d1df6 100644
--- a/srcpkgs/cmake-bootstrap/patches/not-needed.patch
+++ b/srcpkgs/cmake-bootstrap/patches/not-needed.patch
@@ -1,6 +1,6 @@
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -524,12 +524,9 @@ if(BUILD_TESTING)
+@@ -531,12 +531,9 @@ if(BUILD_TESTING)
  endif()
  
  if(NOT CMake_TEST_EXTERNAL_CMAKE)
@@ -14,7 +14,7 @@
      DESTINATION ${CMAKE_DATA_DIR}
      FILE_PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
      DIRECTORY_PERMISSIONS OWNER_READ OWNER_EXECUTE OWNER_WRITE
-@@ -545,9 +542,6 @@ if(NOT CMake_TEST_EXTERNAL_CMAKE)
+@@ -552,9 +549,6 @@ if(NOT CMake_TEST_EXTERNAL_CMAKE)
      REGEX "Help/(dev|guide)($|/)" EXCLUDE
      )
  
@@ -40,7 +40,7 @@
  #-----------------------------------------------------------------------------
 --- a/Utilities/cmcurl/CMakeLists.txt
 +++ b/Utilities/cmcurl/CMakeLists.txt
-@@ -1657,9 +1657,9 @@ if(BUILD_TESTING AND CMAKE_CURL_TEST_URL
+@@ -1746,9 +1746,9 @@ if(BUILD_TESTING AND CMAKE_CURL_TEST_URL
    add_test(curl curltest ${CMAKE_CURL_TEST_URL})
  endif()
  
@@ -102,9 +102,9 @@
 -install(FILES Copyright.txt DESTINATION ${CMAKE_DOC_DIR}/cmzlib)
 --- a/Utilities/cmzstd/CMakeLists.txt
 +++ b/Utilities/cmzstd/CMakeLists.txt
-@@ -46,5 +46,3 @@ add_library(cmzstd STATIC
- 
- # BMI2 instructions are not supported in older environments.
- set_property(TARGET cmzstd PROPERTY COMPILE_DEFINITIONS DYNAMIC_BMI2=0)
+@@ -51,5 +51,3 @@ target_compile_definitions(cmzstd PRIVAT
+   # Our vendored zstd does not include the assembly language file.
+   ZSTD_DISABLE_ASM=1
+   )
 -
 -install(FILES LICENSE DESTINATION ${CMAKE_DOC_DIR}/cmzstd)
diff --git a/srcpkgs/cmake-bootstrap/template b/srcpkgs/cmake-bootstrap/template
index 170d87c92e7..c8a867403de 100644
--- a/srcpkgs/cmake-bootstrap/template
+++ b/srcpkgs/cmake-bootstrap/template
@@ -1,6 +1,6 @@
 # Template file for 'cmake-bootstrap'
 pkgname=cmake-bootstrap
-version=3.29.5
+version=3.30.0
 revision=1
 build_style=cmake
 configure_args="-DCMake_INSTALL_INFIX=libexec/xbps-src/
@@ -14,7 +14,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="BSD-3-Clause, ICU"
 homepage="https://www.cmake.org"
 distfiles="https://www.cmake.org/files/v${version%.*}/cmake-${version}.tar.gz"
-checksum=dd63da7d763c0db455ca232f2c443f5234fe0b11f8bd6958a81d29cc987dfd6e
+checksum=157e5be6055c154c34f580795fe5832f260246506d32954a971300ed7899f579
 repository="bootstrap"
 provides="cmake-${version}_1"