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

refresh mariadb patch wrt cr#206850 (#1491316)

Browse Source
This commit is contained in:
Rex Dieter 2017-09-27 09:43:36 -05:00
parent bf5d04680b
commit 343ee6e998
4 changed files with 37 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -1,3 +1,2 @@
/qtbase-opensource-src-5.9.1.tar.xz
/0086-Fix-detection-of-AT-SPI.patch
/0502-Only-call-mysql_library_end-once-when-using-MariaDB.patch

32
0502-Only-call-mysql_library_end-once-when-using-MariaDB.patch Normal file
View File

@ -0,0 +1,32 @@
diff -up qtbase-opensource-src-5.9.1/src/plugins/sqldrivers/mysql/qsql_mysql.cpp.0502 qtbase-opensource-src-5.9.1/src/plugins/sqldrivers/mysql/qsql_mysql.cpp
--- qtbase-opensource-src-5.9.1/src/plugins/sqldrivers/mysql/qsql_mysql.cpp.0502 2017-06-28 04:54:29.000000000 -0500
+++ qtbase-opensource-src-5.9.1/src/plugins/sqldrivers/mysql/qsql_mysql.cpp 2017-09-27 09:40:49.397425236 -0500
@@ -1158,16 +1158,22 @@ static void qLibraryInit()
}
# endif // MYSQL_VERSION_ID
#endif // Q_NO_MYSQL_EMBEDDED
+
+#ifdef MARIADB_BASE_VERSION || defined(MARIADB_VERSION_ID)
+ qAddPostRoutine(mysql_server_end);
+#endif
}
static void qLibraryEnd()
{
-#ifndef Q_NO_MYSQL_EMBEDDED
-# if MYSQL_VERSION_ID > 40000
-# if (MYSQL_VERSION_ID >= 40110 && MYSQL_VERSION_ID < 50000) || MYSQL_VERSION_ID >= 50003
- mysql_library_end();
-# else
- mysql_server_end();
+#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
+ mysql_library_end();
+# else
+ mysql_server_end();
+# endif
# endif
# endif
#endif

6
qt5-qtbase.spec
View File

@ -55,7 +55,7 @@ BuildRequires: pkgconfig(libsystemd)
Name: qt5-qtbase
Summary: Qt5 - QtBase components
Version: 5.9.1
Release: 7%{?dist}
Release: 8%{?dist}
# See LGPL_EXCEPTIONS.txt, for exception details
License: LGPLv2 with exceptions or GPLv3 with exceptions
@ -111,6 +111,7 @@ Patch65: qtbase-opensource-src-5.9.0-mysql.patch
## upstream patches (5.9 branch)
Patch486: 0086-Fix-detection-of-AT-SPI.patch
# refreshed/updated with https://codereview.qt-project.org/#/c/206850/
Patch902: 0502-Only-call-mysql_library_end-once-when-using-MariaDB.patch
# Do not check any files in %%{_qt5_plugindir}/platformthemes/ for requires.
@ -968,6 +969,9 @@ fi
%changelog
* Wed Sep 27 2017 Rex Dieter <rdieter@fedoraproject.org> - 5.9.1-8
- refresh mariadb patch wrt cr#206850 (#1491316)
* Tue Sep 26 2017 Rex Dieter <rdieter@fedoraproject.org> - 5.9.1-7
- actually apply mariadb-related patch (#1491316)

1
sources
View File

@ -1,3 +1,2 @@
SHA512 (qtbase-opensource-src-5.9.1.tar.xz) = b384e91b3fd88b2f32e826e3dd1c930213683a0fdbfd284a319204fa8d27c796b54324cf4a715f6bebd92fca6426e37cf0be5866fc1f6053b8758570ddb2fa45
SHA512 (0086-Fix-detection-of-AT-SPI.patch) = f78f481369e4b68400ae122a7cf4d20030ee8ea89ea211f98f5ffa895d449acd9a7207d3b010e927a7a33d644eab90e1d5bb951d71e1a5b1a11f4ac1a0241bce
SHA512 (0502-Only-call-mysql_library_end-once-when-using-MariaDB.patch) = 10d94b35e2f750230772bd9b6f8c8e4d6c9ca4308537aabf3cbca9cebb1941acc9a915896b65f16815cac739c53f0f061812cbd97993a25f71a98bb06bd0c571