From 9f13063ee8dcf01e49d86dbe916104b195a8307f Mon Sep 17 00:00:00 2001 From: Jia Yue Hua <3423893+jiayuehua@users.noreply.github.com> Date: Tue, 3 Oct 2023 11:48:58 +0800 Subject: [PATCH] [trantor,drogon] update to 1.5.14, 1.8.7 (#34119) --- .../{001_vcpkg.patch => 0001-vcpkg.patch} | 23 +++---------------- ..._config.patch => 0002-drogon-config.patch} | 0 ...deps_redis.patch => 0003-deps-redis.patch} | 4 ++-- ...drogon_ctl.patch => 0004-drogon-ctl.patch} | 0 ports/drogon/003_fix_gcc13.patch | 12 ---------- ports/drogon/portfile.cmake | 13 +++++------ ports/drogon/vcpkg.json | 3 +-- ports/trantor/000-fix-deps.patch | 12 +++++----- ports/trantor/portfile.cmake | 4 ++-- ports/trantor/vcpkg.json | 3 +-- versions/baseline.json | 8 +++---- versions/d-/drogon.json | 5 ++++ versions/t-/trantor.json | 5 ++++ 13 files changed, 35 insertions(+), 57 deletions(-) rename ports/drogon/{001_vcpkg.patch => 0001-vcpkg.patch} (55%) rename ports/drogon/{002_drogon_config.patch => 0002-drogon-config.patch} (100%) rename ports/drogon/{004_deps_redis.patch => 0003-deps-redis.patch} (93%) rename ports/drogon/{005_drogon_ctl.patch => 0004-drogon-ctl.patch} (100%) delete mode 100644 ports/drogon/003_fix_gcc13.patch diff --git a/ports/drogon/001_vcpkg.patch b/ports/drogon/0001-vcpkg.patch similarity index 55% rename from ports/drogon/001_vcpkg.patch rename to ports/drogon/0001-vcpkg.patch index dcb226cc7f..a4f4631122 100644 --- a/ports/drogon/001_vcpkg.patch +++ b/ports/drogon/0001-vcpkg.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 4406362..0595ab8 100755 +index fbe2288..d7218a6 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -360,11 +360,10 @@ endif (NOT WIN32) +@@ -367,11 +367,10 @@ endif (NOT WIN32) if (BUILD_POSTGRESQL) # find postgres @@ -18,7 +18,7 @@ index 4406362..0595ab8 100755 set(DROGON_SOURCES ${DROGON_SOURCES} orm_lib/src/postgresql_impl/PostgreSQLResultImpl.cc -@@ -394,7 +393,7 @@ if (BUILD_POSTGRESQL) +@@ -401,7 +400,7 @@ if (BUILD_POSTGRESQL) ${private_headers} orm_lib/src/postgresql_impl/PgConnection.h) endif (libpq_supports_batch) @@ -27,20 +27,3 @@ index 4406362..0595ab8 100755 endif (BUILD_POSTGRESQL) if (BUILD_MYSQL) - -index 9f2f1e7..76bd2ec 100755 ---- a/drogon_ctl/CMakeLists.txt -+++ b/drogon_ctl/CMakeLists.txt -@@ -19,7 +19,11 @@ add_executable(_drogon_ctl - target_link_libraries(_drogon_ctl ${PROJECT_NAME}) - if (WIN32 AND BUILD_SHARED_LIBS) - set(DROGON_FILE $) -- set(TRANTOR_FILE $) -+ if (USE_SUBMODULE) -+ set(TRANTOR_FILE $) -+ else() -+ set(TRANTOR_FILE $) -+ endif() - add_custom_command(TARGET _drogon_ctl POST_BUILD - COMMAND ${CMAKE_COMMAND} - -DCTL_FILE=${DROGON_FILE} diff --git a/ports/drogon/002_drogon_config.patch b/ports/drogon/0002-drogon-config.patch similarity index 100% rename from ports/drogon/002_drogon_config.patch rename to ports/drogon/0002-drogon-config.patch diff --git a/ports/drogon/004_deps_redis.patch b/ports/drogon/0003-deps-redis.patch similarity index 93% rename from ports/drogon/004_deps_redis.patch rename to ports/drogon/0003-deps-redis.patch index ffd715b0f9..be59e49d18 100644 --- a/ports/drogon/004_deps_redis.patch +++ b/ports/drogon/0003-deps-redis.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 0595ab8..373e11e 100755 +index d7218a6..ccd08cb 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -460,10 +460,10 @@ if (BUILD_SQLITE) +@@ -467,10 +467,10 @@ if (BUILD_SQLITE) endif (BUILD_SQLITE) if (BUILD_REDIS) diff --git a/ports/drogon/005_drogon_ctl.patch b/ports/drogon/0004-drogon-ctl.patch similarity index 100% rename from ports/drogon/005_drogon_ctl.patch rename to ports/drogon/0004-drogon-ctl.patch diff --git a/ports/drogon/003_fix_gcc13.patch b/ports/drogon/003_fix_gcc13.patch deleted file mode 100644 index deb15f5b79..0000000000 --- a/ports/drogon/003_fix_gcc13.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/lib/inc/drogon/RateLimiter.h b/lib/inc/drogon/RateLimiter.h -index 6940321..2c5f039 100644 ---- a/lib/inc/drogon/RateLimiter.h -+++ b/lib/inc/drogon/RateLimiter.h -@@ -3,6 +3,7 @@ - #include - #include - #include -+#include - - namespace drogon - { diff --git a/ports/drogon/portfile.cmake b/ports/drogon/portfile.cmake index 2114db6c0e..3aa87b8cf7 100644 --- a/ports/drogon/portfile.cmake +++ b/ports/drogon/portfile.cmake @@ -1,15 +1,14 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO an-tao/drogon - REF v1.8.4 - SHA512 381b4b576d316e55690dc0531cfeaeee4c0e00ce540a502e1c1870eea9a463d00d7e4bc9a354c459e5fbc6da5f046757f07ff2077bb3a9603f97f448f2d17ea2 + REF "v${VERSION}" + SHA512 a49b032689869e97505612570285d21c0a68604c70e379f95c70fd5d8014f6890809283956b1b83fda4551c01c526ab2b575351c23a3e58fb4f920c9e1b7e92b HEAD_REF master PATCHES - 001_vcpkg.patch - 002_drogon_config.patch - 003_fix_gcc13.patch #https://github.com/drogonframework/drogon/pull/1563 - 004_deps_redis.patch - 005_drogon_ctl.patch + 0001-vcpkg.patch + 0002-drogon-config.patch + 0003-deps-redis.patch + 0004-drogon-ctl.patch ) vcpkg_check_features( diff --git a/ports/drogon/vcpkg.json b/ports/drogon/vcpkg.json index 64baa52589..f6ef00d672 100644 --- a/ports/drogon/vcpkg.json +++ b/ports/drogon/vcpkg.json @@ -1,7 +1,6 @@ { "name": "drogon", - "version": "1.8.4", - "port-version": 4, + "version": "1.8.7", "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 fb8a971250..49cff8b3d7 100644 --- a/ports/trantor/000-fix-deps.patch +++ b/ports/trantor/000-fix-deps.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 83bd458..ad56a27 100755 +index efa0434..b87a1a3 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -135,7 +135,7 @@ endif() +@@ -190,7 +190,7 @@ target_compile_definitions(${PROJECT_NAME} PRIVATE TRANTOR_TLS_PROVIDER=${TRANTO set(HAVE_C-ARES NO) if (BUILD_C-ARES) @@ -11,7 +11,7 @@ index 83bd458..ad56a27 100755 if(c-ares_FOUND) message(STATUS "c-ares found!") set(HAVE_C-ARES TRUE) -@@ -143,7 +143,7 @@ if (BUILD_C-ARES) +@@ -198,7 +198,7 @@ if (BUILD_C-ARES) endif () if(HAVE_C-ARES) @@ -21,11 +21,11 @@ index 83bd458..ad56a27 100755 ${TRANTOR_SOURCES} trantor/net/inner/AresResolver.cc) diff --git a/cmake/templates/TrantorConfig.cmake.in b/cmake/templates/TrantorConfig.cmake.in -index e18652d..6dad38e 100644 +index 8c62924..dd243d0 100644 --- a/cmake/templates/TrantorConfig.cmake.in +++ b/cmake/templates/TrantorConfig.cmake.in -@@ -14,7 +14,7 @@ if(@OpenSSL_FOUND@) - find_dependency(OpenSSL) +@@ -17,7 +17,7 @@ if(@Botan_FOUND@) + find_dependency(Botan) endif() if(@c-ares_FOUND@) - find_dependency(c-ares) diff --git a/ports/trantor/portfile.cmake b/ports/trantor/portfile.cmake index 4bbe3bcb32..04f5ea3464 100644 --- a/ports/trantor/portfile.cmake +++ b/ports/trantor/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO an-tao/trantor - REF v1.5.11 - SHA512 dd65938bebb2e6714e5603db3bfc82cd1a63395c17dce014147a41fdc74548cb526e1457a7472aa51bb80ce629a9935b4db9eeadf735efaf30899ef73f776a58 + REF "v${VERSION}" + SHA512 468e5ffe9b47537992b9852ddec7714fb6e63147ff51ecfade7e1b0af02f5231ebc50b71d48d77c188f8d2af77c64c40fcbdc907f4f8d45d488aa2966f9406f9 HEAD_REF master PATCHES 000-fix-deps.patch diff --git a/ports/trantor/vcpkg.json b/ports/trantor/vcpkg.json index 69f33e77cd..6aff8ecd4f 100644 --- a/ports/trantor/vcpkg.json +++ b/ports/trantor/vcpkg.json @@ -1,7 +1,6 @@ { "name": "trantor", - "version-semver": "1.5.11", - "port-version": 1, + "version-semver": "1.5.14", "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 5415462d2b..c524790998 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2217,8 +2217,8 @@ "port-version": 0 }, "drogon": { - "baseline": "1.8.4", - "port-version": 4 + "baseline": "1.8.7", + "port-version": 0 }, "dstorage": { "baseline": "1.2.0", @@ -8361,8 +8361,8 @@ "port-version": 0 }, "trantor": { - "baseline": "1.5.11", - "port-version": 1 + "baseline": "1.5.14", + "port-version": 0 }, "tre": { "baseline": "0.8.0", diff --git a/versions/d-/drogon.json b/versions/d-/drogon.json index 758fc8a8ae..65b8a2fa4f 100644 --- a/versions/d-/drogon.json +++ b/versions/d-/drogon.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "01b8dcf586886018269bc888cc651751d074d4c6", + "version": "1.8.7", + "port-version": 0 + }, { "git-tree": "7f8d8eadd014bf7d28bfff57e3e11e211fa8c4ae", "version": "1.8.4", diff --git a/versions/t-/trantor.json b/versions/t-/trantor.json index 7f57fd2a7b..975874d1e3 100644 --- a/versions/t-/trantor.json +++ b/versions/t-/trantor.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d8c48e0f8f1877f0392dcb0f1d1d31011c9db957", + "version-semver": "1.5.14", + "port-version": 0 + }, { "git-tree": "4ac910f7ba58f9ee8ceff1c8ac1d2dfa0200136f", "version-semver": "1.5.11",