From c5939f2cbc88d39c6a82fb47e0d818d16e6f56bb Mon Sep 17 00:00:00 2001 From: an-tao Date: Wed, 6 May 2026 14:51:36 +0800 Subject: [PATCH] Fix UUID not found compilation error on openEuler 22.03 (#2512) --- CMakeLists.txt | 2 +- ChangeLog.md | 72 ++++++++++++++++++++++++++++++++++-- cmake_modules/FindUUID.cmake | 16 ++++++++ 3 files changed, 86 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8111b49d44..39429ff790 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -25,7 +25,7 @@ CMAKE_DEPENDENT_OPTION(USE_SPDLOG "Allow using the spdlog logging library" OFF " set(DROGON_MAJOR_VERSION 1) set(DROGON_MINOR_VERSION 9) -set(DROGON_PATCH_VERSION 12) +set(DROGON_PATCH_VERSION 13) set(DROGON_VERSION ${DROGON_MAJOR_VERSION}.${DROGON_MINOR_VERSION}.${DROGON_PATCH_VERSION}) set(DROGON_VERSION_STRING "${DROGON_VERSION}") diff --git a/ChangeLog.md b/ChangeLog.md index 7691176895..1b975fe2fd 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -4,13 +4,77 @@ All notable changes to this project will be documented in this file. ## [Unreleased] +## [1.9.13] - 2026-05-06 + +### API changes list + +- Add `HttpRequest::clearHeaders()` method. + +- Add `setQueryParameter()` and `setBodyParameter()` methods. + +- Add ability to use `BEGIN IMMEDIATE` and `BEGIN EXCLUSIVE`. + +- Add `UploadFile` constructor to create from memory data. + +- Add JOIN support to Mapper/BaseBuilder with FK auto-detection in code generator. + +- Add WebDAV HTTP methods (PROPFIND, MKCOL, COPY, MOVE). + +- Add per-request compression control to `HttpResponse`. + ### Added -- dg_ctl create models new command line option --clear-output +- Support for custom OPTIONS handling via middleware flagging. + +- Alias library for Drogon with name matching installed target. + +- `--clear-output` option to drogon_ctl create models. ### Changed -- make utils::isBase64 support padding +- vector: reserve before inserting for efficiency. + +- make `utils::isBase64` support padding. + +- Extract duplicate `parseLine()` function to shared utility header. + +- Doxygen documentation adjustments. + +- Enhancement for custom OPTIONS handling. + +- Forward the path methods. + +### Fixed + +- Fix sqlite3 test in CI. + +- Fix HttpClient not sending WebDAV requests. + +- Fix connection limit bug. + +- Fix bugs exposed by CI. + +- Fix HTTP date formatting to be locale-independent. + +- Fix parsing invalid numbers in HTTP headers. + +- Fix shared lib view failure handling. + +- Fix drogon_ctl compilation with clang-cl. + +- Fix missing throw statement. + +- Add Homebrew Apple Silicon path detection in CMake finder modules. + +- Include missing header files. + +- Fix wrong numeric limit for floating types. + +- Fix regex WebSocket routes middleware initialization. + +- Fix system() replaced with execvp() in SharedLibManager. + +- Fix inverted test logic. ## [1.9.12] - 2026-01-26 @@ -1886,7 +1950,9 @@ All notable changes to this project will be documented in this file. ## [1.0.0-beta1] - 2019-06-11 -[Unreleased]: https://github.com/an-tao/drogon/compare/v1.9.12...HEAD +[Unreleased]: https://github.com/an-tao/drogon/compare/v1.9.13...HEAD + +[1.9.13]: https://github.com/an-tao/drogon/compare/v1.9.12...v1.9.13 [1.9.12]: https://github.com/an-tao/drogon/compare/v1.9.11...v1.9.12 diff --git a/cmake_modules/FindUUID.cmake b/cmake_modules/FindUUID.cmake index b2eeb7b5ad..5594750cae 100755 --- a/cmake_modules/FindUUID.cmake +++ b/cmake_modules/FindUUID.cmake @@ -89,6 +89,22 @@ else() endif() endif() + # try to use pkg-config + if(NOT UUID_FOUND) + find_package(PkgConfig QUIET) + if(PKG_CONFIG_FOUND) + pkg_check_modules(PC_UUID QUIET uuid) + if(PC_UUID_FOUND) + set(UUID_INCLUDE_DIRS ${PC_UUID_INCLUDE_DIRS}) + set(UUID_LIBRARIES ${PC_UUID_LIBRARIES}) + set(UUID_FOUND TRUE) + if(NOT UUID_FIND_QUIETLY) + message(STATUS "Found UUID via pkg-config: ${UUID_LIBRARIES}") + endif() + endif() + endif() + endif() + if(UUID_FOUND) if(NOT UUID_FIND_QUIETLY) message(STATUS "Found UUID: ${UUID_LIBRARIES}")