From ce3cad55ddb58f56c063622a88e9aa2c4d3e4089 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Tue, 24 Jun 2025 11:07:44 +0200 Subject: [PATCH] overlay coreos/user-patches: Drop a dev-build/cmake patch We updated the package, so it is not necessary now. --- .../0001-fix-build-with-curl-8-13-0.patch | 36 ------------------- .../user-patches/dev-build/cmake/README.md | 3 -- 2 files changed, 39 deletions(-) delete mode 100644 sdk_container/src/third_party/coreos-overlay/coreos/user-patches/dev-build/cmake/0001-fix-build-with-curl-8-13-0.patch delete mode 100644 sdk_container/src/third_party/coreos-overlay/coreos/user-patches/dev-build/cmake/README.md diff --git a/sdk_container/src/third_party/coreos-overlay/coreos/user-patches/dev-build/cmake/0001-fix-build-with-curl-8-13-0.patch b/sdk_container/src/third_party/coreos-overlay/coreos/user-patches/dev-build/cmake/0001-fix-build-with-curl-8-13-0.patch deleted file mode 100644 index 08bbcf4a3f..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/coreos/user-patches/dev-build/cmake/0001-fix-build-with-curl-8-13-0.patch +++ /dev/null @@ -1,36 +0,0 @@ -https://bugs.gentoo.org/953060 -https://gitlab.kitware.com/cmake/cmake/-/issues/26754 -https://gitlab.kitware.com/cmake/cmake/-/merge_requests/10449 - -From 1b0c92a3a1b782ff3e1c4499b6ab8db614d45bcd Mon Sep 17 00:00:00 2001 -From: Brad King -Date: Mon, 10 Mar 2025 11:08:42 -0400 -Subject: [PATCH] cmCurl: Avoid using undocumented type for CURLOPT_NETRC - values - -Since upstream curl commit `2ec00372a1` (curl.h: change some enums to -defines with L suffix, 2025-02-25), the `CURL_NETRC_*` constants are -integer literals instead of `enum CURL_NETRC_OPTION`. It turns out -that `curl_easy_setopt` has always expected a `long` anyway, and -that `CURL_NETRC_OPTION` is not documented for public use. - -Fixes: #26754 ---- - Source/cmCurl.cxx | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Source/cmCurl.cxx b/Source/cmCurl.cxx -index b9133ed7d47..0cf8a71a72d 100644 ---- a/Source/cmCurl.cxx -+++ b/Source/cmCurl.cxx -@@ -170,7 +170,7 @@ std::string cmCurlSetNETRCOption(::CURL* curl, const std::string& netrc_level, - const std::string& netrc_file) - { - std::string e; -- CURL_NETRC_OPTION curl_netrc_level = CURL_NETRC_LAST; -+ long curl_netrc_level = CURL_NETRC_LAST; - ::CURLcode res; - - if (!netrc_level.empty()) { --- -GitLab diff --git a/sdk_container/src/third_party/coreos-overlay/coreos/user-patches/dev-build/cmake/README.md b/sdk_container/src/third_party/coreos-overlay/coreos/user-patches/dev-build/cmake/README.md deleted file mode 100644 index f02ccfbe44..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/coreos/user-patches/dev-build/cmake/README.md +++ /dev/null @@ -1,3 +0,0 @@ -The `0001-fix-build-with-curl-8-13-0.patch` was taken from Gentoo - -the patched cmake is 3.31.6-r1, so if we get updated to that version -or later, we can drop the patch.