diff options
| author | fjoe <fjoe@FreeBSD.org> | 2009-01-27 13:13:10 +0800 |
|---|---|---|
| committer | fjoe <fjoe@FreeBSD.org> | 2009-01-27 13:13:10 +0800 |
| commit | 1bb883a1dcad78490f2d9b221c1e3c48a04ab9d1 (patch) | |
| tree | 68152d86ee22d4f662b1fb7738793ea0f6535a89 /databases/qt-odbc-plugin | |
| parent | 25768ea10a36574cf2a184c004efe1420800d0bf (diff) | |
| download | freebsd-ports-gnome-1bb883a1dcad78490f2d9b221c1e3c48a04ab9d1.tar.gz freebsd-ports-gnome-1bb883a1dcad78490f2d9b221c1e3c48a04ab9d1.tar.zst freebsd-ports-gnome-1bb883a1dcad78490f2d9b221c1e3c48a04ab9d1.zip | |
Fix build with unixODBC 2.2.14: in 2.2.14 signatures of several functions
(SQLExtendedFetch, SQLColAttribute, SQLColAttributeW) were fixed.
Approved by: portmgr (marcus)
Diffstat (limited to 'databases/qt-odbc-plugin')
| -rw-r--r-- | databases/qt-odbc-plugin/Makefile | 3 | ||||
| -rw-r--r-- | databases/qt-odbc-plugin/files/patch-src-sql-drivers-odbc-qsql_odbc.cpp | 21 |
2 files changed, 23 insertions, 1 deletions
diff --git a/databases/qt-odbc-plugin/Makefile b/databases/qt-odbc-plugin/Makefile index 1e1e53296ea4..d38c05c6b2f0 100644 --- a/databases/qt-odbc-plugin/Makefile +++ b/databases/qt-odbc-plugin/Makefile @@ -8,7 +8,7 @@ PORTNAME= qt-${DB}-plugin PORTVERSION= 3.3.8 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= databases MASTER_SITES= ${MASTER_SITE_QT} DISTNAME= qt-x11-free-${PORTVERSION} @@ -25,6 +25,7 @@ BROKEN= does not compile LIB_DEPENDS+= odbc:${PORTSDIR}/databases/unixODBC \ qt-mt:${PORTSDIR}/x11-toolkits/qt33 +BUILD_DEPENDS= unixODBC>=2.2.14_1:${PORTSDIR}/databases/unixODBC USE_BZIP2= yes PLUGIN= plugins/src/sqldrivers/${DB} diff --git a/databases/qt-odbc-plugin/files/patch-src-sql-drivers-odbc-qsql_odbc.cpp b/databases/qt-odbc-plugin/files/patch-src-sql-drivers-odbc-qsql_odbc.cpp new file mode 100644 index 000000000000..bb07b52f8acc --- /dev/null +++ b/databases/qt-odbc-plugin/files/patch-src-sql-drivers-odbc-qsql_odbc.cpp @@ -0,0 +1,21 @@ +--- src/sql/drivers/odbc/qsql_odbc.cpp.orig 2009-01-26 23:43:41.000000000 +0600 ++++ src/sql/drivers/odbc/qsql_odbc.cpp 2009-01-26 23:43:53.000000000 +0600 +@@ -57,18 +57,8 @@ + #endif + + // newer platform SDKs use SQLLEN instead of SQLINTEGER +-#ifdef SQLLEN + # define QSQLLEN SQLLEN +-#else +-# define QSQLLEN SQLINTEGER +-#endif +- +-#ifdef SQLULEN + # define QSQLULEN SQLULEN +-#else +-# define QSQLULEN SQLUINTEGER +-#endif +- + + static const QSQLLEN COLNAMESIZE = 256; + //Map Qt parameter types to ODBC types |