cmake: upgrade 4.1.1 -> 4.1.2
PATCH 1/1 cmake: upgrade 4.1.1 -> 4.1.2
Release notes are available at [0].
[0]: https://cmake.org/cmake/help/v4.1/release/4.1.html#id2
Signed-off-by Moritz Haase <[email protected]>
---
...-native_4.1.1.bb => cmake-native_4.1.2.bb} | 0
meta/recipes-devtools/cmake/cmake.inc | 3 +-
...d-using-undocumented-type-for-CURLOP.patch | 35 -------------------
.../cmake/{cmake_4.1.1.bb => cmake_4.1.2.bb} | 0
4 files changed, 1 insertion(+), 37 deletions(-)
rename meta/recipes-devtools/cmake/{cmake-native_4.1.1.bb => cmake-native_4.1.2.bb} (100%)
delete mode 100644 meta/recipes-devtools/cmake/cmake/0001-cmCTestCurl-Avoid-using-undocumented-type-for-CURLOP.patch
rename meta/recipes-devtools/cmake/{cmake_4.1.1.bb => cmake_4.1.2.bb} (100%)meta/recipes-devtools/cmake/cmake-native_4.1.2.bb renamed from meta/recipes-devtools/cmake/cmake-native_4.1.1.bb +0 -0
meta/recipes-devtools/cmake/cmake.inc +1 -2
@@ -17,10 +17,9 @@ LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=0cafc0f3b6b28f3d5ecb5d1a68c36471 \ CMAKE_MAJOR_VERSION = "${@'.'.join(d.getVar('PV').split('.')[0:2])}" SRC_URI = "https://cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz \ - file://0001-cmCTestCurl-Avoid-using-undocumented-type-for-CURLOP.patch \ " -SRC_URI[sha256sum] = "b29f6f19733aa224b7763507a108a427ed48c688e1faf22b29c44e1c30549282" +SRC_URI[sha256sum] = "643f04182b7ba323ab31f526f785134fb79cba3188a852206ef0473fee282a15" UPSTREAM_CHECK_REGEX = "cmake-(?P<pver>\d+(\.\d+)+)\.tar"
meta/recipes-devtools/cmake/cmake/0001-cmCTestCurl-Avoid-using-undocumented-type-for-CURLOP.patch deleted +0 -35
@@ -1,35 +0,0 @@ -From c8143074cf3954b1e169904eb9d843cfbe14acc3 Mon Sep 17 00:00:00 2001 -From: Brad King <[email protected]> -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 -Signed-off-by: Peter Kjellerstedt <[email protected]> -Upstream-Status: Backport [https://gitlab.kitware.com/cmake/cmake/-/commit/c8143074cf3954b1e169904eb9d843cfbe14acc3] ---- - 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 7836f4b9c7..9113890b5a 100644 ---- a/Source/CTest/cmCTestCurl.h -+++ b/Source/CTest/cmCTestCurl.h -@@ -52,7 +52,7 @@ private: - std::vector<std::string> HttpHeaders; - std::string HTTPProxyAuth; - std::string HTTPProxy; -- curl_proxytype HTTPProxyType; -+ long HTTPProxyType; - bool UseHttp10 = false; - bool Quiet = false; - int TimeOutSeconds = 0; --- -2.43.0 -