Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[drogon] Update to 1.7.5 #23227

Merged
merged 1 commit into from
Feb 23, 2022
Merged

[drogon] Update to 1.7.5 #23227

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 0 additions & 19 deletions ports/drogon/fs.patch
View file
Open in desktop

This file was deleted.

28 changes: 0 additions & 28 deletions ports/drogon/mac-system-uuid.patch
View file
Open in desktop

This file was deleted.

6 changes: 2 additions & 4 deletions ports/drogon/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO an-tao/drogon
REF v1.7.4
SHA512 ee2458e584beb1dc0e437cbdbdea211762aeac60acc7104d1a7bf6aa7629f70d0cc71a45978b27917373599806f6f183ec2494be7ec00c74694888a31e5fd5d1
REF v1.7.5
SHA512 8be77961026d13b55dbfcc2e43972b4fb8f1cd9a6bfb8098d5bdfc8b60ff67c2d3ede4bdb5815614a8233dc184cbf3aa363a9d33eed96b9f748544e20b15f2c7
HEAD_REF master
PATCHES
vcpkg.patch
drogon_config.patch
static-brotli.patch
fs.patch
mac-system-uuid.patch
use-libmariadb.patch
)

Expand Down
26 changes: 13 additions & 13 deletions ports/drogon/use-libmariadb.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 70b2a0d..7f35626 100755
index 146d2b8..f180498 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -363,10 +363,11 @@ endif (BUILD_POSTGRESQL)
@@ -360,12 +360,8 @@ endif (BUILD_POSTGRESQL)

if (BUILD_MYSQL)
# Find mysql, only mariadb client liberary is supported
- find_package(MySQL)
+ find_package(unofficial-libmariadb CONFIG REQUIRED)
+ set(MySQL_FOUND TRUE)
if (MySQL_FOUND)
message(STATUS "Ok! We find the mariadb!")
# Find mysql, only mariadb client library is supported
- find_package(MySQL QUIET)
find_package(unofficial-libmariadb QUIET)
- if (MySQL_FOUND)
- target_link_libraries(${PROJECT_NAME} PRIVATE MySQL_lib)
+ target_link_libraries(${PROJECT_NAME} PRIVATE unofficial::libmariadb)
set(DROGON_SOURCES
${DROGON_SOURCES}
orm_lib/src/mysql_impl/MysqlConnection.cc
- set(DROGON_FOUND_MYSQL TRUE)
- elseif (unofficial-libmariadb_FOUND)
+ if (unofficial-libmariadb_FOUND)
target_link_libraries(${PROJECT_NAME} PRIVATE unofficial::libmariadb)
set(DROGON_FOUND_MYSQL TRUE)
endif ()
diff --git a/cmake/templates/DrogonConfig.cmake.in b/cmake/templates/DrogonConfig.cmake.in
index 72d9622..026f1a5 100644
index 199cfb9..a3fbde0 100644
--- a/cmake/templates/DrogonConfig.cmake.in
+++ b/cmake/templates/DrogonConfig.cmake.in
@@ -25,7 +25,7 @@ if(@SQLite3_FOUND@)
Expand Down
3 changes: 1 addition & 2 deletions ports/drogon/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"name": "drogon",
"version-semver": "1.7.4",
"port-version": 2,
"version-semver": "1.7.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/",
Expand Down
4 changes: 2 additions & 2 deletions versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1913,8 +1913,8 @@
"port-version": 0
},
"drogon": {
"baseline": "1.7.4",
"port-version": 2
"baseline": "1.7.5",
"port-version": 0
},
"dtl": {
"baseline": "1.19",
Expand Down
5 changes: 5 additions & 0 deletions versions/d-/drogon.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "a66c2bb4632ab86589f1cabed26607d510ae2eba",
"version-semver": "1.7.5",
"port-version": 0
},
{
"git-tree": "b7be1868461c479ff45609e892bc5de9adf42258",
"version-semver": "1.7.4",
Expand Down