From cac3b5393af791ef4f6eb28b55a5ca633ab5949d Mon Sep 17 00:00:00 2001
From: Upgrade Helper <uh@not.set>
Date: Wed, 15 Oct 2025 05:53:49 +0000
Subject: [PATCH] cmake-native,cmake: upgrade 4.1.1 -> 4.1.2,4.1.1 -> 4.1.2

---
 ...-native_4.1.1.bb => cmake-native_4.1.2.bb} | 11 +++---
 meta/recipes-devtools/cmake/cmake.inc         |  2 +-
 ...ext2fs-ext2_fs.h-by-cmake-s-internal.patch |  6 ++--
 ...d-using-undocumented-type-for-CURLOP.patch | 35 -------------------
 ...2-CMakeLists.txt-disable-USE_NGHTTP2.patch |  6 ++--
 5 files changed, 13 insertions(+), 47 deletions(-)
 rename meta/recipes-devtools/cmake/{cmake-native_4.1.1.bb => cmake-native_4.1.2.bb} (86%)
 delete mode 100644 meta/recipes-devtools/cmake/cmake/0001-cmCTestCurl-Avoid-using-undocumented-type-for-CURLOP.patch

diff --git a/meta/recipes-devtools/cmake/cmake-native_4.1.1.bb b/meta/recipes-devtools/cmake/cmake-native_4.1.2.bb
similarity index 86%
rename from meta/recipes-devtools/cmake/cmake-native_4.1.1.bb
rename to meta/recipes-devtools/cmake/cmake-native_4.1.2.bb
index 7b90bff52f..a306dddf2a 100644
--- a/meta/recipes-devtools/cmake/cmake-native_4.1.1.bb
+++ b/meta/recipes-devtools/cmake/cmake-native_4.1.2.bb
@@ -3,11 +3,12 @@ inherit native
 
 DEPENDS += "bzip2-replacement-native xz-native zlib-native ncurses-native zstd-native openssl-native"
 
-SRC_URI += "file://OEToolchainConfig.cmake \
-            file://environment.d-cmake.sh \
-            file://0001-Disable-use-of-ext2fs-ext2_fs.h-by-cmake-s-internal.patch \
-            file://0002-CMakeLists.txt-disable-USE_NGHTTP2.patch \
-            "
+SRC_URI += "https://cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz \
+           file://OEToolchainConfig.cmake \
+           file://environment.d-cmake.sh \
+           file://0001-Disable-use-of-ext2fs-ext2_fs.h-by-cmake-s-internal.patch \
+           file://0002-CMakeLists.txt-disable-USE_NGHTTP2.patch \
+           "
 
 LICENSE:append = " & BSD-1-Clause & MIT & BSD-2-Clause & curl"
 LIC_FILES_CHKSUM:append = " \
diff --git a/meta/recipes-devtools/cmake/cmake.inc b/meta/recipes-devtools/cmake/cmake.inc
index e86bb3dec1..ddc0f3c7d0 100644
--- a/meta/recipes-devtools/cmake/cmake.inc
+++ b/meta/recipes-devtools/cmake/cmake.inc
@@ -20,7 +20,7 @@ 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"
 
diff --git a/meta/recipes-devtools/cmake/cmake/0001-Disable-use-of-ext2fs-ext2_fs.h-by-cmake-s-internal.patch b/meta/recipes-devtools/cmake/cmake/0001-Disable-use-of-ext2fs-ext2_fs.h-by-cmake-s-internal.patch
index f31dce5644..85b2158df3 100644
--- a/meta/recipes-devtools/cmake/cmake/0001-Disable-use-of-ext2fs-ext2_fs.h-by-cmake-s-internal.patch
+++ b/meta/recipes-devtools/cmake/cmake/0001-Disable-use-of-ext2fs-ext2_fs.h-by-cmake-s-internal.patch
@@ -1,4 +1,4 @@
-From cf8210696ebbaff14612d845bc98fac447c0e6f5 Mon Sep 17 00:00:00 2001
+From 5ed7df119318495fc4c3c546d0da6e4bbe0e86aa Mon Sep 17 00:00:00 2001
 From: Otavio Salvador <otavio@ossystems.com.br>
 Date: Thu, 5 Jul 2018 10:28:04 -0300
 Subject: [PATCH] Disable use of ext2fs/ext2_fs.h by cmake's internal
