diff options
| -rw-r--r-- | libraries/libqsqlpsql/libqsqlpsql.SlackBuild | 9 | ||||
| -rw-r--r-- | libraries/libqsqlpsql/libqsqlpsql.info | 6 | ||||
| -rw-r--r-- | libraries/libqsqlpsql/qsql_psql_cpp.patch | 46 | ||||
| -rw-r--r-- | libraries/libqsqlpsql/qsql_psql_h.patch | 12 |
4 files changed, 68 insertions, 5 deletions
diff --git a/libraries/libqsqlpsql/libqsqlpsql.SlackBuild b/libraries/libqsqlpsql/libqsqlpsql.SlackBuild index d108b64ca3..f4ac2bf0e4 100644 --- a/libraries/libqsqlpsql/libqsqlpsql.SlackBuild +++ b/libraries/libqsqlpsql/libqsqlpsql.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for libqsqlpsql -# Copyright 2008-2010 Heinz Wiesinger, Amsterdam, The Netherlands +# Copyright 2008-2011 Heinz Wiesinger, Amsterdam, The Netherlands # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=libqsqlpsql -VERSION=4.6.2_2d3d3e5 +VERSION=4.7.0_7abde40 BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -73,6 +73,11 @@ if [ $ARCH = "i486" ]; then patch -p1 -i $CWD/qt.x86.cflags.diff fi +# Add support for postgresql 9 +# Patches taken from http://bugreports.qt.nokia.com/browse/QTBUG-14206 +patch -p1 -i $CWD/qsql_psql_cpp.patch +patch -p1 -i $CWD/qsql_psql_h.patch + cd src/plugins/sqldrivers/psql qmake \ QMAKE_CFLAGS+="$SLKCFLAGS" \ diff --git a/libraries/libqsqlpsql/libqsqlpsql.info b/libraries/libqsqlpsql/libqsqlpsql.info index efaa1342ca..837df51a1f 100644 --- a/libraries/libqsqlpsql/libqsqlpsql.info +++ b/libraries/libqsqlpsql/libqsqlpsql.info @@ -1,8 +1,8 @@ PRGNAM="libqsqlpsql" -VERSION="4.6.2_2d3d3e5" +VERSION="4.7.0_7abde40" HOMEPAGE="http://qt.nokia.com" -DOWNLOAD="http://slackware.osuosl.org/slackware-13.1/source/l/qt/qt-4.6.2_2d3d3e5.tar.xz" -MD5SUM="169eb48d57eee305c61be4db702083ff" +DOWNLOAD="http://slackware.osuosl.org/slackware-13.37/source/l/qt/qt-4.7.0_7abde40.tar.xz" +MD5SUM="c980b148ba79bcf5bb8641dd486de97b" DOWNLOAD_x86_64="" MD5SUM_x86_64="" MAINTAINER="Heinz Wiesinger" diff --git a/libraries/libqsqlpsql/qsql_psql_cpp.patch b/libraries/libqsqlpsql/qsql_psql_cpp.patch new file mode 100644 index 0000000000..6d4ee2dd7c --- /dev/null +++ b/libraries/libqsqlpsql/qsql_psql_cpp.patch @@ -0,0 +1,46 @@ +--- qt-everywhere-opensource-src-4.7.0/src/sql/drivers/psql/qsql_psql.cpp 2010-09-10 11:05:25.000000000 +0200 ++++ qsql_psql.cpp 2010-11-03 12:37:55.966977333 +0100 +@@ -661,6 +661,17 @@ + break; + } + break; ++ case 9: ++ switch (vMin) { ++ case 0: ++ serverVersion = QPSQLDriver::Version9; ++ break; ++ default: ++ serverVersion = QPSQLDriver::Version9; ++ break; ++ } ++ break; ++ + default: + break; + } +@@ -852,7 +863,8 @@ + // This hack can dissapear once there is an API to query this sort of information. + if (d->pro == QPSQLDriver::Version8 || + d->pro == QPSQLDriver::Version81 || +- d->pro == QPSQLDriver::Version82) { ++ d->pro == QPSQLDriver::Version82 || ++ d->pro == QPSQLDriver::Version9) { + transaction_failed = qstrcmp(PQcmdStatus(res), "ROLLBACK") == 0; + } + +@@ -963,6 +975,7 @@ + case QPSQLDriver::Version8: + case QPSQLDriver::Version81: + case QPSQLDriver::Version82: ++ case QPSQLDriver::Version9: + stmt = QLatin1String("SELECT pg_attribute.attname, pg_attribute.atttypid::int, " + "pg_class.relname " + "FROM pg_attribute, pg_class " +@@ -1046,6 +1059,7 @@ + case QPSQLDriver::Version8: + case QPSQLDriver::Version81: + case QPSQLDriver::Version82: ++ case QPSQLDriver::Version9: + stmt = QLatin1String("select pg_attribute.attname, pg_attribute.atttypid::int, " + "pg_attribute.attnotnull, pg_attribute.attlen, pg_attribute.atttypmod, " + "pg_attrdef.adsrc " diff --git a/libraries/libqsqlpsql/qsql_psql_h.patch b/libraries/libqsqlpsql/qsql_psql_h.patch new file mode 100644 index 0000000000..9b9a2d6bfd --- /dev/null +++ b/libraries/libqsqlpsql/qsql_psql_h.patch @@ -0,0 +1,12 @@ +--- qt-everywhere-opensource-src-4.7.0/src/sql/drivers/psql/qsql_psql.h 2010-09-10 11:05:25.000000000 +0200 ++++ qsql_psql.h 2010-11-03 12:36:16.380310668 +0100 +@@ -104,7 +104,8 @@ + Version74 = 10, + Version8 = 11, + Version81 = 12, +- Version82 = 13 ++ Version82 = 13, ++ Version9 = 14 + }; + + explicit QPSQLDriver(QObject *parent=0); |