diff --git a/ports/drogon/portfile.cmake b/ports/drogon/portfile.cmake index 168e8829d3..14c76429fe 100644 --- a/ports/drogon/portfile.cmake +++ b/ports/drogon/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO an-tao/drogon REF "v${VERSION}" - SHA512 0c58ed45aacbfd1916bbd9c52ecbd203abdc1032c7d6f908750a188443e293d749705d35c2b56eab54e30f36cc606b2437889e11a482ebda34d36035e8221499 + SHA512 453b0d1af2cd7e567539cf8512d87961d9285c3ac1cbeb58d49c27571c7247390b99cc7ea5ddb87c969c5638bcf7a958b9c4a2649c3d89ff7e081e278de33f6f HEAD_REF master PATCHES 0001-vcpkg.patch diff --git a/ports/drogon/vcpkg.json b/ports/drogon/vcpkg.json index 84973cd2a0..6865da649d 100644 --- a/ports/drogon/vcpkg.json +++ b/ports/drogon/vcpkg.json @@ -1,6 +1,6 @@ { "name": "drogon", - "version-semver": "1.9.4", + "version-semver": "1.9.5", "description": "A C++14/17 based HTTP web application framework running on Linux/macOS/Unix/Windows", "homepage": "https://github.com/an-tao/drogon", "documentation": "https://drogon.docsforge.com/master/overview/", diff --git a/ports/trantor/000-fix-deps.patch b/ports/trantor/000-fix-deps.patch index 33ab624585..40f7977629 100644 --- a/ports/trantor/000-fix-deps.patch +++ b/ports/trantor/000-fix-deps.patch @@ -1,39 +1,39 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 07c61b9..54ad99f 100644 +index a0b10de..ee63bc8 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -220,7 +220,7 @@ endif(HAVE_SPDLOG) +@@ -245,7 +245,7 @@ endif(HAVE_SPDLOG) set(HAVE_C-ARES NO) - if (BUILD_C-ARES) -- find_package(c-ares) -+ find_package(c-ares CONFIG) - if(c-ares_FOUND) - message(STATUS "c-ares found!") - set(HAVE_C-ARES TRUE) -@@ -231,7 +231,7 @@ if(HAVE_C-ARES) - if (NOT BUILD_SHARED_LIBS) + if(BUILD_C-ARES) +- find_package(c-ares) ++ find_package(c-ares CONFIG) + if(c-ares_FOUND) + message(STATUS "c-ares found!") + set(HAVE_C-ARES TRUE) +@@ -256,7 +256,7 @@ if(HAVE_C-ARES) + if(NOT BUILD_SHARED_LIBS) target_compile_definitions(${PROJECT_NAME} PRIVATE CARES_STATICLIB) - endif () + endif() - target_link_libraries(${PROJECT_NAME} PRIVATE c-ares_lib) + target_link_libraries(${PROJECT_NAME} PRIVATE c-ares::cares) - set(TRANTOR_SOURCES - ${TRANTOR_SOURCES} - trantor/net/inner/AresResolver.cc) -@@ -366,8 +366,6 @@ install( - FILES - "${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/TrantorConfig.cmake" - "${CMAKE_CURRENT_BINARY_DIR}/TrantorConfigVersion.cmake" -- "${CMAKE_CURRENT_SOURCE_DIR}/cmake_modules/Findc-ares.cmake" -- "${CMAKE_CURRENT_SOURCE_DIR}/cmake_modules/FindBotan.cmake" + set(TRANTOR_SOURCES ${TRANTOR_SOURCES} trantor/net/inner/AresResolver.cc) + set(private_headers ${private_headers} trantor/net/inner/AresResolver.h) + if(APPLE) +@@ -382,8 +382,6 @@ write_basic_package_version_file( + install( + FILES "${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/TrantorConfig.cmake" + "${CMAKE_CURRENT_BINARY_DIR}/TrantorConfigVersion.cmake" +- "${CMAKE_CURRENT_SOURCE_DIR}/cmake_modules/Findc-ares.cmake" +- "${CMAKE_CURRENT_SOURCE_DIR}/cmake_modules/FindBotan.cmake" DESTINATION "${INSTALL_TRANTOR_CMAKE_DIR}" - COMPONENT dev) - + COMPONENT dev + ) diff --git a/cmake/templates/TrantorConfig.cmake.in b/cmake/templates/TrantorConfig.cmake.in -index 61007bd..c5dd363 100644 +index e9422ed..142d1d6 100644 --- a/cmake/templates/TrantorConfig.cmake.in +++ b/cmake/templates/TrantorConfig.cmake.in -@@ -17,7 +17,7 @@ if(@Botan_FOUND@) +@@ -19,7 +19,7 @@ if(@Botan_FOUND@) find_dependency(Botan) endif() if(@c-ares_FOUND@) diff --git a/ports/trantor/001-disable-werror.patch b/ports/trantor/001-disable-werror.patch index 222cd277d0..659079f37b 100644 --- a/ports/trantor/001-disable-werror.patch +++ b/ports/trantor/001-disable-werror.patch @@ -1,13 +1,13 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 54ad99f..7919b37 100644 +index ee63bc8..4328c70 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -55,7 +55,7 @@ if(MSVC AND MSVC_VERSION GREATER_EQUAL 1914) - endif(MSVC AND MSVC_VERSION GREATER_EQUAL 1914) - - if (NOT ${CMAKE_SYSTEM_NAME} STREQUAL "Windows" AND CMAKE_CXX_COMPILER_ID MATCHES Clang|GNU) -- target_compile_options(${PROJECT_NAME} PRIVATE -Wall -Wextra -Werror) -+ target_compile_options(${PROJECT_NAME} PRIVATE -Wall -Wextra) +@@ -76,7 +76,7 @@ if(NOT + "Windows" + AND CMAKE_CXX_COMPILER_ID MATCHES Clang|GNU + ) +- target_compile_options(${PROJECT_NAME} PRIVATE -Wall -Wextra -Werror) ++ target_compile_options(${PROJECT_NAME} PRIVATE -Wall -Wextra) endif() if(${CMAKE_SYSTEM_NAME} STREQUAL "Haiku") diff --git a/ports/trantor/portfile.cmake b/ports/trantor/portfile.cmake index bc2dbb165b..d52b5024fb 100644 --- a/ports/trantor/portfile.cmake +++ b/ports/trantor/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO an-tao/trantor REF "v${VERSION}" - SHA512 2dba27efad95155a76968959d9bd2510be8502b9424716493f385aebbce2481553cc8fae283076029aed4bef6f0aadb0bec3f9acb98fbca3ef4d49b936558f8c + SHA512 76264df770b14702cae88bb77c8e863e85eb034fd14bb062d3414f981b759be61bff3ce5aa1c8cca44bf0ca0b3568ed77248c9986eb23b6715631cdae9445a02 HEAD_REF master PATCHES 000-fix-deps.patch diff --git a/ports/trantor/vcpkg.json b/ports/trantor/vcpkg.json index 1691d274ce..408e393251 100644 --- a/ports/trantor/vcpkg.json +++ b/ports/trantor/vcpkg.json @@ -1,6 +1,6 @@ { "name": "trantor", - "version-semver": "1.5.18", + "version-semver": "1.5.19", "description": "A non-blocking I/O cross-platform TCP network library, using C++14", "homepage": "https://github.com/an-tao/trantor", "license": "BSD-2-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index 3cb481573e..84a2ba4f51 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2353,7 +2353,7 @@ "port-version": 0 }, "drogon": { - "baseline": "1.9.4", + "baseline": "1.9.5", "port-version": 0 }, "dstorage": { @@ -8845,7 +8845,7 @@ "port-version": 0 }, "trantor": { - "baseline": "1.5.18", + "baseline": "1.5.19", "port-version": 0 }, "tre": { diff --git a/versions/d-/drogon.json b/versions/d-/drogon.json index c4c06d9111..db9ea14f30 100644 --- a/versions/d-/drogon.json +++ b/versions/d-/drogon.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e8f978a09d763c54a1149e6b8cb75301f274c3e7", + "version-semver": "1.9.5", + "port-version": 0 + }, { "git-tree": "74578b0091a10840e127b7b5da3e9d44a97c010f", "version-semver": "1.9.4", diff --git a/versions/t-/trantor.json b/versions/t-/trantor.json index 3ec7b821be..4ed365871d 100644 --- a/versions/t-/trantor.json +++ b/versions/t-/trantor.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "559a4890e9821270f388b9bb198591b6a5cc4b66", + "version-semver": "1.5.19", + "port-version": 0 + }, { "git-tree": "4640cf021e9c3dcc039d208d3dc6706091b5c00f", "version-semver": "1.5.18",