@@ -18,10 +18,10 @@ Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
  1 file changed, 2 insertions(+), 6 deletions(-)
 
 diff --git a/Utilities/cmlibarchive/CMakeLists.txt b/Utilities/cmlibarchive/CMakeLists.txt
-index 04d986b6ea7d8dc0bd7e909d4e7b4e73c9e35437..014fe78063f7d30c9a4970b7cf3aeeaeb36bcdbc 100644
+index e6ab5de9..913887b5 100644
 --- a/Utilities/cmlibarchive/CMakeLists.txt
 +++ b/Utilities/cmlibarchive/CMakeLists.txt
-@@ -745,12 +745,8 @@ LA_CHECK_INCLUDE_FILE("copyfile.h" HAVE_COPYFILE_H)
+@@ -720,12 +720,8 @@ LA_CHECK_INCLUDE_FILE("copyfile.h" HAVE_COPYFILE_H)
  LA_CHECK_INCLUDE_FILE("direct.h" HAVE_DIRECT_H)
  LA_CHECK_INCLUDE_FILE("dlfcn.h" HAVE_DLFCN_H)
  LA_CHECK_INCLUDE_FILE("errno.h" HAVE_ERRNO_H)
diff --git a/meta/recipes-devtools/cmake/cmake/0001-cmCTestCurl-Avoid-using-undocumented-type-for-CURLOP.patch b/meta/recipes-devtools/cmake/cmake/0001-cmCTestCurl-Avoid-using-undocumented-type-for-CURLOP.patch
deleted file mode 100644
index d04d0be795..0000000000
--- a/meta/recipes-devtools/cmake/cmake/0001-cmCTestCurl-Avoid-using-undocumented-type-for-CURLOP.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From c8143074cf3954b1e169904eb9d843cfbe14acc3 Mon Sep 17 00:00:00 2001
-From: Brad King <brad.king@kitware.com>
-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 <peter.kjellerstedt@axis.com>
-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
-
diff --git a/meta/recipes-devtools/cmake/cmake/0002-CMakeLists.txt-disable-USE_NGHTTP2.patch b/meta/recipes-devtools/cmake/cmake/0002-CMakeLists.txt-disable-USE_NGHTTP2.patch
index 158eea2c3e..3e6275db13 100644
--- a/meta/recipes-devtools/cmake/cmake/0002-CMakeLists.txt-disable-USE_NGHTTP2.patch
+++ b/meta/recipes-devtools/cmake/cmake/0002-CMakeLists.txt-disable-USE_NGHTTP2.patch
@@ -1,4 +1,4 @@
-From e0a1996a85dcb43d69d3c7daecab4da74599e5ba Mon Sep 17 00:00:00 2001
+From 417b1f023f6016f9ca32b58326b3cb645701a4d7 Mon Sep 17 00:00:00 2001
 From: Changqing Li <changqing.li@windriver.com>
 Date: Wed, 28 Dec 2022 17:51:27 +0800
 Subject: [PATCH] CMakeLists.txt: disable USE_NGHTTP2
@@ -22,10 +22,10 @@ Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/Utilities/cmcurl/CMakeLists.txt b/Utilities/cmcurl/CMakeLists.txt
-index 75b510205984894ffa11461e7aa04d3c479709b4..83463042d82d9c7f17932753f47c47b12aeec85b 100644
+index ddc975c2..cf60a43e 100644
 --- a/Utilities/cmcurl/CMakeLists.txt
 +++ b/Utilities/cmcurl/CMakeLists.txt
-@@ -105,7 +105,7 @@ set(USE_ECH OFF)
+@@ -110,7 +110,7 @@ set(USE_ECH OFF)
  set(USE_HTTPSRR OFF)
  set(USE_LIBIDN2 ON)
  set(USE_LIBRTMP OFF)
-- 
2.47.1

