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

fixed build issue with new mariad

Browse Source
This commit is contained in:
Than Ngo 2017-07-14 13:50:46 +02:00
parent 241e6ae46d
commit 921d3a65ee
2 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
qt5-qtbase.spec
View File

@ -49,7 +49,7 @@ BuildRequires: pkgconfig(libsystemd)
Name: qt5-qtbase Name: qt5-qtbase
Summary: Qt5 - QtBase components Summary: Qt5 - QtBase components
Version: 5.9.0 Version: 5.9.0
Release: 4%{?dist} Release: 5%{?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
@ -101,6 +101,9 @@ Patch63: qt5-qtbase-5.7.1-openssl11.patch
# support firebird version 3.x # support firebird version 3.x
Patch64: qt5-qtbase-5.8.0-firebird.patch Patch64: qt5-qtbase-5.8.0-firebird.patch
# fix for new mariadb
Patch65: qtbase-opensource-src-5.9.0-mysql.patch
## upstream patches (under review) ## upstream patches (under review)
# https://codereview.qt-project.org/#/c/180232/ # https://codereview.qt-project.org/#/c/180232/
Patch401: 0001-Merge-the-QDBusMetaType-s-custom-information-to-QDBu.patch Patch401: 0001-Merge-the-QDBusMetaType-s-custom-information-to-QDBu.patch
@ -345,6 +348,7 @@ Qt5 libraries used for drawing widgets and OpenGL items.
%patch63 -p1 -b .openssl11 %patch63 -p1 -b .openssl11
%endif %endif
%patch64 -p1 -b .firebird %patch64 -p1 -b .firebird
%patch65 -p1 -b .mysql
%if 0%{?inject_optflags} %if 0%{?inject_optflags}
## adjust $RPM_OPT_FLAGS ## adjust $RPM_OPT_FLAGS
@ -948,6 +952,9 @@ fi
%changelog %changelog
* Fri Jul 14 2017 Than Ngo <than@redhat.com> - 5.9.0-5
- fixed build issue with new mariadb
* Thu Jul 06 2017 Than Ngo <than@redhat.com> - 5.9.0-4 * Thu Jul 06 2017 Than Ngo <than@redhat.com> - 5.9.0-4
- fixed bz#1409600, stack overflow in QXmlSimpleReader, CVE-2016-10040 - fixed bz#1409600, stack overflow in QXmlSimpleReader, CVE-2016-10040

12
qtbase-opensource-src-5.9.0-mysql.patch Normal file
View File

@ -0,0 +1,12 @@
diff -up qtbase-opensource-src-5.9.0/src/plugins/sqldrivers/mysql/qsql_mysql.cpp.than qtbase-opensource-src-5.9.0/src/plugins/sqldrivers/mysql/qsql_mysql.cpp
diff -up qtbase-opensource-src-5.9.0/src/plugins/sqldrivers/mysql/qsql_mysql_p.h.than qtbase-opensource-src-5.9.0/src/plugins/sqldrivers/mysql/qsql_mysql_p.h
--- qtbase-opensource-src-5.9.0/src/plugins/sqldrivers/mysql/qsql_mysql_p.h.than 2017-07-14 13:43:50.831203768 +0200
+++ qtbase-opensource-src-5.9.0/src/plugins/sqldrivers/mysql/qsql_mysql_p.h 2017-07-14 13:44:24.364948006 +0200
@@ -58,6 +58,7 @@
#endif
#include <mysql.h>
+#include <mysql_version.h>
#ifdef QT_PLUGIN
#define Q_EXPORT_SQLDRIVER_MYSQL