Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 0 additions & 12 deletions ports/curl/0002_fix_uwp.patch
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,4 @@ index 62b7b33..8a4bd71 100644
if(WIN32)
add_definitions(-D_USRDLL)
endif()
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9e47967..7694f04 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -505,7 +505,7 @@ if(USE_QUICHE)
cmake_pop_check_state()
endif()

-if(WIN32)
+if(WIN32 AND NOT CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
set(USE_WIN32_CRYPTO ON)
endif()

5 changes: 3 additions & 2 deletions ports/curl/0005_remove_imp_suffix.patch
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,6 @@ index 1d71e14..62b7b33 100644
-if(WIN32)
+if(WIN32 AND 0)
if(BUILD_SHARED_LIBS)
# 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")
if(MSVC)
# Add "_imp" as a suffix before the extension to avoid conflicting with
# the statically linked "libcurl.lib"
51 changes: 0 additions & 51 deletions ports/curl/0012-fix-dependency-idn2.patch

This file was deleted.

7 changes: 3 additions & 4 deletions ports/curl/portfile.cmake
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO curl/curl
REF e052859759b34d0e05ce0f17244873e5cd7b457b #curl-7_74_0
SHA512 3dbbab00dda4f0e7d012fab358d2dd1362ff0c0f59c81f638fb547acba6f74a61c306906892447af3b18e8b0ebb93ebb8e0ac77e92247864bfa3a9c4ce7ea1d0
REF 6b951a6928811507d493303b2878e848c077b471 #curl-7_77_0
SHA512 47390ae10116af6697aae1d2e8b517ba478e3ab5a036df0c46653cfba571b21086bf33887768ea7a0764a5ff7c5ba6a303856c55c1b6978d17ef8d39f3bb80f1
HEAD_REF master
PATCHES
0002_fix_uwp.patch
Expand All @@ -12,7 +12,6 @@ vcpkg_from_github(
0007_disable_tool_export_curl_target.patch
0010_fix_othertests_cmake.patch
0011_fix_static_build.patch
0012-fix-dependency-idn2.patch
)

string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" CURL_STATICLIB)
Expand Down Expand Up @@ -41,7 +40,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
brotli CURL_BROTLI
schannel CMAKE_USE_SCHANNEL
sectransp CMAKE_USE_SECTRANSP
idn2 CMAKE_USE_IDN2
idn2 USE_LIBIDN2

INVERTED_FEATURES
non-http HTTP_ONLY
Expand Down
3 changes: 1 addition & 2 deletions ports/curl/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"name": "curl",
"version": "7.74.0",
"port-version": 6,
"version": "7.77.0",
"description": "A library for transferring data with URLs",
"homepage": "https://github.com/curl/curl",
"dependencies": [
Expand Down
4 changes: 2 additions & 2 deletions versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -1545,8 +1545,8 @@
"port-version": 0
},
"curl": {
"baseline": "7.74.0",
"port-version": 6
"baseline": "7.77.0",
"port-version": 0
},
"curlpp": {
"baseline": "2018-06-15-3",
Expand Down
10 changes: 10 additions & 0 deletions versions/c-/curl.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,15 @@
{
"versions": [
{
"git-tree": "866e7fee114e127619cf40aff460cf2dd2711120",
"version": "7.77.0",
"port-version": 0
},
{
"git-tree": "194cb2106d4bb14b6ec9be32af72ab519a017aac",
"version": "7.75.0",
"port-version": 0
},
{
"git-tree": "73eb56fb6fa870b5959ba36b931817fc85208efe",
"version": "7.74.0",
Expand Down