[curl] Update to 8.8.0 (#38862)

Resolves #38869.

For simplicity, always acquire `PKGCONFIG`:
It is needed by multiple features, and on `UNIX`, curl's find modules
will try to load it for determining package hints.
This commit is contained in:
Kai Pastor 2024-05-25 04:19:10 +02:00 committed by GitHub
parent 909f7fb55f
commit eb445dc7d9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 12 additions and 18 deletions

View File

@ -1,18 +1,10 @@
string(REPLACE "." "_" curl_version "curl-${VERSION}") string(REPLACE "." "_" curl_version "curl-${VERSION}")
# Fix for HTTP compression introduced in 8.7.1; should be fixed the following release
vcpkg_download_distfile(
COMPRESSION_FIX
URLS https://github.com/curl/curl/commit/b30d694a027eb771c02a3db0dee0ca03ccab7377.patch?full_index=1
FILENAME curl-compression-fix-b30d694a027eb771c02a3db0dee0ca03ccab7377.patch
SHA512 2658826a7331adb86cd7cd692dac6c7bf79bbd9c76c11780f33b1143b6d04edfe64223356701343c31209261decffc883ddba061d5370d7872a81f2a18780c33
)
vcpkg_from_github( vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH OUT_SOURCE_PATH SOURCE_PATH
REPO curl/curl REPO curl/curl
REF "${curl_version}" REF "${curl_version}"
SHA512 38a1f7d7f5c83922cd4e0a858ac803d230d691c8f4df7e5086062c6991da740e626aa86675683282bc8555fc4cb962a08ba1a7ce817d78961d749d6d580fb9fa SHA512 e66cbf9bd3ae7b9b031475210b80b883b6a133042fbbc7cf2413f399d1b38aa54ab7322626abd3c6f1af56e0d540221f618aa903bd6b463ac8324f2c4e92dfa8
HEAD_REF master HEAD_REF master
PATCHES PATCHES
0002_fix_uwp.patch 0002_fix_uwp.patch
@ -24,7 +16,6 @@ vcpkg_from_github(
export-components.patch export-components.patch
dependencies.patch dependencies.patch
cmake-config.patch cmake-config.patch
"${COMPRESSION_FIX}"
) )
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
@ -54,10 +45,6 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
) )
set(OPTIONS "") set(OPTIONS "")
if(("idn2" IN_LIST FEATURES) OR ("gssapi" IN_LIST FEATURES) OR ("ldap" IN_LIST FEATURES AND NOT VCPKG_TARGET_IS_WINDOWS))
vcpkg_find_acquire_program(PKGCONFIG)
list(APPEND OPTIONS "-DPKG_CONFIG_EXECUTABLE=${PKGCONFIG}")
endif()
if("sectransp" IN_LIST FEATURES) if("sectransp" IN_LIST FEATURES)
list(APPEND OPTIONS -DCURL_CA_PATH=none -DCURL_CA_BUNDLE=none) list(APPEND OPTIONS -DCURL_CA_PATH=none -DCURL_CA_BUNDLE=none)
@ -76,10 +63,13 @@ if(VCPKG_TARGET_IS_WINDOWS)
list(APPEND OPTIONS -DENABLE_UNICODE=ON) list(APPEND OPTIONS -DENABLE_UNICODE=ON)
endif() endif()
vcpkg_find_acquire_program(PKGCONFIG)
vcpkg_cmake_configure( vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}" SOURCE_PATH "${SOURCE_PATH}"
OPTIONS OPTIONS
"-DCMAKE_PROJECT_INCLUDE=${CMAKE_CURRENT_LIST_DIR}/cmake-project-include.cmake" "-DCMAKE_PROJECT_INCLUDE=${CMAKE_CURRENT_LIST_DIR}/cmake-project-include.cmake"
"-DPKG_CONFIG_EXECUTABLE=${PKGCONFIG}"
${FEATURE_OPTIONS} ${FEATURE_OPTIONS}
${OPTIONS} ${OPTIONS}
-DBUILD_TESTING=OFF -DBUILD_TESTING=OFF

View File

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

View File

@ -2089,8 +2089,8 @@
"port-version": 8 "port-version": 8
}, },
"curl": { "curl": {
"baseline": "8.7.1", "baseline": "8.8.0",
"port-version": 4 "port-version": 0
}, },
"curlpp": { "curlpp": {
"baseline": "2018-06-15", "baseline": "2018-06-15",

View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "b4644cbe68d83d9778be65efb28cee3a3e0e4f46",
"version": "8.8.0",
"port-version": 0
},
{ {
"git-tree": "e6772f7da4a8824fd967ec448a3c1f8ca3b8b53b", "git-tree": "e6772f7da4a8824fd967ec448a3c1f8ca3b8b53b",
"version": "8.7.1", "version": "8.7.1",