[gentoo-commits] proj/kde-sunset:master commit in: dev-qt/qtsql/files/, dev-qt/qtsql/

[Andreas Sturmlechner]

commit:     6e07e820f1ac2d671fa19ef69167129e1d62f8b3
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 27 15:36:31 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Apr 27 15:48:50 2021 +0000
URL:        https://gitweb.gentoo.org/proj/kde-sunset.git/commit/?id=6e07e820

dev-qt/qtsql: Fix build with >=dev-db/mysql-connector-c-8

Thanks-to: Timofey Sartakov
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 dev-qt/qtsql/files/qtsql-4.8.7-mysql-8.patch | 47 ++++++++++++++++++++++++++++
 dev-qt/qtsql/qtsql-4.8.7-r1.ebuild           |  6 ++--
 2 files changed, 50 insertions(+), 3 deletions(-)

diff --git a/dev-qt/qtsql/files/qtsql-4.8.7-mysql-8.patch 
b/dev-qt/qtsql/files/qtsql-4.8.7-mysql-8.patch
new file mode 100644
index 00000000..06906f62
--- /dev/null
+++ b/dev-qt/qtsql/files/qtsql-4.8.7-mysql-8.patch
@@ -0,0 +1,47 @@
+--- a/src/sql/drivers/mysql/qsql_mysql.cpp     2021-03-06 21:08:28.617727309 
+0500
++++ b/src/sql/drivers/mysql/qsql_mysql.cpp     2021-03-06 21:09:01.930877838 
+0500
+@@ -194,7 +194,7 @@
+               myField(0), type(QVariant::Invalid)
+         {}
+         char *outField;
+-        my_bool nullIndicator;
++        bool nullIndicator;
+         ulong bufLength;
+         MYSQL_FIELD *myField;
+         QVariant::Type type;
+@@ -930,7 +930,7 @@
+     MYSQL_BIND* currBind;
+     QVector<MYSQL_TIME *> timeVector;
+     QVector<QByteArray> stringVector;
+-    QVector<my_bool> nullVector;
++    QVector<bool> nullVector;
+ 
+     const QVector<QVariant> values = boundValues();
+ 
+@@ -951,7 +951,7 @@
+ 
+             currBind = &d->outBinds[i];
+ 
+-            nullVector[i] = static_cast<my_bool>(val.isNull());
++            nullVector[i] = static_cast<bool>(val.isNull());
+             currBind->is_null = &nullVector[i];
+             currBind->length = 0;
+             currBind->is_unsigned = 0;
+@@ -1048,7 +1048,7 @@
+     d->rowsAffected = mysql_stmt_affected_rows(d->stmt);
+ 
+     if (isSelect()) {
+-        my_bool update_max_length = true;
++        bool update_max_length = true;
+ 
+         r = mysql_stmt_bind_result(d->stmt, d->inBinds);
+         if (r != 0) {
+@@ -1245,7 +1245,7 @@
+     const QStringList opts(connOpts.split(QLatin1Char(';'), 
QString::SkipEmptyParts));
+     QString unixSocket;
+ #if MYSQL_VERSION_ID >= 50000
+-    my_bool reconnect=false;
++    bool reconnect=false;
+ #endif
+ 
+     // extract the real options from the string

diff --git a/dev-qt/qtsql/qtsql-4.8.7-r1.ebuild 
b/dev-qt/qtsql/qtsql-4.8.7-r1.ebuild
index 2d1d3873..9f5a3520 100644
--- a/dev-qt/qtsql/qtsql-4.8.7-r1.ebuild
+++ b/dev-qt/qtsql/qtsql-4.8.7-r1.ebuild
@@ -13,9 +13,7 @@ fi
 
 IUSE="freetds mysql odbc postgres qt3support +sqlite"
 
-REQUIRED_USE="
-       || ( freetds mysql odbc postgres sqlite )
-"
+REQUIRED_USE="|| ( freetds mysql odbc postgres sqlite )"
 
 DEPEND="
        ~dev-qt/qtcore-${PV}[debug=,qt3support=,${MULTILIB_USEDEP}]
@@ -34,6 +32,8 @@ QT4_TARGET_DIRECTORIES="
        src/sql
        src/plugins/sqldrivers"
 
+PATCHES=( "${FILESDIR}/${P}-mysql-8.patch" )
+
 multilib_src_configure() {
        local myconf=(
                $(qt_native_use freetds  sql-tds    plugin)