diff --git a/ports/clamav/isnt.patch b/ports/clamav/isnt.patch new file mode 100644 index 0000000000..faceaa16b7 --- /dev/null +++ b/ports/clamav/isnt.patch @@ -0,0 +1,12 @@ +diff --git a/libclamunrar/CMakeLists.txt b/libclamunrar/CMakeLists.txt +index f7ce3848e..5bae50aca 100644 +--- a/libclamunrar/CMakeLists.txt ++++ b/libclamunrar/CMakeLists.txt +@@ -85,6 +85,7 @@ target_sources( clamunrar + "dll.hpp" ) + if(WIN32) + set_target_properties(clamunrar PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS ON) ++ target_sources( clamunrar PRIVATE "isnt.cpp") + endif() + + # Public (forwarded) dependencies. diff --git a/ports/clamav/portfile.cmake b/ports/clamav/portfile.cmake index 1b388479bd..7f5a66b66c 100644 --- a/ports/clamav/portfile.cmake +++ b/ports/clamav/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Cisco-Talos/clamav-devel - REF clamav-0.103.0 - SHA512 e7ff4d98e0615a9fec0752bbfa2b882ae95034a8e01d0f7cc635ee520ff917c3be2a2d3273caa2fc1598e7d5ec4fd60d59b517cb439c5454d32447f8c8d7ba5a + REF clamav-0.103.11 + SHA512 2d614b5006fe526d7bb43dfc691329f2de2fa2dc6cfc63fb93ba556ee26a9f87369bf072f59db0fed178c44413d68838b45ea572885c8d0a0bee81a410d5e055 FILE_DISAMBIGUATOR 1 HEAD_REF master PATCHES @@ -12,6 +12,7 @@ vcpkg_from_github( "cmakefiles.patch" "curl.patch" "mspack.patch" + "isnt.patch" ) vcpkg_cmake_configure( diff --git a/ports/clamav/vcpkg.json b/ports/clamav/vcpkg.json index 885db85d00..0a8b3070e8 100644 --- a/ports/clamav/vcpkg.json +++ b/ports/clamav/vcpkg.json @@ -1,7 +1,6 @@ { "name": "clamav", - "version-semver": "0.103.0", - "port-version": 4, + "version-semver": "0.103.11", "description": "ClamAV is an open-source anti-virus toolkit.", "homepage": "https://www.clamav.net", "supports": "!uwp & !static", diff --git a/ports/json-c/fix-build-with-clang.patch b/ports/json-c/fix-build-with-clang.patch deleted file mode 100644 index a4fad41819..0000000000 --- a/ports/json-c/fix-build-with-clang.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 11b3970..66e9d0a 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -293,7 +293,7 @@ if ("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_C_COMPILER_ID}" STREQUAL - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wwrite-strings") - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-unused-parameter") - if (NOT WIN32) -- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wstrict-prototypes") -+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-strict-prototypes") - endif() - - add_definitions(-D_GNU_SOURCE) diff --git a/ports/json-c/fix-clang-cl.patch b/ports/json-c/fix-clang-cl.patch index 85641a7d54..a2609d5d28 100644 --- a/ports/json-c/fix-clang-cl.patch +++ b/ports/json-c/fix-clang-cl.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 9741b45f9..11b397024 100644 +index 0aa1b64..54e7b3d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -281,7 +281,7 @@ message(STATUS "Wrote ${PROJECT_BINARY_DIR}/config.h") +@@ -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") @@ -11,10 +11,10 @@ index 9741b45f9..11b397024 100644 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -ffunction-sections -fdata-sections") if ("${DISABLE_WERROR}" STREQUAL "OFF") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror") -@@ -297,7 +297,7 @@ if ("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_C_COMPILER_ID}" STREQUAL +@@ -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() - - add_definitions(-D_GNU_SOURCE) -elseif ("${CMAKE_C_COMPILER_ID}" STREQUAL "MSVC") +elseif (MSVC) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /DEBUG") diff --git a/ports/json-c/portfile.cmake b/ports/json-c/portfile.cmake index 355d83867e..dccd504f70 100644 --- a/ports/json-c/portfile.cmake +++ b/ports/json-c/portfile.cmake @@ -1,18 +1,22 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO json-c/json-c - REF d28ac67dde77566f53a97f22b4ea7cb36afe6582 - SHA512 30063c8e32eb82e170647363055119f2f7eab19e1c3152673b966f41ed07e0349c3d6141b215b9912f9e84c2e06677b3d7ac949f720c7ebc2c95d692dc3881fe + REF b4c371fa0cbc4dcbaccc359ce9e957a22988fb34 + SHA512 1338271a6f9ffb3b8a8d4f2ec36a374ed84b3c91f789b607693c08cbeb38c4fdd813593f530ff94e841a095ff367a3ae8c5f5e7dbcb64e8f9044f6affdf24505 HEAD_REF master PATCHES pkgconfig.patch fix-clang-cl.patch - fix-build-with-clang.patch #https://github.com/json-c/json-c/pull/783 Remove in next version ) +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_TESTING=OFF + -DBUILD_STATIC_LIBS=${JSON_BUILD_STATIC} + -DBUILD_SHARED_LIBS=${JSON_BUILD_SHARED} ) vcpkg_cmake_install() @@ -24,4 +28,4 @@ vcpkg_copy_pdbs() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") # Handle copyright -configure_file("${SOURCE_PATH}/COPYING" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") diff --git a/ports/json-c/vcpkg.json b/ports/json-c/vcpkg.json index f4dbf0b1a1..16efcbaa12 100644 --- a/ports/json-c/vcpkg.json +++ b/ports/json-c/vcpkg.json @@ -1,7 +1,6 @@ { "name": "json-c", - "version-date": "2022-06-26", - "port-version": 3, + "version-date": "2023-08-12", "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 7514cdc53a..0481bef1a3 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1617,8 +1617,8 @@ "port-version": 0 }, "clamav": { - "baseline": "0.103.0", - "port-version": 4 + "baseline": "0.103.11", + "port-version": 0 }, "clap-cleveraudio": { "baseline": "1.2.0", @@ -3697,8 +3697,8 @@ "port-version": 2 }, "json-c": { - "baseline": "2022-06-26", - "port-version": 3 + "baseline": "2023-08-12", + "port-version": 0 }, "json-dto": { "baseline": "0.3.3", diff --git a/versions/c-/clamav.json b/versions/c-/clamav.json index 09e10a7e3a..a51d72a697 100644 --- a/versions/c-/clamav.json +++ b/versions/c-/clamav.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7a5d72a0592ed756c359a514d629900bdccd0e9a", + "version-semver": "0.103.11", + "port-version": 0 + }, { "git-tree": "e6af13bd82992b466df39229e4d4045895dbd023", "version-semver": "0.103.0", diff --git a/versions/j-/json-c.json b/versions/j-/json-c.json index 5594b4ebbc..bc29eb13f5 100644 --- a/versions/j-/json-c.json +++ b/versions/j-/json-c.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dcfc2cbe17b88101d8e40f6eb6141b77caff68e9", + "version-date": "2023-08-12", + "port-version": 0 + }, { "git-tree": "787ad6eeafc631bea9f68c3ad2047a031575bb0f", "version-date": "2022-06-26",