From d4f72489d77aba2f29798b09b60568c1fa11abf0 Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Mon, 6 Apr 2020 09:31:01 +0200 Subject: [PATCH 1/3] [curl] fix vcpkg-cmake-wrapper missing ZLIB find_package call --- ports/curl/vcpkg-cmake-wrapper.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/ports/curl/vcpkg-cmake-wrapper.cmake b/ports/curl/vcpkg-cmake-wrapper.cmake index c7fbdba913b458..f4d12258adcbe8 100644 --- a/ports/curl/vcpkg-cmake-wrapper.cmake +++ b/ports/curl/vcpkg-cmake-wrapper.cmake @@ -2,6 +2,7 @@ list(REMOVE_ITEM ARGS "NO_MODULE") list(REMOVE_ITEM ARGS "CONFIG") list(REMOVE_ITEM ARGS "MODULE") +_find_package(ZLIB) _find_package(${ARGS} CONFIG) if(TARGET CURL::libcurl) From c0bfefe244fdf5c7e298a7e302004a4b7dfc6b60 Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Mon, 6 Apr 2020 15:49:03 +0200 Subject: [PATCH 2/3] [replxx] remove failure on ci baseline --- scripts/ci.baseline.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 9dc73c0de50de5..25a6d873000f09 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1534,7 +1534,6 @@ redis-plus-plus:arm64-windows=fail replxx:arm-uwp=fail replxx:x64-uwp=fail replxx:arm64-windows=fail -replxx:x86-windows=fail reproc:arm-uwp=fail reproc:x64-uwp=fail restbed:arm-uwp=fail From 1585ba45051e3f689b2f0f9e0d0d00e1795b64a2 Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Mon, 6 Apr 2020 15:58:06 +0200 Subject: [PATCH 3/3] [curl] bump CONTROL --- ports/curl/CONTROL | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/curl/CONTROL b/ports/curl/CONTROL index 05efb2174cb000..420f74bdd46fdc 100644 --- a/ports/curl/CONTROL +++ b/ports/curl/CONTROL @@ -1,5 +1,5 @@ Source: curl -Version: 7.68.0-2 +Version: 7.68.0-3 Build-Depends: zlib Homepage: https://github.com/curl/curl Description: A library for transferring data with URLs @@ -47,4 +47,4 @@ Feature: sspi Description: SSPI support Feature: brotli -Description: brotli support (brotli) \ No newline at end of file +Description: brotli support (brotli)