mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-11-27 22:39:01 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[curl] update to 8.5.0 (#35806)

Browse Source
This commit is contained in:
Cheney Wang 2024-01-03 06:32:00 +08:00 committed by GitHub
parent 7f5282b7d6
commit 8b8ba993a6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 62 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ports/curl/0012-fix-dependency-idn2.patch
View File

@ -1,12 +1,16 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1b19c68..bb5fba9 100644
index a54c2ff..3b83a7f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -839,7 +839,8 @@ endif()
@@ -852,11 +852,8 @@ endif()
# Check for idn2
option(USE_LIBIDN2 "Use libidn2 for IDN support" ON)
if(USE_LIBIDN2)
- check_library_exists_concat("idn2" idn2_lookup_ul HAVE_LIBIDN2)
- check_library_exists("idn2" "idn2_lookup_ul" "" HAVE_LIBIDN2)
- if(HAVE_LIBIDN2)
- set(CURL_LIBS "idn2;${CURL_LIBS}")
- check_include_file_concat("idn2.h" HAVE_IDN2_H)
- endif()
+ set(HAVE_LIBIDN2 TRUE)
+ list(INSERT CURL_LIBS 0 ${LIBIDN2_LINK_LIBRARIES})
else()

24
ports/curl/0020-fix-pc-file.patch
View File

@ -1,15 +1,15 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index bb5fba9..9919fd3 100644
index 3b83a7f..0ceaf5b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1624,7 +1624,9 @@ set(includedir "\${prefix}/include")
set(LDFLAGS "${CMAKE_SHARED_LINKER_FLAGS}")
set(LIBCURL_LIBS "")
set(libdir "${CMAKE_INSTALL_PREFIX}/lib")
-foreach(_lib ${CMAKE_C_IMPLICIT_LINK_LIBRARIES} ${CURL_LIBS})
+set(CURL_LIBS_FLAT "")
+vcpkg_curl_flatten(CURL_LIBS CURL_LIBS_FLAT)
+foreach(_lib ${CURL_LIBS_FLAT})
if(TARGET "${_lib}")
set(_libname "${_lib}")
get_target_property(_imported "${_libname}" IMPORTED)
@@ -1652,7 +1652,9 @@ if(NOT CURL_DISABLE_INSTALL)
set(LDFLAGS "${CMAKE_SHARED_LINKER_FLAGS}")
set(LIBCURL_LIBS "")
set(libdir "${CMAKE_INSTALL_PREFIX}/lib")
- foreach(_lib ${CMAKE_C_IMPLICIT_LINK_LIBRARIES} ${CURL_LIBS})
+ set(CURL_LIBS_FLAT "")
+ vcpkg_curl_flatten(CURL_LIBS CURL_LIBS_FLAT)
+ foreach(_lib ${CURL_LIBS_FLAT})
if(TARGET "${_lib}")
set(_libname "${_lib}")
get_target_property(_imported "${_libname}" IMPORTED)

18
ports/curl/0022-deduplicate-libs.patch
View File

@ -1,12 +1,12 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9919fd3..7e513f6 100644
index 0ceaf5b..ec714a5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1654,6 +1654,7 @@ if(BUILD_SHARED_LIBS)
else()
set(ENABLE_SHARED "no")
set(LIBCURL_NO_SHARED "${LIBCURL_LIBS}")
+ set(LIBCURL_LIBS "")
set(CPPFLAG_CURL_STATICLIB "-DCURL_STATICLIB")
endif()
if(BUILD_STATIC_LIBS)
@@ -1682,6 +1682,7 @@ if(NOT CURL_DISABLE_INSTALL)
else()
set(ENABLE_SHARED "no")
set(LIBCURL_NO_SHARED "${LIBCURL_LIBS}")
+ set(LIBCURL_LIBS "")
set(CPPFLAG_CURL_STATICLIB "-DCURL_STATICLIB")
endif()
if(BUILD_STATIC_LIBS)

11
ports/curl/cmake-config.patch
View File

@ -1,13 +1,12 @@
diff --git a/CMake/curl-config.cmake.in b/CMake/curl-config.cmake.in
index c89c686..2f39949 100644
index a013adf..2f39949 100644
--- a/CMake/curl-config.cmake.in
+++ b/CMake/curl-config.cmake.in
@@ -45,4 +45,7 @@ include("${CMAKE_CURRENT_LIST_DIR}/@TARGETS_EXPORT_NAME@.cmake")
check_required_components("@PROJECT_NAME@")
@@ -46,5 +46,6 @@ check_required_components("@PROJECT_NAME@")
# Alias for either shared or static library
-add_library(@PROJECT_NAME@::libcurl ALIAS @PROJECT_NAME@::@LIB_SELECTED@)
+if(NOT TARGET @PROJECT_NAME@::libcurl)
if(NOT TARGET @PROJECT_NAME@::libcurl)
- add_library(@PROJECT_NAME@::libcurl ALIAS @PROJECT_NAME@::@LIB_SELECTED@)
+ add_library(@PROJECT_NAME@::libcurl INTERFACE IMPORTED)
+ set_target_properties(@PROJECT_NAME@::libcurl PROPERTIES INTERFACE_LINK_LIBRARIES @PROJECT_NAME@::@LIB_SELECTED@)
+endif()
endif()

37
ports/curl/export-components.patch
View File

@ -1,23 +1,24 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7e513f6..049ac34 100644
index ec714a5..478527e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1727,8 +1727,17 @@ if(CURL_ENABLE_EXPORT_TARGET)
@@ -1754,9 +1754,18 @@ if(NOT CURL_DISABLE_INSTALL)
DESTINATION ${CURL_INSTALL_CMAKE_DIR}
)
endif()
+
+ set(components_file "${CMAKE_CURRENT_BINARY_DIR}/CURLConfigComponents.cmake")
+ file(CONFIGURE OUTPUT "${components_file}" CONTENT [[
+ foreach(z_vcpkg_curl_component IN ITEMS @SUPPORT_FEATURES@ @SUPPORT_PROTOCOLS@)
+ if(z_vcpkg_curl_component MATCHES "^[-_a-zA-Z0-9]*$")
+ set(CURL_${z_vcpkg_curl_component}_FOUND TRUE)
+ endif()
+ endforeach()
+ ]] @ONLY)
install(
- FILES ${version_config} ${project_config}
+ FILES ${version_config} ${project_config} ${components_file}
DESTINATION ${CURL_INSTALL_CMAKE_DIR}
)
endif()
+set(components_file "${CMAKE_CURRENT_BINARY_DIR}/CURLConfigComponents.cmake")
+file(CONFIGURE OUTPUT "${components_file}" CONTENT [[
+foreach(z_vcpkg_curl_component IN ITEMS @SUPPORT_FEATURES@ @SUPPORT_PROTOCOLS@)
+ if(z_vcpkg_curl_component MATCHES "^[-_a-zA-Z0-9]*$")
+ set(CURL_${z_vcpkg_curl_component}_FOUND TRUE)
+ endif()
+endforeach()
+]] @ONLY)
+
install(
- FILES ${version_config} ${project_config}
+ FILES ${version_config} ${project_config} ${components_file}
DESTINATION ${CURL_INSTALL_CMAKE_DIR}
)

