diff --git a/ports/jsoncpp/cmake-target.diff b/ports/jsoncpp/cmake-target.diff deleted file mode 100644 index 6cc429baac..0000000000 --- a/ports/jsoncpp/cmake-target.diff +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/jsoncpp-namespaced-targets.cmake b/jsoncpp-namespaced-targets.cmake -index ac1504e..144f086 100644 ---- a/jsoncpp-namespaced-targets.cmake -+++ b/jsoncpp-namespaced-targets.cmake -@@ -1,7 +1,9 @@ -+if (NOT TARGET JsonCpp::JsonCpp) - if (TARGET jsoncpp_static) - add_library(JsonCpp::JsonCpp INTERFACE IMPORTED) - set_target_properties(JsonCpp::JsonCpp PROPERTIES INTERFACE_LINK_LIBRARIES "jsoncpp_static") - elseif (TARGET jsoncpp_lib) - add_library(JsonCpp::JsonCpp INTERFACE IMPORTED) - set_target_properties(JsonCpp::JsonCpp PROPERTIES INTERFACE_LINK_LIBRARIES "jsoncpp_lib") -+endif () - endif () -\ No newline at end of file diff --git a/ports/jsoncpp/portfile.cmake b/ports/jsoncpp/portfile.cmake index 94e0a13b3d..f70f97894c 100644 --- a/ports/jsoncpp/portfile.cmake +++ b/ports/jsoncpp/portfile.cmake @@ -2,10 +2,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO open-source-parsers/jsoncpp REF "${VERSION}" - SHA512 1d06e044759b1e1a4cc4960189dd7e001a0a4389d7239a6d59295af995a553518e4e0337b4b4b817e70da5d9731a4c98655af90791b6287870b5ff8d73ad8873 + SHA512 006d81f9f723dcfe875ebc2147449c07c5246bf97dd7b9eee1909decc914b051d6f3f06feb5c3dfa143d28773fb310aabb04a81dc447cc61513309df8eba8b08 HEAD_REF master - PATCHES - cmake-target.diff ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" JSONCPP_STATIC) diff --git a/ports/jsoncpp/vcpkg.json b/ports/jsoncpp/vcpkg.json index d44438c1aa..4ca5d1fee6 100644 --- a/ports/jsoncpp/vcpkg.json +++ b/ports/jsoncpp/vcpkg.json @@ -1,7 +1,6 @@ { "name": "jsoncpp", - "version": "1.9.5", - "port-version": 5, + "version": "1.9.6", "description": "JsonCpp is a C++ library that allows manipulating JSON values, including serialization and deserialization to and from strings. It can also preserve existing comment in unserialization/serialization steps, making it a convenient format to store user input files.", "homepage": "https://github.com/open-source-parsers/jsoncpp", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index d207693a9b..0c15d5b396 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3869,8 +3869,8 @@ "port-version": 0 }, "jsoncpp": { - "baseline": "1.9.5", - "port-version": 5 + "baseline": "1.9.6", + "port-version": 0 }, "jsonifier": { "baseline": "0.9.96", diff --git a/versions/j-/jsoncpp.json b/versions/j-/jsoncpp.json index fcdb89a903..94ca8e83ff 100644 --- a/versions/j-/jsoncpp.json +++ b/versions/j-/jsoncpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dde49ad9d554fd5f062c0c1deea6e54b6fdb35b2", + "version": "1.9.6", + "port-version": 0 + }, { "git-tree": "176576512ab0d4bb4093ae4f404535a594a1a201", "version": "1.9.5",