[curl] Update version to 8.6.0 (#36630)

* [curl] Update version to 36597

* version
This commit is contained in:
Frank 2024-02-09 06:56:57 +00:00 committed by GitHub
parent 2302ee8de0
commit fce5c633c8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 9 additions and 30 deletions

View File

@ -1,24 +0,0 @@
diff --git a/CMake/OtherTests.cmake b/CMake/OtherTests.cmake
index d67a905..dcd1eee 100644
--- a/CMake/OtherTests.cmake
+++ b/CMake/OtherTests.cmake
@@ -87,7 +87,7 @@ endif()
unset(CMAKE_TRY_COMPILE_TARGET_TYPE)
if(NOT CMAKE_CROSSCOMPILING)
- if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin" AND NOT ${CMAKE_SYSTEM_NAME} MATCHES "iOS")
+ if(NOT APPLE)
# only try this on non-apple platforms
# if not cross-compilation...
@@ -140,8 +140,8 @@ if(WIN32)
set(HAVE_GETADDRINFO_THREADSAFE ${HAVE_GETADDRINFO})
elseif(NOT HAVE_GETADDRINFO)
set(HAVE_GETADDRINFO_THREADSAFE FALSE)
-elseif(CMAKE_SYSTEM_NAME STREQUAL "AIX" OR
- CMAKE_SYSTEM_NAME STREQUAL "Darwin" OR
+elseif(APPLE OR
+ CMAKE_SYSTEM_NAME STREQUAL "AIX" OR
CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" OR
CMAKE_SYSTEM_NAME STREQUAL "HP-UX" OR
CMAKE_SYSTEM_NAME STREQUAL "MidnightBSD" OR

View File

@ -3,7 +3,7 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO curl/curl
REF "${curl_version}"
SHA512 0d431b894aeaff9e63cb9208830a074a3499dee2e9479ec64387f264e06b9544a09a63b262bb3fb85c39420610c2b43b4b4b87ecba5c7b4a08e89cefd2a9b17d
SHA512 ee9f6c3b5468ab547fc20822c18756a625f9f741e3d40958548a56b607f567f4ed782b8cce2d900c442e0da51faa8cb1fefa5d9f2d1581c79805a5b8fd4ec098
HEAD_REF master
PATCHES
0002_fix_uwp.patch
@ -15,7 +15,6 @@ vcpkg_from_github(
export-components.patch
dependencies.patch
cmake-config.patch
cmake-config-ios.patch
)
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS

View File

@ -1,7 +1,6 @@
{
"name": "curl",
"version": "8.5.0",
"port-version": 1,
"version": "8.6.0",
"description": "A library for transferring data with URLs",
"homepage": "https://curl.se/",
"license": "curl AND ISC AND BSD-3-Clause",

View File

@ -2061,8 +2061,8 @@
"port-version": 8
},
"curl": {
"baseline": "8.5.0",
"port-version": 1
"baseline": "8.6.0",
"port-version": 0
},
"curlpp": {
"baseline": "2018-06-15",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "dba7665cff5bd6f1a31ad0aa864fd83049eac93e",
"version": "8.6.0",
"port-version": 0
},
{
"git-tree": "7b2bf8e8f4e0c7d000cb3b3311f4b9f185cb2d52",
"version": "8.5.0",