mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-11-27 19:59:06 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[json-c] update to 0.17 2023-08-12 (#34381)

Browse Source 
* [json-c] update to version 0.17 2023-08-12

* [json-c] update version database

* [clamav] update to version 0.103.11

* [clamav] update version db

* [clamav] add patch to compile isnt.cpp on windows

* [clamav] update version db

* [clamav] remove extra port version

* [clamav] update version db

* fix cmakelists.txt

* update version

* fix cmakelists.txt

* update git-tree

* remove fix-cmakelists.patch

* update git-tree

* format

* update git-tree

---------

Co-authored-by: Monica <liuyumei01@beyondsoft.com>
This commit is contained in:
John Willard 2024-02-06 13:45:43 -07:00 committed by GitHub
parent e6c4f478e0
commit 3975146c8a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
10 changed files with 44 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ports/clamav/isnt.patch Normal file
View File

@ -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.

5
ports/clamav/portfile.cmake
View File

@ -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(

3
ports/clamav/vcpkg.json
View File

@ -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",

13
ports/json-c/fix-build-with-clang.patch
View File

@ -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)

10
ports/json-c/fix-clang-cl.patch
View File

@ -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")

12
ports/json-c/portfile.cmake
View File

@ -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")

3
ports/json-c/vcpkg.json
View File

@ -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",

8
versions/baseline.json
View File

@ -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",

5
versions/c-/clamav.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "7a5d72a0592ed756c359a514d629900bdccd0e9a",
"version-semver": "0.103.11",
"port-version": 0
},
{
"git-tree": "e6af13bd82992b466df39229e4d4045895dbd023",
"version-semver": "0.103.0",

5
versions/j-/json-c.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "dcfc2cbe17b88101d8e40f6eb6141b77caff68e9",
"version-date": "2023-08-12",
"port-version": 0
},
{
"git-tree": "787ad6eeafc631bea9f68c3ad2047a031575bb0f",
"version-date": "2022-06-26",