[drogon] Update to 1.7.5

microsoft · Feb 22, 2022 · 2763de3 · 2763de3
1 parent 5cf6018
commit 2763de3
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 68 deletions.
diff --git a/ports/drogon/fs.patch b/ports/drogon/fs.patch
diff --git a/ports/drogon/mac-system-uuid.patch b/ports/drogon/mac-system-uuid.patch
diff --git a/ports/drogon/portfile.cmake b/ports/drogon/portfile.cmake
@@ -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
 )
 

diff --git a/ports/drogon/use-libmariadb.patch b/ports/drogon/use-libmariadb.patch
@@ -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@)

diff --git a/ports/drogon/vcpkg.json b/ports/drogon/vcpkg.json
@@ -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/",

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -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",

diff --git a/versions/d-/drogon.json b/versions/d-/drogon.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "a66c2bb4632ab86589f1cabed26607d510ae2eba",
+      "version-semver": "1.7.5",
+      "port-version": 0
+    },
     {
       "git-tree": "b7be1868461c479ff45609e892bc5de9adf42258",
       "version-semver": "1.7.4",