diff --git a/ports/yalantinglibs/portfile.cmake b/ports/yalantinglibs/portfile.cmake index 513ffc45bf..d3462682f5 100644 --- a/ports/yalantinglibs/portfile.cmake +++ b/ports/yalantinglibs/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO alibaba/yalantinglibs REF "${VERSION}" - SHA512 4431c4fea7af80b81b35989879d47ad09abca31789f8e5bc77aae85824b1bd7c6d3de57c5421820670cbdd2313dbc9ea56ad8bf3f4dc8751d51d9ce7212985b0 + SHA512 df0aafbda3abf7bd4d2432aa5edede8ce9603f21ad2c1c126759253fcf7394550e74e81b87ed7db4fbc59e6e6e5ba92f552bbce8e772482765cea0a71ecffd89 HEAD_REF main PATCHES use-external-libs.patch diff --git a/ports/yalantinglibs/use-external-libs.patch b/ports/yalantinglibs/use-external-libs.patch index 6beb351b3e..47cedb76e6 100644 --- a/ports/yalantinglibs/use-external-libs.patch +++ b/ports/yalantinglibs/use-external-libs.patch @@ -1,11 +1,12 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 8cc8d32..1259d1f 100644 +index 448a80d..c7028a7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -6,6 +6,11 @@ project(yaLanTingLibs - LANGUAGES CXX +@@ -16,6 +16,12 @@ project(yaLanTingLibs + HOMEPAGE_URL "https://github.com/alibaba/yalantinglibs" + LANGUAGES ${PROJECT_LANGUAGES} ) - ++ +find_path(IGUANA_INCLUDE_DIRS "iguana/common.hpp") +include_directories(${IGUANA_INCLUDE_DIRS}) +find_path(CINATRA_INCLUDE_DIRS "cinatra.hpp") @@ -13,7 +14,7 @@ index 8cc8d32..1259d1f 100644 + # load pack finder list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/Find/) - + diff --git a/cmake/install.cmake b/cmake/install.cmake index 956195f..ad9df4e 100644 --- a/cmake/install.cmake diff --git a/ports/yalantinglibs/vcpkg.json b/ports/yalantinglibs/vcpkg.json index 914aae80a2..7ab531abe9 100644 --- a/ports/yalantinglibs/vcpkg.json +++ b/ports/yalantinglibs/vcpkg.json @@ -1,6 +1,6 @@ { "name": "yalantinglibs", - "version": "0.5.8", + "version": "0.6.1", "description": "A Collection of C++20 libraries, include struct_pack, struct_json, struct_xml, struct_yaml, struct_pb, easylog, coro_rpc, coro_http and async_simple", "homepage": "https://github.com/alibaba/yalantinglibs", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index ff4c1802ee..7abe6e2306 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -11057,7 +11057,7 @@ "port-version": 5 }, "yalantinglibs": { - "baseline": "0.5.8", + "baseline": "0.6.1", "port-version": 0 }, "yaml-cpp": { diff --git a/versions/y-/yalantinglibs.json b/versions/y-/yalantinglibs.json index e5ea8c05a8..f150679a6f 100644 --- a/versions/y-/yalantinglibs.json +++ b/versions/y-/yalantinglibs.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "98f5fb6aba261da7233ea4dcd6f88f75887389b2", + "version": "0.6.1", + "port-version": 0 + }, { "git-tree": "2b02e50c8a62a395cc44d9988f988761035a6996", "version": "0.5.8",