1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-06-19 03:30:32 -04:00
ports/devel/qt6-base/files/patch-cmake_FindMySQL.cmake
Jason E. Hale 359c8eed18 Qt6: Update to 6.7.1
As a patch release, Qt 6.7.1 does not introduce any new features but
contains more than 400 bug fixes, security updates, and other
improvements to the top of the Qt 6.7.0 release. See more information
about the most important changes and bug fixes from Qt 6.7.1 release
note.

Enable building of databases/qt6-base_sqldriver@mysql with MariaDB. [1]

Fix build of www/qt6-webengine with the SNDIO option enabled. [2]

Announcement: https://www.qt.io/blog/qt-6.7.1-released
Release note: https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.7.1/release-note.md

PR:		277922 [1], 279180 [2]
Reported by:	vvd [1], Benjamin Takacs <nimaje+fbz@bureaucracy.de> [2]
MFH:		2024Q2
Security:	f5fa174d-19de-11ef-83d8-4ccc6adda413
2024-05-24 21:55:22 -04:00

13 lines
550 B
CMake

Use pkgconf to set hints for MariaDB, as well.
--- cmake/FindMySQL.cmake.orig 2024-05-08 09:42:08 UTC
+++ cmake/FindMySQL.cmake
@@ -43,7 +43,7 @@ if(PkgConfig_FOUND AND NOT DEFINED MySQL_ROOT)
find_package(PkgConfig QUIET)
endif()
if(PkgConfig_FOUND AND NOT DEFINED MySQL_ROOT)
- pkg_check_modules(PC_MySQL QUIET "mysqlclient")
+ pkg_search_module(PC_MySQL QUIET "libmariadb" "mysqlclient")
set(MySQL_include_dir_hints ${PC_MySQL_INCLUDEDIR})
set(MySQL_library_hints ${PC_MySQL_LIBDIR})
set(MySQL_library_hints_debug "")