diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2018-03-23 09:35:53 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2018-03-26 08:54:40 +0000 |
| commit | a8ba9c41fb28d896047d734f8180e75fa90b8808 (patch) | |
| tree | 213f6f8730482a51dc29892c7d7a8d6999de892a /main/qt/qt-everywhere-opensource-src-4.8.7-mariadb.patch | |
| parent | 6047506c809283c5f840f4b0c462d1d77a84052e (diff) | |
| download | aports-a8ba9c41fb28d896047d734f8180e75fa90b8808.tar.bz2 aports-a8ba9c41fb28d896047d734f8180e75fa90b8808.tar.xz | |
main/qt: rebuild against mariadb-connector-c
Diffstat (limited to 'main/qt/qt-everywhere-opensource-src-4.8.7-mariadb.patch')
| -rw-r--r-- | main/qt/qt-everywhere-opensource-src-4.8.7-mariadb.patch | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/main/qt/qt-everywhere-opensource-src-4.8.7-mariadb.patch b/main/qt/qt-everywhere-opensource-src-4.8.7-mariadb.patch new file mode 100644 index 0000000000..7e480138b8 --- /dev/null +++ b/main/qt/qt-everywhere-opensource-src-4.8.7-mariadb.patch @@ -0,0 +1,28 @@ +diff -up qt-everywhere-opensource-src-4.8.7/src/sql/drivers/mysql/qsql_mysql.cpp.mariadb qt-everywhere-opensource-src-4.8.7/src/sql/drivers/mysql/qsql_mysql.cpp +--- qt-everywhere-opensource-src-4.8.7/src/sql/drivers/mysql/qsql_mysql.cpp.mariadb 2015-05-07 09:14:48.000000000 -0500 ++++ qt-everywhere-opensource-src-4.8.7/src/sql/drivers/mysql/qsql_mysql.cpp 2017-10-23 14:13:15.871808984 -0500 +@@ -1105,11 +1105,16 @@ static void qLibraryInit() + } + # endif // MYSQL_VERSION_ID + #endif // Q_NO_MYSQL_EMBEDDED ++ ++#if defined(MARIADB_BASE_VERSION) || defined(MARIADB_VERSION_ID) ++ qAddPostRoutine(mysql_server_end); ++#endif + } + + static void qLibraryEnd() + { + #ifndef Q_NO_MYSQL_EMBEDDED ++#if !defined(MARIADB_BASE_VERSION) && !defined(MARIADB_VERSION_ID) + # if MYSQL_VERSION_ID > 40000 + # if (MYSQL_VERSION_ID >= 40110 && MYSQL_VERSION_ID < 50000) || MYSQL_VERSION_ID >= 50003 + mysql_library_end(); +@@ -1118,6 +1123,7 @@ static void qLibraryEnd() + # endif + # endif + #endif ++#endif + } + + QMYSQLDriver::QMYSQLDriver(QObject * parent) |