From 4baf37eba373cc077e1275a082ed0a993d6df2bc Mon Sep 17 00:00:00 2001 From: troyan1337 Date: Tue, 20 Aug 2024 01:33:22 +1000 Subject: [PATCH 1/5] [curlcpp] Add new port --- ports/curlcpp/fix-cmake.patch | 66 +++++++++++++++++++++++++++++++++++ ports/curlcpp/portfile.cmake | 27 ++++++++++++++ ports/curlcpp/vcpkg.json | 18 ++++++++++ 3 files changed, 111 insertions(+) create mode 100644 ports/curlcpp/fix-cmake.patch create mode 100644 ports/curlcpp/portfile.cmake create mode 100644 ports/curlcpp/vcpkg.json diff --git a/ports/curlcpp/fix-cmake.patch b/ports/curlcpp/fix-cmake.patch new file mode 100644 index 00000000000000..c2e32b2c22602d --- /dev/null +++ b/ports/curlcpp/fix-cmake.patch @@ -0,0 +1,66 @@ +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index f3c6d78..4cd17e9 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -23,44 +23,23 @@ set(CURLCPP_HEADER_LIST + ../include/curl_utility.h + ) + +- +-if(NOT BUILD_SHARED_LIBS) +- add_library(curlcpp +- curl_easy.cpp +- curl_header.cpp +- curl_global.cpp +- curl_form.cpp +- curl_multi.cpp +- curl_share.cpp +- curl_info.cpp +- curl_cookie.cpp +- curl_exception.cpp +- cookie.cpp +- cookie_date.cpp +- cookie_time.cpp +- cookie_datetime.cpp +- +- ${CURLCPP_HEADER_LIST} +- ) +-else() +- add_library(curlcpp ${BUILD_SHARED_LIBS} +- curl_easy.cpp +- curl_header.cpp +- curl_global.cpp +- curl_form.cpp +- curl_multi.cpp +- curl_share.cpp +- curl_info.cpp +- curl_cookie.cpp +- curl_exception.cpp +- cookie.cpp +- cookie_date.cpp +- cookie_time.cpp +- cookie_datetime.cpp +- +- ${CURLCPP_HEADER_LIST} +- ) +-endif() ++add_library(curlcpp ++ curl_easy.cpp ++ curl_header.cpp ++ curl_global.cpp ++ curl_form.cpp ++ curl_multi.cpp ++ curl_share.cpp ++ curl_info.cpp ++ curl_cookie.cpp ++ curl_exception.cpp ++ cookie.cpp ++ cookie_date.cpp ++ cookie_time.cpp ++ cookie_datetime.cpp ++ ++ ${CURLCPP_HEADER_LIST} ++) + + add_library(curlcpp::curlcpp ALIAS curlcpp) + diff --git a/ports/curlcpp/portfile.cmake b/ports/curlcpp/portfile.cmake new file mode 100644 index 00000000000000..a8c6f47ac2a6f4 --- /dev/null +++ b/ports/curlcpp/portfile.cmake @@ -0,0 +1,27 @@ +if (VCPKG_TARGET_IS_WINDOWS) + vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO JosephP91/curlcpp + REF "${VERSION}" + SHA512 9c84dff893ac4f7a02b6b360d72f9cf65a69ca33bed6c35ceef21cef2f20c1eb36664fdb3e2918a39a88f88bd4104d9d09f5d40168847a3be83135958bd41046 + HEAD_REF master + PATCHES + fix-cmake.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT} PACKAGE_NAME "curlcpp") + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +vcpkg_fixup_pkgconfig() + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") \ No newline at end of file diff --git a/ports/curlcpp/vcpkg.json b/ports/curlcpp/vcpkg.json new file mode 100644 index 00000000000000..41bde979f49caa --- /dev/null +++ b/ports/curlcpp/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "curlcpp", + "version": "3.1", + "homepage": "https://josephp91.github.io/curlcpp/", + "description": "An object oriented C++ wrapper for CURL (libcurl)", + "license": "MIT", + "dependencies": [ + { + "name" : "vcpkg-cmake", + "host" : true + }, + { + "name" : "vcpkg-cmake-config", + "host" : true + }, + "curl" + ] + } \ No newline at end of file From 80fc953730eaf3a78963c1307e5659e471fcb398 Mon Sep 17 00:00:00 2001 From: troyan1337 Date: Tue, 20 Aug 2024 01:36:00 +1000 Subject: [PATCH 2/5] [curlcpp] Add version --- ports/curlcpp/vcpkg.json | 34 +++++++++++++++++----------------- versions/baseline.json | 4 ++++ versions/c-/curlcpp.json | 9 +++++++++ 3 files changed, 30 insertions(+), 17 deletions(-) create mode 100644 versions/c-/curlcpp.json diff --git a/ports/curlcpp/vcpkg.json b/ports/curlcpp/vcpkg.json index 41bde979f49caa..a33e275bdbc368 100644 --- a/ports/curlcpp/vcpkg.json +++ b/ports/curlcpp/vcpkg.json @@ -1,18 +1,18 @@ { - "name": "curlcpp", - "version": "3.1", - "homepage": "https://josephp91.github.io/curlcpp/", - "description": "An object oriented C++ wrapper for CURL (libcurl)", - "license": "MIT", - "dependencies": [ - { - "name" : "vcpkg-cmake", - "host" : true - }, - { - "name" : "vcpkg-cmake-config", - "host" : true - }, - "curl" - ] - } \ No newline at end of file + "name": "curlcpp", + "version": "3.1", + "description": "An object oriented C++ wrapper for CURL (libcurl)", + "homepage": "https://josephp91.github.io/curlcpp/", + "license": "MIT", + "dependencies": [ + "curl", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index c4ea3d5101669d..440893a498f588 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2108,6 +2108,10 @@ "baseline": "8.9.1", "port-version": 1 }, + "curlcpp": { + "baseline": "3.1", + "port-version": 0 + }, "curlpp": { "baseline": "2018-06-15", "port-version": 9 diff --git a/versions/c-/curlcpp.json b/versions/c-/curlcpp.json new file mode 100644 index 00000000000000..c28737d6c253b0 --- /dev/null +++ b/versions/c-/curlcpp.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "aa91fce05f4660ecffb6d34b8b8364fa6b876f85", + "version": "3.1", + "port-version": 0 + } + ] +} From d62f4887cba60c047bd32207174a2f994c73924e Mon Sep 17 00:00:00 2001 From: troyan1337 Date: Tue, 20 Aug 2024 02:45:22 +1000 Subject: [PATCH 3/5] Update version database --- versions/c-/curlcpp.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/c-/curlcpp.json b/versions/c-/curlcpp.json index c28737d6c253b0..a07704fb574e53 100644 --- a/versions/c-/curlcpp.json +++ b/versions/c-/curlcpp.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "aa91fce05f4660ecffb6d34b8b8364fa6b876f85", + "git-tree": "67b833806d04afb8e34bc6da72c7ba29a11243ac", "version": "3.1", "port-version": 0 } From 45b1bd4007f120041cc6e37cdbead79210fb0ade Mon Sep 17 00:00:00 2001 From: troyan1337 Date: Tue, 20 Aug 2024 21:21:35 +1000 Subject: [PATCH 4/5] Minimize patches --- ports/curlcpp/fix-cmake.patch | 71 +++++------------------------------ 1 file changed, 9 insertions(+), 62 deletions(-) diff --git a/ports/curlcpp/fix-cmake.patch b/ports/curlcpp/fix-cmake.patch index c2e32b2c22602d..86ba562fafa745 100644 --- a/ports/curlcpp/fix-cmake.patch +++ b/ports/curlcpp/fix-cmake.patch @@ -1,66 +1,13 @@ diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index f3c6d78..4cd17e9 100644 +index f3c6d78..a457717 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt -@@ -23,44 +23,23 @@ set(CURLCPP_HEADER_LIST - ../include/curl_utility.h - ) - -- --if(NOT BUILD_SHARED_LIBS) -- add_library(curlcpp -- curl_easy.cpp -- curl_header.cpp -- curl_global.cpp -- curl_form.cpp -- curl_multi.cpp -- curl_share.cpp -- curl_info.cpp -- curl_cookie.cpp -- curl_exception.cpp -- cookie.cpp -- cookie_date.cpp -- cookie_time.cpp -- cookie_datetime.cpp -- -- ${CURLCPP_HEADER_LIST} -- ) --else() +@@ -43,7 +43,7 @@ if(NOT BUILD_SHARED_LIBS) + ${CURLCPP_HEADER_LIST} + ) + else() - add_library(curlcpp ${BUILD_SHARED_LIBS} -- curl_easy.cpp -- curl_header.cpp -- curl_global.cpp -- curl_form.cpp -- curl_multi.cpp -- curl_share.cpp -- curl_info.cpp -- curl_cookie.cpp -- curl_exception.cpp -- cookie.cpp -- cookie_date.cpp -- cookie_time.cpp -- cookie_datetime.cpp -- -- ${CURLCPP_HEADER_LIST} -- ) --endif() -+add_library(curlcpp -+ curl_easy.cpp -+ curl_header.cpp -+ curl_global.cpp -+ curl_form.cpp -+ curl_multi.cpp -+ curl_share.cpp -+ curl_info.cpp -+ curl_cookie.cpp -+ curl_exception.cpp -+ cookie.cpp -+ cookie_date.cpp -+ cookie_time.cpp -+ cookie_datetime.cpp -+ -+ ${CURLCPP_HEADER_LIST} -+) - - add_library(curlcpp::curlcpp ALIAS curlcpp) - ++ add_library(curlcpp SHARED + curl_easy.cpp + curl_header.cpp + curl_global.cpp From b2f1ffc298d629387cf9e7f7dcfe6b1ed0469f97 Mon Sep 17 00:00:00 2001 From: troyan1337 Date: Tue, 20 Aug 2024 21:32:16 +1000 Subject: [PATCH 5/5] Update version database --- versions/c-/curlcpp.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/c-/curlcpp.json b/versions/c-/curlcpp.json index a07704fb574e53..caf6654f85d0e3 100644 --- a/versions/c-/curlcpp.json +++ b/versions/c-/curlcpp.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "67b833806d04afb8e34bc6da72c7ba29a11243ac", + "git-tree": "c5fc6feed65a45463099e6a395bbd977f07cf15a", "version": "3.1", "port-version": 0 }