diff options
| author | miwi <miwi@FreeBSD.org> | 2009-08-05 04:04:38 +0800 |
|---|---|---|
| committer | miwi <miwi@FreeBSD.org> | 2009-08-05 04:04:38 +0800 |
| commit | 5153f40d24ec33479bb3f8c06e1c33f0c9e052d1 (patch) | |
| tree | 2781cac7d68b8246efd7f5d5bf764de05aee8338 /databases/qt4-odbc-plugin/files | |
| parent | 32198db977429daaf8bbf3ef8312d29a0e17083d (diff) | |
| download | freebsd-ports-gnome-5153f40d24ec33479bb3f8c06e1c33f0c9e052d1.tar.gz freebsd-ports-gnome-5153f40d24ec33479bb3f8c06e1c33f0c9e052d1.tar.zst freebsd-ports-gnome-5153f40d24ec33479bb3f8c06e1c33f0c9e052d1.zip | |
- Update Qt4 to 4.5.2
The KDE FreeBSD team would like to say thanks to all the helpers
and submitters.
Tested by: pointyhat-exp-run (pav/miwi)
Diffstat (limited to 'databases/qt4-odbc-plugin/files')
| -rw-r--r-- | databases/qt4-odbc-plugin/files/Makefile.bsd | 8 | ||||
| -rw-r--r-- | databases/qt4-odbc-plugin/files/patch-src-sql-drivers-odbc-qsql_odbc.cpp | 20 |
2 files changed, 5 insertions, 23 deletions
diff --git a/databases/qt4-odbc-plugin/files/Makefile.bsd b/databases/qt4-odbc-plugin/files/Makefile.bsd index 40f018c8a8c4..0c73245937a5 100644 --- a/databases/qt4-odbc-plugin/files/Makefile.bsd +++ b/databases/qt4-odbc-plugin/files/Makefile.bsd @@ -2,13 +2,15 @@ SHLIB_NAME= libqsql${DB}.so VPATH= ${PLUGIN}:${DRIVER} CXXFLAGS+= -I${DRIVER} \ - -I${PREFIX}/include/qt4 \ - -I${PREFIX}/include/qt4/Qt \ + -I${QT_INCDIR} \ + -I${QT_INCDIR}/Qt \ + -I${QT_INCDIR}/QtCore \ + -I${QT_INCDIR}/QtSql \ -I${LOCALBASE}/include \ ${PTHREAD_CFLAGS} -DQT_NO_CAST_TO_ASCII -DQT_NO_CAST_FROM_ASCII \ -DQT_PLUGIN -DQT_SQL_LIB -DQT_CORE_LIB -D_LARGEFILE64_SOURCE \ -D_LARGEFILE_SOURCE -DQT_SHARED -LDADD= -L${PREFIX}/lib/qt4 -L${LOCALBASE}/lib ${PTHREAD_LIBS} -lQtSql -lodbc +LDADD= -L${QT_LIBDIR} -L${LOCALBASE}/lib ${PTHREAD_LIBS} -lQtSql -lodbc MOC?= ${LOCALBASE}/bin/moc-qt4 SRCS= main.cpp qsql_${DB}.cpp moc_qsql_${DB}.cpp diff --git a/databases/qt4-odbc-plugin/files/patch-src-sql-drivers-odbc-qsql_odbc.cpp b/databases/qt4-odbc-plugin/files/patch-src-sql-drivers-odbc-qsql_odbc.cpp deleted file mode 100644 index 9f1d284aa97a..000000000000 --- a/databases/qt4-odbc-plugin/files/patch-src-sql-drivers-odbc-qsql_odbc.cpp +++ /dev/null @@ -1,20 +0,0 @@ ---- src/sql/drivers/odbc/qsql_odbc.cpp.orig 2009-01-27 00:11:47.000000000 +0600 -+++ src/sql/drivers/odbc/qsql_odbc.cpp 2009-01-27 00:12:12.000000000 +0600 -@@ -64,17 +64,8 @@ - #endif - - // newer platform SDKs use SQLLEN instead of SQLINTEGER --#if defined(SQLLEN) || defined(Q_OS_WIN64) - # define QSQLLEN SQLLEN --#else --# define QSQLLEN SQLINTEGER --#endif -- --#if defined(SQLULEN) || defined(Q_OS_WIN64) - # define QSQLULEN SQLULEN --#else --# define QSQLULEN SQLUINTEGER --#endif - - static const int COLNAMESIZE = 256; - //Map Qt parameter types to ODBC types |