From 4c959c6861551a92e2497af08809d131a515761c Mon Sep 17 00:00:00 2001 From: Nikita Date: Tue, 12 May 2020 00:51:34 +0300 Subject: [PATCH] [restclient-cpp] Fix portfile and update version. (#9717) * [restclient-cpp] Fix installation. Remove only debug directory * [restclient-cpp] Fix directory cleanup * [restclient-cpp] Update library * [restclient-cpp] Add msvc patch * [restclient-cpp] Remove lib directory on dynamic compile * [restclient-cpp] set VCPKG_POLICY_DLLS_WITHOUT_LIBS * [restclient-cpp] Remove lib directory on dynamic compile * [restclient-cpp] Set compile type static * Remove patch * [restclient-cpp] Changes and fixes Update version Update handling copiright Remove no longer needed include Move COMPILE_TYPE parameter * [restclient-cpp] Update description. Add Homepage * [restclient-cpp] Bump to 0.5.2. Remove COMPILE_TYPE option * [restclient-cpp] Set ONLY_STATIC_LIBRARY for Windows * [restclient-cpp] Change version num 0.5.2-1 -> 0.5.2 --- ports/restclient-cpp/0001_fix_cmake_linking.patch | 13 ------------- ports/restclient-cpp/CONTROL | 5 +++-- ports/restclient-cpp/portfile.cmake | 7 +++---- 3 files changed, 6 insertions(+), 19 deletions(-) delete mode 100644 ports/restclient-cpp/0001_fix_cmake_linking.patch diff --git a/ports/restclient-cpp/0001_fix_cmake_linking.patch b/ports/restclient-cpp/0001_fix_cmake_linking.patch deleted file mode 100644 index 815c2198c..000000000 --- a/ports/restclient-cpp/0001_fix_cmake_linking.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 45fc887..8b90048 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -39,7 +39,7 @@ find_package(Threads REQUIRED) - find_package(CURL REQUIRED) - find_package(jsoncpp) - --add_library(restclient-cpp SHARED -+add_library(restclient-cpp - source/restclient.cc - source/connection.cc - source/helpers.cc diff --git a/ports/restclient-cpp/CONTROL b/ports/restclient-cpp/CONTROL index 8b3ede796..df8faa7b7 100644 --- a/ports/restclient-cpp/CONTROL +++ b/ports/restclient-cpp/CONTROL @@ -1,4 +1,5 @@ Source: restclient-cpp -Version: 0.5.1-3 +Version: 0.5.2 Build-Depends: curl -Description: Binn is a binary data serialization format designed to be compact, fast and easy to use. +Homepage: https://code.mrtazz.com/restclient-cpp/ +Description: Simple REST client for C++. It wraps libcurl for HTTP requests. diff --git a/ports/restclient-cpp/portfile.cmake b/ports/restclient-cpp/portfile.cmake index 4efcb3ddd..c2ea8fa25 100644 --- a/ports/restclient-cpp/portfile.cmake +++ b/ports/restclient-cpp/portfile.cmake @@ -5,11 +5,9 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mrtazz/restclient-cpp - REF 0.5.1 - SHA512 d5e17a984af44f863bc7cdc7307c2b06cae9252f86c6c6c2377cdb317f61b6419d8e9aedc5e5ccdb08fd1ee13848ec3b9ef8067a8d26dcf438a5c8793b5a2ce3 + REF 0.5.2 + SHA512 f6acc6a3d5cb852d6e507463d94d2f6192a941f0c26fef7c674e9ff7753cf5474522052a2065774050d01af5c6d2a3b86398f43cd2e4f5d03abcaac9a21ef4b7 HEAD_REF master - PATCHES - 0001_fix_cmake_linking.patch ) vcpkg_configure_cmake( @@ -26,6 +24,7 @@ vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/restclient-cpp) vcpkg_copy_pdbs() +# Remove includes in debug file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) # Handle copyright