diff --git a/pkg.info b/pkg.info index e3ab98a..d1d9756 100644 --- a/pkg.info +++ b/pkg.info @@ -1,9 +1,10 @@ name: cmake description: A Powerful Software Build System version: 4.1.1 +revision: 2 url: https://cmake.org/ license: BSD-3-Clause architecture: any -depends: ["curl", "expat", "gcc-libs", "glibc", "jsoncpp", "libarchive", "libuv", "libnghttp2", "ncurses", "zlib"] +depends: ["curl", "expat", "gcc-libs", "glibc", "jsoncpp", "libarchive", "libuv", "libnghttp2", "libxml2", "ncurses", "zlib"] optional_depends: ["make", "ninja"] type: source diff --git a/source-files/ctest-curl-fix.patch b/source-files/ctest-curl-fix.patch new file mode 100644 index 0000000..6551d09 --- /dev/null +++ b/source-files/ctest-curl-fix.patch @@ -0,0 +1,33 @@ +From c8143074cf3954b1e169904eb9d843cfbe14acc3 Mon Sep 17 00:00:00 2001 +From: Brad King +Date: Tue, 2 Sep 2025 11:41:10 -0400 +Subject: [PATCH] cmCTestCurl: Avoid using undocumented type for + CURLOPT_PROXYTYPE values + +Since upstream curl commit `1a12663d06` (CURLOPT: bump `CURLPROXY_*` +enums to `long`, drop casts, 2025-07-28), the `CURLPROXY_*` constants +are integer literals instead of `enum curl_proxytype`. It turns out +that `curl_easy_setopt` has always expected a `long` anyway, and that +`curl_proxytype` is not documented for public use. + +Fixes: #27178 +--- + Source/CTest/cmCTestCurl.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Source/CTest/cmCTestCurl.h b/Source/CTest/cmCTestCurl.h +index 7836f4b9c78..9113890b5a1 100644 +--- a/Source/CTest/cmCTestCurl.h ++++ b/Source/CTest/cmCTestCurl.h +@@ -52,7 +52,7 @@ private: + std::vector HttpHeaders; + std::string HTTPProxyAuth; + std::string HTTPProxy; +- curl_proxytype HTTPProxyType; ++ long HTTPProxyType; + bool UseHttp10 = false; + bool Quiet = false; + int TimeOutSeconds = 0; +-- +GitLab + diff --git a/source.sh b/source.sh index 234dc33..98e2063 100644 --- a/source.sh +++ b/source.sh @@ -10,6 +10,9 @@ FILENAME="${DOWNLOAD##*/}" prepare() { wget "$DOWNLOAD" tar -xvf "$FILENAME" --strip-components=1 -C "$BPM_SOURCE" + + cd "$BPM_SOURCE" + patch -Np1 -i "$BPM_WORKDIR"/ctest-curl-fix.patch } # The build function is executed in the source directory