diff --git a/0502-Only-call-mysql_library_end-once-when-using-MariaDB.patch b/0502-Only-call-mysql_library_end-once-when-using-MariaDB.patch index 15e6ee6..c755127 100644 --- a/0502-Only-call-mysql_library_end-once-when-using-MariaDB.patch +++ b/0502-Only-call-mysql_library_end-once-when-using-MariaDB.patch @@ -6,7 +6,7 @@ diff -up qtbase-opensource-src-5.9.1/src/plugins/sqldrivers/mysql/qsql_mysql.cpp # endif // MYSQL_VERSION_ID #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); +#endif } @@ -19,7 +19,7 @@ diff -up qtbase-opensource-src-5.9.1/src/plugins/sqldrivers/mysql/qsql_mysql.cpp - mysql_library_end(); -# else - 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 MYSQL_VERSION_ID > 40000 +# if (MYSQL_VERSION_ID >= 40110 && MYSQL_VERSION_ID < 50000) || MYSQL_VERSION_ID >= 50003 diff --git a/qt5-qtbase.spec b/qt5-qtbase.spec index d279b5c..f4ca44e 100644 --- a/qt5-qtbase.spec +++ b/qt5-qtbase.spec @@ -55,7 +55,7 @@ BuildRequires: pkgconfig(libsystemd) Name: qt5-qtbase Summary: Qt5 - QtBase components Version: 5.9.1 -Release: 8%{?dist} +Release: 9%{?dist} # See LGPL_EXCEPTIONS.txt, for exception details License: LGPLv2 with exceptions or GPLv3 with exceptions @@ -969,6 +969,9 @@ fi %changelog +* Wed Sep 27 2017 Rex Dieter - 5.9.1-9 +- refresh mariadb patch to actually match cr#206850 logic (#1491316) + * Wed Sep 27 2017 Rex Dieter - 5.9.1-8 - refresh mariadb patch wrt cr#206850 (#1491316)