rpms/qt5-qtbase
6
0
Fork 0
Code Issues Pull Requests Releases Activity

refresh mariadb patch to actually match cr#206850 logic (#1491316)

Browse Source
This commit is contained in:
Rex Dieter 2017-09-27 10:48:08 -05:00
parent 343ee6e998
commit 9fc4b6e74c
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
0502-Only-call-mysql_library_end-once-when-using-MariaDB.patch
View File

@ -6,7 +6,7 @@ diff -up qtbase-opensource-src-5.9.1/src/plugins/sqldrivers/mysql/qsql_mysql.cpp
# endif // MYSQL_VERSION_ID # endif // MYSQL_VERSION_ID
#endif // Q_NO_MYSQL_EMBEDDED #endif // Q_NO_MYSQL_EMBEDDED
+ +
+#ifdef MARIADB_BASE_VERSION || defined(MARIADB_VERSION_ID) +#if defined(MARIADB_BASE_VERSION) || defined(MARIADB_VERSION_ID)
+ qAddPostRoutine(mysql_server_end); + qAddPostRoutine(mysql_server_end);
+#endif +#endif
} }
@ -19,7 +19,7 @@ diff -up qtbase-opensource-src-5.9.1/src/plugins/sqldrivers/mysql/qsql_mysql.cpp
- mysql_library_end(); - mysql_library_end();
-# else -# else
- mysql_server_end(); - mysql_server_end();
+#if !defined(MARIADB_BASE_VERSION) || !defined(MARIADB_VERSION_ID) +#if !defined(MARIADB_BASE_VERSION) && !defined(MARIADB_VERSION_ID)
+# if !defined(Q_NO_MYSQL_EMBEDDED) +# if !defined(Q_NO_MYSQL_EMBEDDED)
+# if MYSQL_VERSION_ID > 40000 +# if MYSQL_VERSION_ID > 40000
+# if (MYSQL_VERSION_ID >= 40110 && MYSQL_VERSION_ID < 50000) || MYSQL_VERSION_ID >= 50003 +# if (MYSQL_VERSION_ID >= 40110 && MYSQL_VERSION_ID < 50000) || MYSQL_VERSION_ID >= 50003

5
qt5-qtbase.spec
View File

@ -55,7 +55,7 @@ BuildRequires: pkgconfig(libsystemd)
Name: qt5-qtbase Name: qt5-qtbase
Summary: Qt5 - QtBase components Summary: Qt5 - QtBase components
Version: 5.9.1 Version: 5.9.1
Release: 8%{?dist} Release: 9%{?dist}
# See LGPL_EXCEPTIONS.txt, for exception details # See LGPL_EXCEPTIONS.txt, for exception details
License: LGPLv2 with exceptions or GPLv3 with exceptions License: LGPLv2 with exceptions or GPLv3 with exceptions
@ -969,6 +969,9 @@ fi
%changelog %changelog
* Wed Sep 27 2017 Rex Dieter <rdieter@fedoraproject.org> - 5.9.1-9
- refresh mariadb patch to actually match cr#206850 logic (#1491316)
* Wed Sep 27 2017 Rex Dieter <rdieter@fedoraproject.org> - 5.9.1-8 * Wed Sep 27 2017 Rex Dieter <rdieter@fedoraproject.org> - 5.9.1-8
- refresh mariadb patch wrt cr#206850 (#1491316) - refresh mariadb patch wrt cr#206850 (#1491316)