From 44bbd3bef0a69faf15971ce2158eba98cfb4a13c Mon Sep 17 00:00:00 2001 From: NancyLi1013 Date: Fri, 11 Jun 2021 00:59:33 -0700 Subject: [PATCH 01/12] [cpr] Update to 1.6.2 --- ports/cpr/001-cpr-config.patch | 7 +++---- ports/cpr/CONTROL | 5 ----- ports/cpr/enable-install.patch | 17 ----------------- ports/cpr/portfile.cmake | 12 ++++++------ ports/cpr/vcpkg.json | 12 ++++++++++++ 5 files changed, 21 insertions(+), 32 deletions(-) delete mode 100644 ports/cpr/CONTROL delete mode 100644 ports/cpr/enable-install.patch create mode 100644 ports/cpr/vcpkg.json diff --git a/ports/cpr/001-cpr-config.patch b/ports/cpr/001-cpr-config.patch index 8da44597504877..0b972c9b046b2f 100644 --- a/ports/cpr/001-cpr-config.patch +++ b/ports/cpr/001-cpr-config.patch @@ -1,8 +1,8 @@ diff --git a/cpr/CMakeLists.txt b/cpr/CMakeLists.txt -index 563b785..20f8a54 100644 +index 8061a14..e8daf19 100644 --- a/cpr/CMakeLists.txt +++ b/cpr/CMakeLists.txt -@@ -20,6 +20,7 @@ add_library(cpr +@@ -21,6 +21,7 @@ add_library(cpr add_library(cpr::cpr ALIAS cpr) @@ -10,7 +10,7 @@ index 563b785..20f8a54 100644 target_link_libraries(cpr PUBLIC CURL::libcurl) # todo should be private, but first dependencys in ssl_options need to be removed # Set version for shared libraries. -@@ -28,4 +29,18 @@ set_target_properties(cpr +@@ -29,4 +30,18 @@ set_target_properties(cpr VERSION ${${PROJECT_NAME}_VERSION} SOVERSION ${${PROJECT_NAME}_VERSION_MAJOR}) @@ -30,4 +30,3 @@ index 563b785..20f8a54 100644 +if (NOT DISABLE_INSTALL_HEADERS) + install(DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/../include/cpr DESTINATION include) +endif() -\ No newline at end of file diff --git a/ports/cpr/CONTROL b/ports/cpr/CONTROL deleted file mode 100644 index 3a2984ce21d786..00000000000000 --- a/ports/cpr/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: cpr -Version: 1.5.2 -Homepage: https://github.com/whoshuu/cpr -Description: C++ Requests is a simple wrapper around libcurl inspired by the excellent Python Requests project. -Build-Depends: curl[core] diff --git a/ports/cpr/enable-install.patch b/ports/cpr/enable-install.patch deleted file mode 100644 index 250199e5a24fe4..00000000000000 --- a/ports/cpr/enable-install.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/cpr/CMakeLists.txt b/cpr/CMakeLists.txt -index a6db5bd..b4982d1 100644 ---- a/cpr/CMakeLists.txt -+++ b/cpr/CMakeLists.txt -@@ -45,3 +45,12 @@ add_library(${CPR_LIBRARIES} - message(STATUS "Using CURL_LIBRARIES: ${CURL_LIBRARIES}.") - target_link_libraries(${CPR_LIBRARIES} - ${CURL_LIBRARIES}) -+ -+install(TARGETS ${CPR_LIBRARIES} -+ RUNTIME DESTINATION bin -+ LIBRARY DESTINATION lib -+ ARCHIVE DESTINATION lib -+) -+if(NOT DISABLE_INSTALL_HEADERS) -+ install(DIRECTORY ${CPR_INCLUDE_DIRS}/cpr DESTINATION include) -+endif() diff --git a/ports/cpr/portfile.cmake b/ports/cpr/portfile.cmake index 91a2af7a82e09f..cc5c164de08305 100644 --- a/ports/cpr/portfile.cmake +++ b/ports/cpr/portfile.cmake @@ -1,21 +1,21 @@ -vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +#vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO whoshuu/cpr - REF 41fbaca90160950f1397e0ffc6b58bd81063f131 # v1.5.2 - SHA512 0c493eef3069c1067f2492e6bc91e20b415a03a9392cbe70d4fb40f64a71b601ec62a9bcf5ca7e5b5a6e74449904f3121503421f4653f5b55df6702121806977 + REF f4622efcb59d84071ae11404ae61bd821c1c344b # v1.6.2 + SHA512 7835b7613529798b5edaefc99c907bbc7144133a1fac62a2c9af09c8c7a09b2ea1864544c4c0385969ad3dc64806b8d258abbcd39add2004ed8428741286ff20 HEAD_REF master PATCHES - 001-cpr-config.patch + #001-cpr-config.patch ) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA OPTIONS - -DBUILD_CPR_TESTS=OFF - -DUSE_SYSTEM_CURL=ON + -DCPR_BUILD_TESTS=OFF + -DCPR_FORCE_USE_SYSTEM_CURL=ON OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=ON ) diff --git a/ports/cpr/vcpkg.json b/ports/cpr/vcpkg.json new file mode 100644 index 00000000000000..5a648e2908cf04 --- /dev/null +++ b/ports/cpr/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "cpr", + "version-semver": "1.6.2", + "description": "C++ Requests is a simple wrapper around libcurl inspired by the excellent Python Requests project.", + "homepage": "https://github.com/whoshuu/cpr", + "dependencies": [ + { + "name": "curl", + "default-features": false + } + ] +} From 135303ad9b6c5d6a265262b874b8d2326959c658 Mon Sep 17 00:00:00 2001 From: NancyLi1013 Date: Fri, 11 Jun 2021 01:00:16 -0700 Subject: [PATCH 02/12] Update version files --- versions/baseline.json | 2 +- versions/c-/cpr.json | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/versions/baseline.json b/versions/baseline.json index b3cc1c8eb92836..13c7bafe89070e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1469,7 +1469,7 @@ "port-version": 1 }, "cpr": { - "baseline": "1.5.2", + "baseline": "1.6.2", "port-version": 0 }, "cpu-features": { diff --git a/versions/c-/cpr.json b/versions/c-/cpr.json index edda87dadcdb67..6058206af3cb82 100644 --- a/versions/c-/cpr.json +++ b/versions/c-/cpr.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a39d531735c6cba09ebedb336a8923d62d1e315e", + "version-semver": "1.6.2", + "port-version": 0 + }, { "git-tree": "0a3303682963a35032b7203c69051cf2edfaf41a", "version-string": "1.5.2", From f30f3a17d9d5d209d469e7f1a2f6b8324e276bdf Mon Sep 17 00:00:00 2001 From: NancyLi1013 Date: Fri, 11 Jun 2021 01:02:56 -0700 Subject: [PATCH 03/12] Update patch --- ports/cpr/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/cpr/portfile.cmake b/ports/cpr/portfile.cmake index cc5c164de08305..bfacb911b9366d 100644 --- a/ports/cpr/portfile.cmake +++ b/ports/cpr/portfile.cmake @@ -7,7 +7,7 @@ vcpkg_from_github( SHA512 7835b7613529798b5edaefc99c907bbc7144133a1fac62a2c9af09c8c7a09b2ea1864544c4c0385969ad3dc64806b8d258abbcd39add2004ed8428741286ff20 HEAD_REF master PATCHES - #001-cpr-config.patch + 001-cpr-config.patch ) vcpkg_configure_cmake( From a75f68476363ba45924b100281e25ce778f254cb Mon Sep 17 00:00:00 2001 From: NancyLi1013 Date: Fri, 11 Jun 2021 01:03:41 -0700 Subject: [PATCH 04/12] Update verison files --- versions/c-/cpr.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/c-/cpr.json b/versions/c-/cpr.json index 6058206af3cb82..f3fe404efc9795 100644 --- a/versions/c-/cpr.json +++ b/versions/c-/cpr.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "a39d531735c6cba09ebedb336a8923d62d1e315e", + "git-tree": "2dd914e71c37216145a2ba2e4ad5d2efaa9f5d50", "version-semver": "1.6.2", "port-version": 0 }, From c5c0dec54bbbe6988a6105c110fca6bfc2ce842a Mon Sep 17 00:00:00 2001 From: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Date: Fri, 11 Jun 2021 16:06:35 +0800 Subject: [PATCH 05/12] Update ports/cpr/portfile.cmake --- ports/cpr/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/cpr/portfile.cmake b/ports/cpr/portfile.cmake index bfacb911b9366d..f39edfe510b4da 100644 --- a/ports/cpr/portfile.cmake +++ b/ports/cpr/portfile.cmake @@ -1,4 +1,4 @@ -#vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH From 9a0fe90190f164b87eabf40d85b8b12c66bab244 Mon Sep 17 00:00:00 2001 From: NancyLi1013 Date: Fri, 11 Jun 2021 01:08:27 -0700 Subject: [PATCH 06/12] Update versions/c-/cpr.json --- versions/c-/cpr.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/c-/cpr.json b/versions/c-/cpr.json index f3fe404efc9795..bac24525125c4b 100644 --- a/versions/c-/cpr.json +++ b/versions/c-/cpr.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "2dd914e71c37216145a2ba2e4ad5d2efaa9f5d50", + "git-tree": "e18716d53bbbd08656204c8bd7dab9d0e6bd245f", "version-semver": "1.6.2", "port-version": 0 }, From 38cc728fd431e2a40c9aee47ccce919b39dc222f Mon Sep 17 00:00:00 2001 From: NancyLi1013 Date: Thu, 17 Jun 2021 02:09:43 -0700 Subject: [PATCH 07/12] Fix build error on uwp --- ports/cpr/fix-uwp.patch | 13 +++++++++++++ ports/cpr/portfile.cmake | 1 + 2 files changed, 14 insertions(+) create mode 100644 ports/cpr/fix-uwp.patch diff --git a/ports/cpr/fix-uwp.patch b/ports/cpr/fix-uwp.patch new file mode 100644 index 00000000000000..e91eb62b5f8f45 --- /dev/null +++ b/ports/cpr/fix-uwp.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 8575b2f..87de55c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -46,7 +46,7 @@ message(STATUS "=======================================================") + include(GNUInstallDirs) + include(FetchContent) + include(cmake/code_coverage.cmake) +-include(cmake/sanitizer.cmake) ++#include(cmake/sanitizer.cmake) + include(cmake/gcc_analyze.cmake) + + # SSL diff --git a/ports/cpr/portfile.cmake b/ports/cpr/portfile.cmake index f39edfe510b4da..ba8183b31f0162 100644 --- a/ports/cpr/portfile.cmake +++ b/ports/cpr/portfile.cmake @@ -8,6 +8,7 @@ vcpkg_from_github( HEAD_REF master PATCHES 001-cpr-config.patch + fix-uwp.patch ) vcpkg_configure_cmake( From 4867fbec27fce332f58228c1f442caa10a3b53f9 Mon Sep 17 00:00:00 2001 From: NancyLi1013 Date: Thu, 17 Jun 2021 02:10:32 -0700 Subject: [PATCH 08/12] Update versions/c-/cpr.json --- versions/c-/cpr.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/c-/cpr.json b/versions/c-/cpr.json index bac24525125c4b..5e9527bd602d48 100644 --- a/versions/c-/cpr.json +++ b/versions/c-/cpr.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "e18716d53bbbd08656204c8bd7dab9d0e6bd245f", + "git-tree": "be0f34e9e1bc1cdb7b09a5f85dc418c43c5c2d10", "version-semver": "1.6.2", "port-version": 0 }, From 0e78cf875fb3e1ba8482bd9b103bbbed0bf8434b Mon Sep 17 00:00:00 2001 From: NancyLi1013 Date: Thu, 17 Jun 2021 02:20:10 -0700 Subject: [PATCH 09/12] Add condition for uwp patch --- ports/cpr/portfile.cmake | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ports/cpr/portfile.cmake b/ports/cpr/portfile.cmake index ba8183b31f0162..6786634890232b 100644 --- a/ports/cpr/portfile.cmake +++ b/ports/cpr/portfile.cmake @@ -1,5 +1,9 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +if(vcpkg_TARGET_IS_UWP) + set(UWP_PATCH fix-uwp.patch) +endif() + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO whoshuu/cpr @@ -8,7 +12,7 @@ vcpkg_from_github( HEAD_REF master PATCHES 001-cpr-config.patch - fix-uwp.patch + ${UWP_PATCH} ) vcpkg_configure_cmake( From 4194683899cdc97f34b1eec7da4fd64f9dadf8fa Mon Sep 17 00:00:00 2001 From: NancyLi1013 Date: Thu, 17 Jun 2021 02:21:00 -0700 Subject: [PATCH 10/12] Update versions/c-/cpr.json --- versions/c-/cpr.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/c-/cpr.json b/versions/c-/cpr.json index 5e9527bd602d48..d2ffd79310d064 100644 --- a/versions/c-/cpr.json +++ b/versions/c-/cpr.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "be0f34e9e1bc1cdb7b09a5f85dc418c43c5c2d10", + "git-tree": "e2cdd8ee92c53ea459a6ec6f8553051d486ff5af", "version-semver": "1.6.2", "port-version": 0 }, From d8a884502695d304306e4c87146a8b5682223745 Mon Sep 17 00:00:00 2001 From: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Date: Thu, 17 Jun 2021 17:29:58 +0800 Subject: [PATCH 11/12] Update ports/cpr/portfile.cmake --- ports/cpr/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/cpr/portfile.cmake b/ports/cpr/portfile.cmake index 6786634890232b..9d99ebe045ee04 100644 --- a/ports/cpr/portfile.cmake +++ b/ports/cpr/portfile.cmake @@ -1,6 +1,6 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) -if(vcpkg_TARGET_IS_UWP) +if(VCPKG_TARGET_IS_UWP) set(UWP_PATCH fix-uwp.patch) endif() From 17151a263c5d0678892c6d9e8a061ad6a8a93e4b Mon Sep 17 00:00:00 2001 From: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Date: Thu, 17 Jun 2021 17:44:58 +0800 Subject: [PATCH 12/12] Update versions/c-/cpr.json --- versions/c-/cpr.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/c-/cpr.json b/versions/c-/cpr.json index d2ffd79310d064..0bbf0b63feafb9 100644 --- a/versions/c-/cpr.json +++ b/versions/c-/cpr.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "e2cdd8ee92c53ea459a6ec6f8553051d486ff5af", + "git-tree": "96762dddaeb7d520833ddc1d47a30f26c35c9f67", "version-semver": "1.6.2", "port-version": 0 },