[packages/qt] - fix type conflict with postgresql

[baggins]

commit fbdff27a78ea1e78df68c2dac477e07dc2c8d0f2
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Tue Aug 17 10:55:33 2021 +0200

    - fix type conflict with postgresql

 qsql.patch | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++
 qt.spec    |  2 ++
 2 files changed, 53 insertions(+)
---
diff --git a/qt.spec b/qt.spec
index bfd32ae..15166a8 100644
--- a/qt.spec
+++ b/qt.spec
@@ -60,6 +60,7 @@ Patch12:	%{name}-fvisibility.patch
 Patch13:	qt-buildkey-fixed.patch
 Patch14:	%{name}-odbc.patch
 Patch15:	qt-3.3.8.d-libpng15-1.patch
+Patch16:	qsql.patch
 URL:		http://www.trolltech.com/products/qt/
 %{?with_ibase:BuildRequires:	Firebird-devel >= 1.5.0}
 BuildRequires:	OpenGL-GLU-devel
@@ -672,6 +673,7 @@ graficznego - Qt Designer.
 %patch13 -p1
 %patch14 -p1
 %patch15 -p1
+%patch16 -p1
 
 # copy qt kde integration files
 cp %{SOURCE8} %{SOURCE9} src/kernel
diff --git a/qsql.patch b/qsql.patch
new file mode 100644
index 0000000..6cb810b
--- /dev/null
+++ b/qsql.patch
@@ -0,0 +1,51 @@
+--- /dev/shm/qt3/src/sql/qsqlextension_p.h.orig	2011-10-30 19:55:58.000000000 +0100
++++ /dev/shm/qt3/src/sql/qsqlextension_p.h	2021-08-17 10:42:01.099768247 +0200
+@@ -71,8 +71,8 @@
+ #define QM_TEMPLATE_EXTERN_SQL Q_TEMPLATE_EXTERN
+ #endif
+ 
+-struct Param {
+-    Param( const QVariant& v = QVariant(), QSql::ParameterType t = QSql::In ): value( v ), typ( t ) {}
++struct QParam {
++    QParam( const QVariant& v = QVariant(), QSql::ParameterType t = QSql::In ): value( v ), typ( t ) {}
+     QVariant value;
+     QSql::ParameterType typ;
+     Q_DUMMY_COMPARISON_OPERATOR(Param)
+@@ -114,7 +114,7 @@
+     int bindCount;
+ 
+     QMap<int, QString> index;
+-    typedef QMap<QString, Param> ValueMap;
++    typedef QMap<QString, QParam> ValueMap;
+     ValueMap values;
+ 
+     // convenience container for QSqlQuery
+--- /dev/shm/qt3/src/sql/qsqlextension_p.cpp~	2011-10-30 19:55:58.000000000 +0100
++++ /dev/shm/qt3/src/sql/qsqlextension_p.cpp	2021-08-17 10:42:52.814450817 +0200
+@@ -68,7 +68,7 @@
+     if ( index.contains( (int)values.count() ) ) {
+ 	index[ (int)values.count() ] = placeholder;
+     }
+-    values[ placeholder ] = Param( val, tp );
++    values[ placeholder ] = QParam( val, tp );
+ }
+ 
+ void QSqlExtension::bindValue( int pos, const QVariant& val, QSql::ParameterType tp )
+@@ -76,7 +76,7 @@
+     bindm = BindByPosition;
+     index[ pos ] = QString::number( pos );
+     QString nm = QString::number( pos );
+-    values[ nm ] = Param( val, tp );
++    values[ nm ] = QParam( val, tp );
+ }
+ 
+ void QSqlExtension::addBindValue( const QVariant& val, QSql::ParameterType tp )
+@@ -130,7 +130,7 @@
+ 
+ QMap<QString, QVariant> QSqlExtension::boundValues() const
+ {
+-    QMap<QString, Param>::ConstIterator it;
++    QMap<QString, QParam>::ConstIterator it;
+     QMap<QString, QVariant> m;
+     if ( bindm == BindByName ) {
+ 	for ( it = values.begin(); it != values.end(); ++it )
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/qt.git/commitdiff/fbdff27a78ea1e78df68c2dac477e07dc2c8d0f2