Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[curl] Update version to 8.1.2 #31710

Merged
merged 1 commit into from
Jun 1, 2023
Merged

[curl] Update version to 8.1.2 #31710

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions ports/curl/0005_remove_imp_suffix.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index 1d71e14..62b7b33 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index 1d71e14..62b7b33 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -125,7 +125,6 @@ if(WIN32)
if(MSVC)
# Add "_imp" as a suffix before the extension to avoid conflicting with
# the statically linked "libcurl.lib"
- set_target_properties(${LIB_NAME} PROPERTIES IMPORT_SUFFIX "_imp.lib")
endif()
endif()
endif()
elseif(NOT CMAKE_CROSSCOMPILING)
6 changes: 3 additions & 3 deletions ports/curl/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ string(REPLACE "." "_" curl_version "curl-${VERSION}")
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO curl/curl
REF ${curl_version}
SHA512 4a7aa0091ac1e0f1d4366277d585c19bd9ad786fa49329a96d43eb6aebd1b366c1c2144436c243686d9ad430e7d3f4137ea0764c7759198f0eb29107a5d86569
REF "${curl_version}"
SHA512 d3c0bd113c772249c7e4e83cc26c6e2a1ff5644486c96318de6ab035300c52aca10756af665d91c5ce71f9d4afa4afbf7fbb756e9e4c800869b50c8a653bd519
HEAD_REF master
PATCHES
0002_fix_uwp.patch
Expand All @@ -14,7 +14,6 @@ vcpkg_from_github(
mbedtls-ws2_32.patch
export-components.patch
0023-fix-find-cares.patch
version-major-7-8.patch
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Integrated upstream.

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can anyone help reviw this PR ,we want to install 8.1.2 curl also via VCPKG

)

vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
Expand Down Expand Up @@ -73,6 +72,7 @@ vcpkg_cmake_configure(
-DENABLE_MANUAL=OFF
-DCURL_CA_FALLBACK=ON
-DCURL_USE_LIBPSL=OFF
-DCMAKE_DISABLE_FIND_PACKAGE_Perl=ON
OPTIONS_DEBUG
-DENABLE_DEBUG=ON
)
Expand Down
2 changes: 1 addition & 1 deletion ports/curl/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "curl",
"version": "8.0.1",
"version": "8.1.2",
"description": "A library for transferring data with URLs",
"homepage": "https://curl.se/",
"license": null,
Expand Down
20 changes: 0 additions & 20 deletions ports/curl/version-major-7-8.patch
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1941,7 +1941,7 @@
"port-version": 8
},
"curl": {
"baseline": "8.0.1",
"baseline": "8.1.2",
"port-version": 0
},
"curlpp": {
Expand Down
5 changes: 5 additions & 0 deletions versions/c-/curl.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "b70ded19f70e4b198d8c3f844324c7884d3faa7d",
"version": "8.1.2",
"port-version": 0
},
{
"git-tree": "08eea1b0a159f6555603ac8d26a9f8ab4738d02f",
"version": "8.0.1",
Expand Down