diff --git a/ports/json-c/fix-clang-cl.patch b/ports/json-c/fix-clang-cl.patch deleted file mode 100644 index a2609d5d28cbdf..00000000000000 --- a/ports/json-c/fix-clang-cl.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 0aa1b64..54e7b3d 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -295,7 +295,7 @@ message(STATUS "Wrote ${PROJECT_BINARY_DIR}/config.h") - configure_file(${PROJECT_SOURCE_DIR}/cmake/json_config.h.in ${PROJECT_BINARY_DIR}/json_config.h) - message(STATUS "Wrote ${PROJECT_BINARY_DIR}/json_config.h") - --if ("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_C_COMPILER_ID}" STREQUAL "Clang") -+if ("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_C_COMPILER_ID}" STREQUAL "Clang" AND NOT MSVC) - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -ffunction-sections -fdata-sections") - if ("${DISABLE_WERROR}" STREQUAL "OFF") - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror") -@@ -316,7 +316,7 @@ if ("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_C_COMPILER_ID}" STREQUAL - # Remove this for 1.0 when we can bump the ABI and actually fix these warnings. - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-shorten-64-to-32") - endif() --elseif ("${CMAKE_C_COMPILER_ID}" STREQUAL "MSVC") -+elseif (MSVC) - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /DEBUG") - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4100") - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4996") diff --git a/ports/json-c/pkgconfig.patch b/ports/json-c/pkgconfig.patch deleted file mode 100644 index 893406ed510379..00000000000000 --- a/ports/json-c/pkgconfig.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index ffb1db3dc..a82ed8619 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -273,7 +273,7 @@ install( - DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME} - ) - --if (UNIX OR MINGW OR CYGWIN) -+if (1) - SET(prefix ${CMAKE_INSTALL_PREFIX}) - # exec_prefix is prefix by default and CMake does not have the - # concept. diff --git a/ports/json-c/portfile.cmake b/ports/json-c/portfile.cmake index dccd504f701dc0..b15393af8ffb96 100644 --- a/ports/json-c/portfile.cmake +++ b/ports/json-c/portfile.cmake @@ -1,11 +1,10 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO json-c/json-c - REF b4c371fa0cbc4dcbaccc359ce9e957a22988fb34 - SHA512 1338271a6f9ffb3b8a8d4f2ec36a374ed84b3c91f789b607693c08cbeb38c4fdd813593f530ff94e841a095ff367a3ae8c5f5e7dbcb64e8f9044f6affdf24505 + REF "json-c-${VERSION}" + + SHA512 219d8c0da9a4016b74af238cc15dbec1f369a07de160bcc548d80279028e1b5d8d928deb13fec09c96a085fc0ecf10090e309cbe72d0081aca864433c4ae01db HEAD_REF master - PATCHES pkgconfig.patch - fix-clang-cl.patch ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" JSON_BUILD_STATIC) diff --git a/ports/json-c/vcpkg.json b/ports/json-c/vcpkg.json index 16efcbaa1299ed..99b06dd5a67623 100644 --- a/ports/json-c/vcpkg.json +++ b/ports/json-c/vcpkg.json @@ -1,6 +1,6 @@ { "name": "json-c", - "version-date": "2023-08-12", + "version": "0.18-20240915", "description": "A JSON implementation in C", "homepage": "https://github.com/json-c/json-c", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 4bdaf1348f9cf0..7b19040cb3a2a0 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3849,7 +3849,7 @@ "port-version": 2 }, "json-c": { - "baseline": "2023-08-12", + "baseline": "0.18-20240915", "port-version": 0 }, "json-dto": { diff --git a/versions/j-/json-c.json b/versions/j-/json-c.json index bc29eb13f545d0..347c04e325b83a 100644 --- a/versions/j-/json-c.json +++ b/versions/j-/json-c.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "786a0712b7019e33da008008e17fb920932e9e8d", + "version": "0.18-20240915", + "port-version": 0 + }, { "git-tree": "dcfc2cbe17b88101d8e40f6eb6141b77caff68e9", "version-date": "2023-08-12",