Update package version to 4.1.2
This commit is contained in:
@@ -1,10 +1,28 @@
|
|||||||
name: cmake
|
name: cmake
|
||||||
description: A Powerful Software Build System
|
description: A Powerful Software Build System
|
||||||
version: 4.1.1
|
version: 4.1.2
|
||||||
revision: 2
|
revision: 1
|
||||||
url: https://cmake.org/
|
url: https://cmake.org/
|
||||||
license: BSD-3-Clause
|
license: BSD-3-Clause
|
||||||
architecture: any
|
architecture: any
|
||||||
depends: ["curl", "expat", "gcc-libs", "glibc", "jsoncpp", "libarchive", "libuv", "libnghttp2", "libxml2", "ncurses", "zlib"]
|
|
||||||
optional_depends: ["make", "ninja"]
|
|
||||||
type: source
|
type: source
|
||||||
|
depends:
|
||||||
|
- curl
|
||||||
|
- expat
|
||||||
|
- gcc-libs
|
||||||
|
- glibc
|
||||||
|
- jsoncpp
|
||||||
|
- libarchive
|
||||||
|
- libuv
|
||||||
|
- libnghttp2
|
||||||
|
- libxml2
|
||||||
|
- ncurses
|
||||||
|
- zlib
|
||||||
|
optional_depends:
|
||||||
|
- make
|
||||||
|
- ninja
|
||||||
|
downloads:
|
||||||
|
- url: https://cmake.org/files/v${BPM_PKG_VERSION%.*}/cmake-${BPM_PKG_VERSION}.tar.gz
|
||||||
|
extract_to_bpm_source: true
|
||||||
|
extract_strip_components: 1
|
||||||
|
checksum: 643f04182b7ba323ab31f526f785134fb79cba3188a852206ef0473fee282a15
|
||||||
|
|||||||
@@ -1,33 +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
|
|
||||||
---
|
|
||||||
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<std::string> HttpHeaders;
|
|
||||||
std::string HTTPProxyAuth;
|
|
||||||
std::string HTTPProxy;
|
|
||||||
- curl_proxytype HTTPProxyType;
|
|
||||||
+ long HTTPProxyType;
|
|
||||||
bool UseHttp10 = false;
|
|
||||||
bool Quiet = false;
|
|
||||||
int TimeOutSeconds = 0;
|
|
||||||
--
|
|
||||||
GitLab
|
|
||||||
|
|
||||||
@@ -2,19 +2,6 @@
|
|||||||
# BPM Expects the source code to be extracted into the automatically created 'source' directory which can be accessed using $BPM_SOURCE
|
# BPM Expects the source code to be extracted into the automatically created 'source' directory which can be accessed using $BPM_SOURCE
|
||||||
# BPM Expects the output files to be present in the automatically created 'output' directory which can be accessed using $BPM_OUTPUT
|
# BPM Expects the output files to be present in the automatically created 'output' directory which can be accessed using $BPM_OUTPUT
|
||||||
|
|
||||||
DOWNLOAD="https://cmake.org/files/v${BPM_PKG_VERSION%.*}/cmake-${BPM_PKG_VERSION}.tar.gz"
|
|
||||||
FILENAME="${DOWNLOAD##*/}"
|
|
||||||
|
|
||||||
# The prepare function is executed in the root of the temp directory
|
|
||||||
# This function is used for downloading files and putting them into the correct location
|
|
||||||
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
|
# The build function is executed in the source directory
|
||||||
# This function is used to compile the source code
|
# This function is used to compile the source code
|
||||||
build() {
|
build() {
|
||||||
|
|||||||
Reference in New Issue
Block a user