4
ports/curl/portfile.cmake
View File

@ -3,7 +3,7 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO curl/curl
REF "${curl_version}"
SHA512 c8550fef49e2f1571f7392a351e10bbdb23821069db1e988094fe27fe0a881a265ba69a2cd34462e630563d153462a975ef70472ba39adaad1c5e5ab45cf7f4f
SHA512 0d431b894aeaff9e63cb9208830a074a3499dee2e9479ec64387f264e06b9544a09a63b262bb3fb85c39420610c2b43b4b4b87ecba5c7b4a08e89cefd2a9b17d
HEAD_REF master
PATCHES
0002_fix_uwp.patch
@ -14,7 +14,7 @@ vcpkg_from_github(
mbedtls-ws2_32.patch
export-components.patch
dependencies.patch
cmake-config.patch # https://github.com/curl/curl/pull/11913
cmake-config.patch
cmake-config-ios.patch
)

3
ports/curl/vcpkg.json
View File

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

4
versions/baseline.json
View File

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

5
versions/c-/curl.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "b30c6697e314cdba601dee9bdef0ed01e1d09c8f",
"version": "8.5.0",
"port-version": 0
},
{
"git-tree": "8ad22809b9ba0e1e140a8ef45c4502bb2d669e1f",
"version": "8.4.0",