aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpastdue <30942300+past-due@users.noreply.github.com>2021-09-16 00:21:41 -0400
committerGitHub <noreply@github.com>2021-09-15 21:21:41 -0700
commit5d734efcef674dbf9b7b204484fc8f006101dcb5 (patch)
treef0fe528754592bb76454f62831116d8311f44195
parent3a06c2ee92b45832f36ae83d740a50ab7192c8ea (diff)
downloadvcpkg-5d734efcef674dbf9b7b204484fc8f006101dcb5.tar.gz
vcpkg-5d734efcef674dbf9b7b204484fc8f006101dcb5.zip
[curl] Update to 7.79.0 (#20175)
* [curl] Update to 7.79.0 * Run x-add-version curl
-rw-r--r--ports/curl/0010_fix_othertests_cmake.patch12
-rw-r--r--ports/curl/portfile.cmake5
-rw-r--r--ports/curl/vcpkg.json2
-rw-r--r--versions/baseline.json2
-rw-r--r--versions/c-/curl.json5
5 files changed, 9 insertions, 17 deletions
diff --git a/ports/curl/0010_fix_othertests_cmake.patch b/ports/curl/0010_fix_othertests_cmake.patch
deleted file mode 100644
index e54d33333..000000000
--- a/ports/curl/0010_fix_othertests_cmake.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/CMake/OtherTests.cmake b/CMake/OtherTests.cmake
-index 7cec6da..c836fc9 100644
---- a/CMake/OtherTests.cmake
-+++ b/CMake/OtherTests.cmake
-@@ -212,6 +212,7 @@ if(HAVE_SIGNAL_H)
- set(CMAKE_REQUIRED_FLAGS "-DHAVE_SIGNAL_H")
- set(CMAKE_EXTRA_INCLUDE_FILES "signal.h")
- endif()
-+unset(CMAKE_TRY_COMPILE_TARGET_TYPE)
- check_type_size("sig_atomic_t" SIZEOF_SIG_ATOMIC_T)
- if(HAVE_SIZEOF_SIG_ATOMIC_T)
- check_c_source_compiles("
diff --git a/ports/curl/portfile.cmake b/ports/curl/portfile.cmake
index 8080bda06..c92abb39e 100644
--- a/ports/curl/portfile.cmake
+++ b/ports/curl/portfile.cmake
@@ -1,15 +1,14 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO curl/curl
- REF bfbde883af33397943df68a3ae01847a634d33bf #curl-7_78_0
- SHA512 72c2d0daedbd1e0610f507f637c5725cb0769befe5205f613260217b692e27ec135711974f85660f863a49b415c1457d2d29960158758e232caa89f972f7045e
+ REF 8e82f2a04a238c54ba91e553e9a8452e6d405965 #curl-7_79_0
+ SHA512 0a13bc9bf85ddbf958661f7f197aff9b57c4218ce9fa81cf419f97f2cebf7df0ded9f47b55b5e9b1615065145c5f5059c2e7d986240297cb5970b3b4a39fa031
HEAD_REF master
PATCHES
0002_fix_uwp.patch
0005_remove_imp_suffix.patch
0006_fix_tool_depends.patch
0007_disable_tool_export_curl_target.patch
- 0010_fix_othertests_cmake.patch
0011_fix_static_build.patch
0012-fix-dependency-idn2.patch
0020-fix-pc-file.patch
diff --git a/ports/curl/vcpkg.json b/ports/curl/vcpkg.json
index 281d77f4f..bb65d74ac 100644
--- a/ports/curl/vcpkg.json
+++ b/ports/curl/vcpkg.json
@@ -1,6 +1,6 @@
{
"name": "curl",
- "version": "7.78.0",
+ "version": "7.79.0",
"description": "A library for transferring data with URLs",
"homepage": "https://github.com/curl/curl",
"dependencies": [
diff --git a/versions/baseline.json b/versions/baseline.json
index 686c24a0f..2340b4354 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -1645,7 +1645,7 @@
"port-version": 7
},
"curl": {
- "baseline": "7.78.0",
+ "baseline": "7.79.0",
"port-version": 0
},
"curlpp": {
diff --git a/versions/c-/curl.json b/versions/c-/curl.json
index 7c9b97571..38985c555 100644
--- a/versions/c-/curl.json
+++ b/versions/c-/curl.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "5b6c1c3766b64c163ddabf8312214a23e2a7b8f5",
+ "version": "7.79.0",
+ "port-version": 0
+ },
+ {
"git-tree": "0be4cff4d8e1d37a9ddf9ab264682771c69c0d72",
"version": "7.78.0",
"port-version": 0