Rebuild with libxml2 2.15.0
This commit is contained in:
@@ -1,9 +1,10 @@
|
|||||||
name: cmake
|
name: cmake
|
||||||
description: A Powerful Software Build System
|
description: A Powerful Software Build System
|
||||||
version: 4.1.1
|
version: 4.1.1
|
||||||
|
revision: 2
|
||||||
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", "ncurses", "zlib"]
|
depends: ["curl", "expat", "gcc-libs", "glibc", "jsoncpp", "libarchive", "libuv", "libnghttp2", "libxml2", "ncurses", "zlib"]
|
||||||
optional_depends: ["make", "ninja"]
|
optional_depends: ["make", "ninja"]
|
||||||
type: source
|
type: source
|
||||||
|
|||||||
@@ -0,0 +1,33 @@
|
|||||||
|
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
|
||||||
|
|
||||||
@@ -10,6 +10,9 @@ FILENAME="${DOWNLOAD##*/}"
|
|||||||
prepare() {
|
prepare() {
|
||||||
wget "$DOWNLOAD"
|
wget "$DOWNLOAD"
|
||||||
tar -xvf "$FILENAME" --strip-components=1 -C "$BPM_SOURCE"
|
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
|
||||||
|
|||||||
Reference in New Issue
Block a user