diff options
| author | Pawel 'l0ner' Soltys <pwslts@gmail.com> | 2012-01-13 13:13:53 +0100 |
|---|---|---|
| committer | Pawel 'l0ner' Soltys <pwslts@gmail.com> | 2012-01-13 13:13:53 +0100 |
| commit | 98ad00377d3bffc225540571113008dc2e66ea69 (patch) | |
| tree | ff3ad6fcdc0980d6cd6e5e86ebbb49cf4ecd1860 /arch/3.5.13/trinity-base/trinity-qt3/qt-odbc.patch | |
| parent | db9adacbc1b5ceca4b8b0649cbbc9e4865865953 (diff) | |
| download | tde-packaging-98ad00377d3bffc225540571113008dc2e66ea69.tar.gz tde-packaging-98ad00377d3bffc225540571113008dc2e66ea69.zip | |
qt3: depdndency fix, patched odbc module, added sime tweaks form arch
extras/qt3 package
Diffstat (limited to 'arch/3.5.13/trinity-base/trinity-qt3/qt-odbc.patch')
| -rw-r--r-- | arch/3.5.13/trinity-base/trinity-qt3/qt-odbc.patch | 64 |
1 files changed, 64 insertions, 0 deletions
diff --git a/arch/3.5.13/trinity-base/trinity-qt3/qt-odbc.patch b/arch/3.5.13/trinity-base/trinity-qt3/qt-odbc.patch new file mode 100644 index 000000000..2fefa8155 --- /dev/null +++ b/arch/3.5.13/trinity-base/trinity-qt3/qt-odbc.patch @@ -0,0 +1,64 @@ +diff -u -r qt3/src/sql/drivers/odbc/qsql_odbc.cpp src/qt3/src/sql/drivers/odbc/qsql_odbc.cpp +--- qt3/src/sql/drivers/odbc/qsql_odbc.cpp 2011-10-30 19:55:58.000000000 +0100 ++++ src/qt3/src/sql/drivers/odbc/qsql_odbc.cpp 2012-01-13 01:24:59.000000000 +0100 +@@ -61,19 +61,18 @@ + #endif + + // newer platform SDKs use SQLLEN instead of SQLINTEGER +-#ifdef SQLLEN ++#if defined(SQLLEN) || defined(Q_OS_WIN64) || defined(Q_OS_UNIX) + # define QSQLLEN SQLLEN + #else + # define QSQLLEN SQLINTEGER + #endif + +-#ifdef SQLULEN ++#if defined(SQLULEN) || defined(Q_OS_WIN64) || defined(Q_OS_UNIX) + # define QSQLULEN SQLULEN + #else + # define QSQLULEN SQLUINTEGER + #endif + +- + static const QSQLLEN COLNAMESIZE = 256; + //Map Qt parameter types to ODBC types + static const SQLSMALLINT qParamType[ 4 ] = { SQL_PARAM_INPUT, SQL_PARAM_INPUT, SQL_PARAM_OUTPUT, SQL_PARAM_INPUT_OUTPUT }; + +diff -u -r qt3/plugins/src/sqldrivers/odbc/odbc.pro src/qt3/plugins/src/sqldrivers/odbc/odbc.pro +--- qt3/plugins/src/sqldrivers/odbc/odbc.pro 2011-10-30 19:55:57.000000000 +0100 ++++ src/qt3/plugins/src/sqldrivers/odbc/odbc.pro 2012-01-13 01:39:11.000000000 +0100 +@@ -10,14 +10,14 @@ + + mac { + !contains( LIBS, .*odbc.* ) { +- LIBS *= -liodbc ++ LIBS *= -lodbc + } + } + + unix { + OBJECTS_DIR = .obj + !contains( LIBS, .*odbc.* ) { +- LIBS *= -liodbc ++ LIBS *= -lodbc + } + } + +diff -u -r qt3/src/sql/qt_sql.pri src/qt3/src/sql/qt_sql.pri +--- qt3/src/sql/qt_sql.pri 2011-10-30 19:55:58.000000000 +0100 ++++ src/qt3/src/sql/qt_sql.pri 2012-01-13 01:39:31.000000000 +0100 +@@ -110,13 +110,13 @@ + + mac { + !contains( LIBS, .*odbc.* ) { +- LIBS *= -liodbc ++ LIBS *= -lodbc + } + } + + unix { + !contains( LIBS, .*odbc.* ) { +- LIBS *= -liodbc ++ LIBS *= -lodbc + } + } |