From 1c2811ebe796a9b419e4d1526e811ea5f7a1d508 Mon Sep 17 00:00:00 2001 From: FAS Marie Loise Nolden Date: Jun 16 2023 13:16:53 +0000 Subject: Update mingw-qt5-qtbase.spec --- diff --git a/mingw-qt5-qtbase.spec b/mingw-qt5-qtbase.spec index 1a5277e..4f94c49 100644 --- a/mingw-qt5-qtbase.spec +++ b/mingw-qt5-qtbase.spec @@ -6,7 +6,7 @@ # Override the __debug_install_post argument as this package # contains both native as well as cross compiled binaries -%global __debug_install_post %%{mingw_debug_install_post}; %{_bindir}/find-debuginfo.sh %{?_missing_build_ids_terminate_build:--strict-build-id} %{?_find_debuginfo_opts} "%{_builddir}/%%{?buildsubdir}" %{nil} +%global __debug_install_post %%{mingw_debug_install_post}; %{_rpmconfigdir}/find-debuginfo.sh %{?_missing_build_ids_terminate_build:--strict-build-id} %{?_find_debuginfo_opts} "%{_builddir}/%%{?buildsubdir}" %{nil} %global qt_module qtbase #global pre rc @@ -148,6 +148,8 @@ BuildRequires: mingw32-winpthreads BuildRequires: mingw32-winpthreads-static BuildRequires: mingw32-zlib BuildRequires: mingw32-zlib-static +BuildRequires: mingw32-mariadb-connector-c +BuildRequires: mingw32-mariadb-connector-c-static BuildRequires: mingw64-filesystem >= 95 BuildRequires: mingw64-binutils @@ -184,7 +186,8 @@ BuildRequires: mingw64-winpthreads BuildRequires: mingw64-winpthreads-static BuildRequires: mingw64-zlib BuildRequires: mingw64-zlib-static - +BuildRequires: mingw64-mariadb-connector-c +BuildRequires: mingw64-mariadb-connector-c-static %description This package contains the Qt software toolkit for developing @@ -329,6 +332,7 @@ qt_configure_args_generic="\ -nomake examples \ -pkg-config \ -sql-sqlite \ + -plugin-sql-mysql \ -openssl-linked \ -iconv \ -opengl dynamic\ @@ -360,6 +364,8 @@ qt_configure_args_win32="\ -headerdir %{mingw32_includedir}/qt5 \ -libdir %{mingw32_libdir} \ -plugindir %{mingw32_libdir}/qt5/plugins \ + -I %{mingw32_includedir}/mysql \ + -L %{mingw32_libdir} \ -sysconfdir %{mingw32_sysconfdir} \ -translationdir %{mingw32_datadir}/qt5/translations \ -device-option CROSS_COMPILE=%{mingw32_target}-" @@ -379,6 +385,8 @@ qt_configure_args_win64="\ -libdir %{mingw64_libdir} \ -plugindir %{mingw64_libdir}/qt5/plugins \ -sysconfdir %{mingw64_sysconfdir} \ + -I %{mingw64_includedir}/mysql \ + -L %{mingw64_libdir} \ -translationdir %{mingw64_datadir}/qt5/translations \ -device-option CROSS_COMPILE=%{mingw64_target}-" @@ -523,6 +531,7 @@ ln -s %{mingw64_target}-qmake-qt5 %{buildroot}%{_bindir}/mingw64-qmake-qt5 %{mingw32_libdir}/qt5/plugins/printsupport/windowsprintersupport.dll %dir %{mingw32_libdir}/qt5/plugins/sqldrivers %{mingw32_libdir}/qt5/plugins/sqldrivers/qsqlite.dll +%{mingw32_libdir}/qt5/plugins/sqldrivers/qsqlmysql.dll %{mingw32_libdir}/qt5/plugins/sqldrivers/qsqlodbc.dll %{mingw32_libdir}/qt5/plugins/sqldrivers/qsqlpsql.dll %dir %{mingw32_libdir}/qt5/plugins/styles @@ -629,6 +638,8 @@ ln -s %{mingw64_target}-qmake-qt5 %{buildroot}%{_bindir}/mingw64-qmake-qt5 %dir %{mingw32_libdir}/qt5/plugins/sqldrivers %{mingw32_libdir}/qt5/plugins/sqldrivers/libqsqlite.a %{mingw32_libdir}/qt5/plugins/sqldrivers/qsqlite.prl +%{mingw32_libdir}/qt5/plugins/sqldrivers/libqsqlmysql.a +%{mingw32_libdir}/qt5/plugins/sqldrivers/qsqlmysql.prl %{mingw32_libdir}/qt5/plugins/sqldrivers/libqsqlodbc.a %{mingw32_libdir}/qt5/plugins/sqldrivers/qsqlodbc.prl %{mingw32_libdir}/qt5/plugins/sqldrivers/libqsqlpsql.a @@ -697,6 +708,7 @@ ln -s %{mingw64_target}-qmake-qt5 %{buildroot}%{_bindir}/mingw64-qmake-qt5 %{mingw64_libdir}/qt5/plugins/printsupport/windowsprintersupport.dll %dir %{mingw64_libdir}/qt5/plugins/sqldrivers %{mingw64_libdir}/qt5/plugins/sqldrivers/qsqlite.dll +%{mingw64_libdir}/qt5/plugins/sqldrivers/qsqlmysql.dll %{mingw64_libdir}/qt5/plugins/sqldrivers/qsqlodbc.dll %{mingw64_libdir}/qt5/plugins/sqldrivers/qsqlpsql.dll %dir %{mingw64_libdir}/qt5/plugins/styles @@ -803,6 +815,8 @@ ln -s %{mingw64_target}-qmake-qt5 %{buildroot}%{_bindir}/mingw64-qmake-qt5 %dir %{mingw64_libdir}/qt5/plugins/sqldrivers %{mingw64_libdir}/qt5/plugins/sqldrivers/libqsqlite.a %{mingw64_libdir}/qt5/plugins/sqldrivers/qsqlite.prl +%{mingw64_libdir}/qt5/plugins/sqldrivers/libqsqlmysql.a +%{mingw64_libdir}/qt5/plugins/sqldrivers/qsqlmysql.prl %{mingw64_libdir}/qt5/plugins/sqldrivers/libqsqlodbc.a %{mingw64_libdir}/qt5/plugins/sqldrivers/qsqlodbc.prl %{mingw64_libdir}/qt5/plugins/sqldrivers/libqsqlpsql.a