diff --git a/vcpkg-overlays/omit-json-c-apps/json-c/disable-duplocale.patch b/vcpkg-overlays/omit-json-c-apps/json-c/disable-duplocale.patch index 7a0cf5411..ec9c6f58d 100644 --- a/vcpkg-overlays/omit-json-c-apps/json-c/disable-duplocale.patch +++ b/vcpkg-overlays/omit-json-c-apps/json-c/disable-duplocale.patch @@ -1,7 +1,7 @@ --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -202,6 +202,12 @@ - exec_program(${CMAKE_C_COMPILER} ARGS -dumpmachine OUTPUT_VARIABLE CMAKE_GNU_C_MACHINE) +@@ -183,6 +183,12 @@ + if (CMAKE_GNU_C_MACHINE MATCHES "uclibc") message(STATUS "Detected uClibc compiler, disabling locale handling") + set(HAVE_SETLOCALE 0) diff --git a/vcpkg-overlays/omit-json-c-apps/json-c/fix-clang-cl.patch b/vcpkg-overlays/omit-json-c-apps/json-c/fix-clang-cl.patch deleted file mode 100644 index a2609d5d2..000000000 --- a/vcpkg-overlays/omit-json-c-apps/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/vcpkg-overlays/omit-json-c-apps/json-c/pkgconfig.patch b/vcpkg-overlays/omit-json-c-apps/json-c/pkgconfig.patch deleted file mode 100644 index 893406ed5..000000000 --- a/vcpkg-overlays/omit-json-c-apps/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/vcpkg-overlays/omit-json-c-apps/json-c/portfile.cmake b/vcpkg-overlays/omit-json-c-apps/json-c/portfile.cmake index fea85b413..5d3c1cd3d 100644 --- a/vcpkg-overlays/omit-json-c-apps/json-c/portfile.cmake +++ b/vcpkg-overlays/omit-json-c-apps/json-c/portfile.cmake @@ -1,33 +1,31 @@ -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO json-c/json-c - REF b4c371fa0cbc4dcbaccc359ce9e957a22988fb34 - SHA512 1338271a6f9ffb3b8a8d4f2ec36a374ed84b3c91f789b607693c08cbeb38c4fdd813593f530ff94e841a095ff367a3ae8c5f5e7dbcb64e8f9044f6affdf24505 - HEAD_REF master - PATCHES pkgconfig.patch - fix-clang-cl.patch - disable-duplocale.patch -) - -string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" JSON_BUILD_STATIC) -string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" JSON_BUILD_SHARED) - -vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" - OPTIONS - -DBUILD_APPS=OFF - -DBUILD_TESTING=OFF - -DBUILD_STATIC_LIBS=${JSON_BUILD_STATIC} - -DBUILD_SHARED_LIBS=${JSON_BUILD_SHARED} -) - -vcpkg_cmake_install() - -vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}") -vcpkg_fixup_pkgconfig() -vcpkg_copy_pdbs() - -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") - -# Handle copyright -vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO json-c/json-c + REF "json-c-${VERSION}" + SHA512 219d8c0da9a4016b74af238cc15dbec1f369a07de160bcc548d80279028e1b5d8d928deb13fec09c96a085fc0ecf10090e309cbe72d0081aca864433c4ae01db + HEAD_REF master + PATCHES disable-duplocale.patch +) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" JSON_BUILD_STATIC) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" JSON_BUILD_SHARED) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_APPS=OFF + -DBUILD_TESTING=OFF + -DBUILD_STATIC_LIBS=${JSON_BUILD_STATIC} + -DBUILD_SHARED_LIBS=${JSON_BUILD_SHARED} +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}") +vcpkg_fixup_pkgconfig() +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +# Handle copyright +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") diff --git a/vcpkg-overlays/omit-json-c-apps/json-c/vcpkg.json b/vcpkg-overlays/omit-json-c-apps/json-c/vcpkg.json index 16efcbaa1..99b06dd5a 100644 --- a/vcpkg-overlays/omit-json-c-apps/json-c/vcpkg.json +++ b/vcpkg-overlays/omit-json-c-apps/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",