[packages/qt4] add type fixes
atler
atler at pld-linux.org
Sun Jan 25 15:46:45 CET 2026
commit b16737b499cf91309c6d12d8afb65aeab2fd8efc
Author: Jan Palus <atler at pld-linux.org>
Date: Sun Jan 25 15:45:53 2026 +0100
add type fixes
qt4.spec | 4 +++-
types.patch | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 55 insertions(+), 1 deletion(-)
---
diff --git a/qt4.spec b/qt4.spec
index f0325ff..2b26395 100644
--- a/qt4.spec
+++ b/qt4.spec
@@ -138,6 +138,7 @@ Patch52: gcc9-qforeach.patch
Patch53: cxx11.patch
Patch54: gcc11.patch
Patch55: qmap_inf_loop.patch
+Patch56: types.patch
URL: https://www.qt.io/
%{?with_ibase:BuildRequires: Firebird-devel}
%{?with_openvg:BuildRequires: Mesa-libOpenVG-devel}
@@ -1598,6 +1599,7 @@ Programas exemplo para o Qt versão.
%patch -P53 -p1
%patch -P54 -p1
%patch -P55 -p1
+%patch -P56 -p1
%{__sed} -i -e 's,usr/X11R6/,usr/g,' mkspecs/linux-g++-64/qmake.conf \
mkspecs/common/linux.conf
@@ -1645,7 +1647,7 @@ EOF
%build
# pass OPTFLAGS to build qmake itself with optimization
-export OPTFLAGS="%{rpmcflags}"
+export OPTFLAGS="%{rpmcflags} -std=gnu17"
export PATH=$PWD/bin:$PATH
##################################
diff --git a/types.patch b/types.patch
new file mode 100644
index 0000000..3857809
--- /dev/null
+++ b/types.patch
@@ -0,0 +1,52 @@
+--- qt-everywhere-opensource-src-4.8.7/src/sql/drivers/mysql/qsql_mysql.cpp.orig 2026-01-25 02:55:34.079467275 +0100
++++ qt-everywhere-opensource-src-4.8.7/src/sql/drivers/mysql/qsql_mysql.cpp 2026-01-25 13:43:29.753117002 +0100
+@@ -190,11 +190,11 @@
+ struct QMyField
+ {
+ QMyField()
+- : outField(0), nullIndicator(false), bufLength(0ul),
++ : outField(0), nullIndicator(FALSE), bufLength(0ul),
+ myField(0), type(QVariant::Invalid)
+ {}
+ char *outField;
+- bool nullIndicator;
++ my_bool nullIndicator;
+ ulong bufLength;
+ MYSQL_FIELD *myField;
+ QVariant::Type type;
+@@ -601,7 +601,7 @@
+ const QMYSQLResultPrivate::QMyField &f = d->fields.at(field);
+ QString val;
+ if (d->preparedQuery) {
+- if (f.nullIndicator)
++ if (f.nullIndicator == TRUE)
+ return QVariant(f.type);
+
+ if (f.type != QVariant::ByteArray)
+@@ -678,7 +678,7 @@
+ bool QMYSQLResult::isNull(int field)
+ {
+ if (d->preparedQuery)
+- return d->fields.at(field).nullIndicator;
++ return d->fields.at(field).nullIndicator == TRUE ? true : false;
+ else
+ return d->row[field] == NULL;
+ }
+@@ -930,7 +930,7 @@
+ MYSQL_BIND* currBind;
+ QVector<MYSQL_TIME *> timeVector;
+ QVector<QByteArray> stringVector;
+- QVector<bool> nullVector;
++ QVector<my_bool> nullVector;
+
+ const QVector<QVariant> values = boundValues();
+
+@@ -951,7 +951,7 @@
+
+ currBind = &d->outBinds[i];
+
+- nullVector[i] = static_cast<bool>(val.isNull());
++ nullVector[i] = static_cast<bool>(val.isNull()) ? TRUE : FALSE;
+ currBind->is_null = &nullVector[i];
+ currBind->length = 0;
+ currBind->is_unsigned = 0;
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/qt4.git/commitdiff/b16737b499cf91309c6d12d8afb65aeab2fd8efc
More information about the pld-cvs-commit
mailing list