# HG changeset patch # User Christopher Rogers # Date 1297838903 0 # Node ID 20c7c65ea549e1f2e3f39ff50830eb35be2c101c # Parent 3ea9f2d8e3a19c726361658cb62d2b13d5bf9f23 Updated qt4 with upstream fixes. diff -r 3ea9f2d8e3a1 -r 20c7c65ea549 Qt4-dev/receipt --- a/Qt4-dev/receipt Wed Feb 16 01:53:55 2011 +0000 +++ b/Qt4-dev/receipt Wed Feb 16 06:48:23 2011 +0000 @@ -8,7 +8,7 @@ DEPENDS="QtDesigner jpeg tiff libpng mesa libglu-mesa \ freetds libmysqlclient libpostgresqlclient libunixODBC xcb-util \ libQt3Support libQtClucene libQtDBus libQtHelp libQtOpenGL \ -libQtScript libQtSql libQtWebkit qtconfig gcc-lib-base" +libQtScript libQtSql libQtWebkit libQtTest qtconfig gcc-lib-base" SUGGESTED="libmng nvidia" WEB_SITE="http://qt.nokia.com/" WANTED="qt4" @@ -18,7 +18,6 @@ genpkg_rules() { mkdir -p $fs/usr/lib - _pkg="$WOK/$WANTED/$SOURCE-$VERSION/_pkg" cp -a $_pkg/usr/include $fs/usr cp -a $_pkg/usr/lib/pkgconfig $fs/usr/lib cp -a $_pkg/usr/lib/*.*a $fs/usr/lib/ diff -r 3ea9f2d8e3a1 -r 20c7c65ea549 QtDesigner/receipt --- a/QtDesigner/receipt Wed Feb 16 01:53:55 2011 +0000 +++ b/QtDesigner/receipt Wed Feb 16 06:48:23 2011 +0000 @@ -9,7 +9,6 @@ expat fontconfig freetype glib xorg-libICE xorg-libSM xorg-libX11 xorg-libXau \ xorg-libXdmcp xorg-libXext xorg-libXi xorg-libXrandr xorg-libXrender zlib \ libpng gcc-lib-base" -TARBALL="$PACKAGE-$VERSION.tar.gz" WEB_SITE="http://qt.nokia.com/" WANTED="qt4" SOURCE="qt-everywhere-opensource-src" @@ -21,8 +20,7 @@ mkdir -p $fs/usr/bin \ $fs/usr/share/pixmaps \ $fs/usr/share/applications - src="$WOK/$WANTED/$SOURCE-$VERSION" - _pkg="$src/_pkg" + cp -a $_pkg/usr/bin/designer* $fs/usr/bin cp -a $_pkg/usr/bin/linguist* $fs/usr/bin cp -a $_pkg/usr/bin/assistant* $fs/usr/bin diff -r 3ea9f2d8e3a1 -r 20c7c65ea549 libQt3Support/receipt --- a/libQt3Support/receipt Wed Feb 16 01:53:55 2011 +0000 +++ b/libQt3Support/receipt Wed Feb 16 06:48:23 2011 +0000 @@ -6,15 +6,14 @@ SHORT_DESC="Qt3 support Library" MAINTAINER="allan316@gmail.com" DEPENDS="libQtGui libQtSql libQtXml" -TARBALL="$PACKAGE-$VERSION.tar.gz" WEB_SITE="http://qt.nokia.com/" WANTED="qt4" SOURCE="qt-everywhere-opensource-src" + # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { mkdir -p $fs/usr/lib - _pkg="$WOK/$WANTED/$SOURCE-$VERSION/_pkg" cp -a $_pkg/usr/lib/libQt3Support.so* $fs/usr/lib } diff -r 3ea9f2d8e3a1 -r 20c7c65ea549 libQtClucene/receipt --- a/libQtClucene/receipt Wed Feb 16 01:53:55 2011 +0000 +++ b/libQtClucene/receipt Wed Feb 16 06:48:23 2011 +0000 @@ -6,15 +6,14 @@ SHORT_DESC="Qt clucene Library" MAINTAINER="allan316@gmail.com" DEPENDS="libQtCore" -TARBALL="$PACKAGE-$VERSION.tar.gz" WEB_SITE="http://qt.nokia.com/" WANTED="qt4" SOURCE="qt-everywhere-opensource-src" + # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { mkdir -p $fs/usr/lib - _pkg="$WOK/$WANTED/$SOURCE-$VERSION/_pkg" cp -a $_pkg/usr/lib/libQtCLucene.so* $fs/usr/lib } diff -r 3ea9f2d8e3a1 -r 20c7c65ea549 libQtCore/receipt --- a/libQtCore/receipt Wed Feb 16 01:53:55 2011 +0000 +++ b/libQtCore/receipt Wed Feb 16 06:48:23 2011 +0000 @@ -6,7 +6,6 @@ SHORT_DESC="Qt Core files" MAINTAINER="allan316@gmail.com" DEPENDS="glib zlib gcc-lib-base" -TARBALL="$PACKAGE-$VERSION.tar.gz" WEB_SITE="http://qt.nokia.com/" WANTED="qt4" SOURCE="qt-everywhere-opensource-src" @@ -15,8 +14,6 @@ genpkg_rules() { mkdir -p $fs/usr/lib - _pkg="$WOK/$WANTED/$SOURCE-$VERSION/_pkg" cp -a $_pkg/usr/lib/libQtCore.so* $fs/usr/lib - } diff -r 3ea9f2d8e3a1 -r 20c7c65ea549 libQtDBus/receipt --- a/libQtDBus/receipt Wed Feb 16 01:53:55 2011 +0000 +++ b/libQtDBus/receipt Wed Feb 16 06:48:23 2011 +0000 @@ -6,15 +6,14 @@ SHORT_DESC="Qt Dbus Library" MAINTAINER="allan316@gmail.com" DEPENDS="libQtXml" -TARBALL="$PACKAGE-$VERSION.tar.gz" WEB_SITE="http://qt.nokia.com/" WANTED="qt4" SOURCE="qt-everywhere-opensource-src" + # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { mkdir -p $fs/usr/lib - _pkg="$WOK/$WANTED/$SOURCE-$VERSION/_pkg" cp -a $_pkg/usr/lib/libQtDBus.so* $fs/usr/lib } diff -r 3ea9f2d8e3a1 -r 20c7c65ea549 libQtDesigner/receipt --- a/libQtDesigner/receipt Wed Feb 16 01:53:55 2011 +0000 +++ b/libQtDesigner/receipt Wed Feb 16 06:48:23 2011 +0000 @@ -6,7 +6,6 @@ SHORT_DESC="Qt Designer" MAINTAINER="allan316@gmail.com" DEPENDS="libQtCore libQtGui libQtScript libQtXml" -TARBALL="$PACKAGE-$VERSION.tar.gz" WEB_SITE="http://www.trolltech.com" WANTED="qt4" SOURCE="qt-everywhere-opensource-src" @@ -15,7 +14,6 @@ genpkg_rules() { mkdir -p $fs/usr/lib - _pkg="$WOK/$WANTED/$SOURCE-$VERSION/_pkg" cp -a $_pkg/usr/lib/libQtDesigner*.so* $fs/usr/lib } diff -r 3ea9f2d8e3a1 -r 20c7c65ea549 libQtGui/receipt --- a/libQtGui/receipt Wed Feb 16 01:53:55 2011 +0000 +++ b/libQtGui/receipt Wed Feb 16 06:48:23 2011 +0000 @@ -8,7 +8,6 @@ DEPENDS="libQtCore expat fontconfig freetype xorg-libICE xorg-libSM \ xorg-libX11 xorg-libXau xorg-libXdmcp xorg-libXext xorg-libXi xorg-libXrandr \ xorg-libXrender libpng libegl-mesa" -TARBALL="$PACKAGE-$VERSION.tar.gz" WEB_SITE="http://qt.nokia.com/" WANTED="qt4" SOURCE="qt-everywhere-opensource-src" @@ -17,7 +16,6 @@ genpkg_rules() { mkdir -p $fs/usr/lib - _pkg="$WOK/$WANTED/$SOURCE-$VERSION/_pkg" cp -a $_pkg/usr/lib/libQtGui.so* $fs/usr/lib } diff -r 3ea9f2d8e3a1 -r 20c7c65ea549 libQtHelp/receipt --- a/libQtHelp/receipt Wed Feb 16 01:53:55 2011 +0000 +++ b/libQtHelp/receipt Wed Feb 16 06:48:23 2011 +0000 @@ -6,15 +6,14 @@ SHORT_DESC="Qt help Library" MAINTAINER="allan316@gmail.com" DEPENDS="libQtGui libQtClucene libQtSql libQtXml" -TARBALL="$PACKAGE-$VERSION.tar.gz" WEB_SITE="http://qt.nokia.com/" WANTED="qt4" SOURCE="qt-everywhere-opensource-src" + # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { mkdir -p $fs/usr/lib - _pkg="$WOK/$WANTED/$SOURCE-$VERSION/_pkg" cp -a $_pkg/usr/lib/libQtHelp.so* $fs/usr/lib } diff -r 3ea9f2d8e3a1 -r 20c7c65ea549 libQtNetwork/receipt --- a/libQtNetwork/receipt Wed Feb 16 01:53:55 2011 +0000 +++ b/libQtNetwork/receipt Wed Feb 16 06:48:23 2011 +0000 @@ -6,7 +6,6 @@ SHORT_DESC="Qt Network Library" MAINTAINER="allan316@gmail.com" DEPENDS="libQtCore" -TARBALL="$PACKAGE-$VERSION.tar.gz" WEB_SITE="http://qt.nokia.com/" WANTED="qt4" SOURCE="qt-everywhere-opensource-src" @@ -15,7 +14,6 @@ genpkg_rules() { mkdir -p $fs/usr/lib - _pkg="$WOK/$WANTED/$SOURCE-$VERSION/_pkg" cp -a $_pkg/usr/lib/libQtNetwork.so* $fs/usr/lib } diff -r 3ea9f2d8e3a1 -r 20c7c65ea549 libQtOpenGL/receipt --- a/libQtOpenGL/receipt Wed Feb 16 01:53:55 2011 +0000 +++ b/libQtOpenGL/receipt Wed Feb 16 06:48:23 2011 +0000 @@ -6,7 +6,6 @@ SHORT_DESC="Qt Network Library" MAINTAINER="allan316@gmail.com" DEPENDS="libQtGui mesa libglu-mesa xorg-libXxf86vm xorg-libXdamage libdrm" -TARBALL="$PACKAGE-$VERSION.tar.gz" WEB_SITE="http://qt.nokia.com/" WANTED="qt4" SOURCE="qt-everywhere-opensource-src" @@ -15,7 +14,6 @@ genpkg_rules() { mkdir -p $fs/usr/lib - _pkg="$WOK/$WANTED/$SOURCE-$VERSION/_pkg" cp -a $_pkg/usr/lib/libQtOpenGL.so* $fs/usr/lib } diff -r 3ea9f2d8e3a1 -r 20c7c65ea549 libQtScript/receipt --- a/libQtScript/receipt Wed Feb 16 01:53:55 2011 +0000 +++ b/libQtScript/receipt Wed Feb 16 06:48:23 2011 +0000 @@ -6,7 +6,6 @@ SHORT_DESC="Qt Script Lib" MAINTAINER="allan316@gmail.com" DEPENDS="libQtCore" -TARBALL="$PACKAGE-$VERSION.tar.gz" WEB_SITE="http://qt.nokia.com/" WANTED="qt4" SOURCE="qt-everywhere-opensource-src" @@ -15,7 +14,6 @@ genpkg_rules() { mkdir -p $fs/usr/lib - _pkg="$WOK/$WANTED/$SOURCE-$VERSION/_pkg" cp -a $_pkg/usr/lib/libQtScript.so* $fs/usr/lib } diff -r 3ea9f2d8e3a1 -r 20c7c65ea549 libQtSql/receipt --- a/libQtSql/receipt Wed Feb 16 01:53:55 2011 +0000 +++ b/libQtSql/receipt Wed Feb 16 06:48:23 2011 +0000 @@ -6,15 +6,14 @@ SHORT_DESC="Qt sql Library" MAINTAINER="allan316@gmail.com" DEPENDS="libQtCore" -TARBALL="$PACKAGE-$VERSION.tar.gz" WEB_SITE="http://qt.nokia.com/" WANTED="qt4" SOURCE="qt-everywhere-opensource-src" + # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { mkdir -p $fs/usr/lib - _pkg="$WOK/$WANTED/$SOURCE-$VERSION/_pkg" cp -a $_pkg/usr/lib/libQtSql.so* $fs/usr/lib } diff -r 3ea9f2d8e3a1 -r 20c7c65ea549 libQtSvg/receipt --- a/libQtSvg/receipt Wed Feb 16 01:53:55 2011 +0000 +++ b/libQtSvg/receipt Wed Feb 16 06:48:23 2011 +0000 @@ -6,7 +6,6 @@ SHORT_DESC="Qt Svg Library" MAINTAINER="allan316@gmail.com" DEPENDS="libQtCore libQtGui libQtXml libpng" -TARBALL="$PACKAGE-$VERSION.tar.gz" WEB_SITE="http://qt.nokia.com/" WANTED="qt4" SOURCE="qt-everywhere-opensource-src" @@ -15,7 +14,6 @@ genpkg_rules() { mkdir -p $fs/usr/lib - _pkg="$WOK/$WANTED/$SOURCE-$VERSION/_pkg" cp -a $_pkg/usr/lib/libQtSvg.so* $fs/usr/lib } diff -r 3ea9f2d8e3a1 -r 20c7c65ea549 libQtTest/receipt --- a/libQtTest/receipt Wed Feb 16 01:53:55 2011 +0000 +++ b/libQtTest/receipt Wed Feb 16 06:48:23 2011 +0000 @@ -6,7 +6,6 @@ SHORT_DESC="Qt Test library" MAINTAINER="rocky@slitaz.com" DEPENDS="libQtCore" -TARBALL="$PACKAGE-$VERSION.tar.gz" WEB_SITE="http://qt.nokia.com/" WANTED="qt4" SOURCE="qt-everywhere-opensource-src" @@ -15,7 +14,6 @@ genpkg_rules() { mkdir -p $fs/usr/lib - _pkg="$WOK/$WANTED/$SOURCE-$VERSION/_pkg" cp -a $_pkg/usr/lib/libQtTest.so* $fs/usr/lib } diff -r 3ea9f2d8e3a1 -r 20c7c65ea549 libQtWebkit/receipt --- a/libQtWebkit/receipt Wed Feb 16 01:53:55 2011 +0000 +++ b/libQtWebkit/receipt Wed Feb 16 06:48:23 2011 +0000 @@ -6,7 +6,6 @@ SHORT_DESC="Web browser engine for Qt" MAINTAINER="allan316@gmail.com" DEPENDS="libQtCore libQtGui libQtNetwork libpng" -TARBALL="$PACKAGE-$VERSION.tar.gz" WEB_SITE="http://qt.nokia.com/" WANTED="qt4" SOURCE="qt-everywhere-opensource-src" @@ -15,7 +14,6 @@ genpkg_rules() { mkdir -p $fs/usr/lib - _pkg="$WOK/$WANTED/$SOURCE-$VERSION/_pkg" cp -a $_pkg/usr/lib/libQtWebKit.so* $fs/usr/lib } diff -r 3ea9f2d8e3a1 -r 20c7c65ea549 libQtXml/receipt --- a/libQtXml/receipt Wed Feb 16 01:53:55 2011 +0000 +++ b/libQtXml/receipt Wed Feb 16 06:48:23 2011 +0000 @@ -6,7 +6,6 @@ SHORT_DESC="Qt Xml library" MAINTAINER="allan316@gmail.com" DEPENDS="libQtNetwork" -TARBALL="$PACKAGE-$VERSION.tar.gz" WEB_SITE="http://qt.nokia.com/" WANTED="qt4" SOURCE="qt-everywhere-opensource-src" @@ -15,7 +14,6 @@ genpkg_rules() { mkdir -p $fs/usr/lib - _pkg="$WOK/$WANTED/$SOURCE-$VERSION/_pkg" cp -a $_pkg/usr/lib/libQtXml.so* $fs/usr/lib cp -a $_pkg/usr/lib/libQtXmlPatterns.so* $fs/usr/lib } diff -r 3ea9f2d8e3a1 -r 20c7c65ea549 qmake/receipt --- a/qmake/receipt Wed Feb 16 01:53:55 2011 +0000 +++ b/qmake/receipt Wed Feb 16 06:48:23 2011 +0000 @@ -16,7 +16,6 @@ genpkg_rules() { mkdir -p $fs/usr/bin - _pkg="$WOK/$WANTED/$SOURCE-$VERSION/_pkg" cp -a $_pkg/usr/bin/qmake $fs/usr/bin cp -a $_pkg/usr/bin/moc $fs/usr/bin cp -a $_pkg/usr/bin/uic $fs/usr/bin diff -r 3ea9f2d8e3a1 -r 20c7c65ea549 qt4-phonon/receipt --- a/qt4-phonon/receipt Wed Feb 16 01:53:55 2011 +0000 +++ b/qt4-phonon/receipt Wed Feb 16 06:48:23 2011 +0000 @@ -15,6 +15,5 @@ genpkg_rules() { mkdir -p $fs/usr/lib - _pkg="$WOK/$WANTED/$SOURCE-$VERSION/_pkg" cp -a $_pkg/usr/lib/libphonon.so* $fs/usr/lib } diff -r 3ea9f2d8e3a1 -r 20c7c65ea549 qt4/receipt --- a/qt4/receipt Wed Feb 16 01:53:55 2011 +0000 +++ b/qt4/receipt Wed Feb 16 06:48:23 2011 +0000 @@ -27,7 +27,11 @@ compile_rules() { cd $src - + + # Already fixed upstream + patch -Np1 -i ../stuff/fix-qtbug-15857.patch + patch -Np1 -i ../stuff/add-postgresql9.patch + ./configure -v \ -prefix /usr \ -confirm-license -opensource \ diff -r 3ea9f2d8e3a1 -r 20c7c65ea549 qt4/stuff/add-postgresql9.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/qt4/stuff/add-postgresql9.patch Wed Feb 16 06:48:23 2011 +0000 @@ -0,0 +1,215 @@ +From 03f94089a16cf6b6a3b533ba1f90444eb18c29ab Mon Sep 17 00:00:00 2001 +From: Charles Yin +Date: Thu, 4 Nov 2010 15:38:57 +1000 +Subject: [PATCH] Add Postgresql 8.x and 9 supports + +Change-Id: Ic740686ead768cc3e106703049d878549dfd3c6a +Task-number:QTBUG-14206 +Reviewed-by: Michael Goddard +--- + src/sql/drivers/psql/qsql_psql.cpp | 116 +++++++++++++++++++++--------- + src/sql/drivers/psql/qsql_psql.h | 6 ++- + tests/auto/qsqldatabase/tst_databases.h | 2 + + 3 files changed, 88 insertions(+), 36 deletions(-) + +diff --git a/src/sql/drivers/psql/qsql_psql.cpp b/src/sql/drivers/psql/qsql_psql.cpp +index 2a4e595..bf9685f 100644 +--- a/src/sql/drivers/psql/qsql_psql.cpp ++++ b/src/sql/drivers/psql/qsql_psql.cpp +@@ -54,7 +54,6 @@ + #include + #include + +- + #include + #include + +@@ -619,6 +618,50 @@ static void setDatestyle(PGconn* connection) + PQclear(result); + } + ++static QPSQLDriver::Protocol qMakePSQLVersion(int vMaj, int vMin) ++{ ++ switch (vMaj) { ++ case 6: ++ return QPSQLDriver::Version6; ++ case 7: ++ { ++ switch (vMin) { ++ case 1: ++ return QPSQLDriver::Version71; ++ case 3: ++ return QPSQLDriver::Version73; ++ case 4: ++ return QPSQLDriver::Version74; ++ default: ++ return QPSQLDriver::Version7; ++ } ++ break; ++ } ++ case 8: ++ { ++ switch (vMin) { ++ case 1: ++ return QPSQLDriver::Version81; ++ case 2: ++ return QPSQLDriver::Version82; ++ case 3: ++ return QPSQLDriver::Version83; ++ case 4: ++ return QPSQLDriver::Version84; ++ default: ++ return QPSQLDriver::Version8; ++ } ++ break; ++ } ++ case 9: ++ return QPSQLDriver::Version9; ++ break; ++ default: ++ break; ++ } ++ return QPSQLDriver::VersionUnknown; ++} ++ + static QPSQLDriver::Protocol getPSQLVersion(PGconn* connection) + { + QPSQLDriver::Protocol serverVersion = QPSQLDriver::Version6; +@@ -626,50 +669,44 @@ static QPSQLDriver::Protocol getPSQLVersion(PGconn* connection) + int status = PQresultStatus(result); + if (status == PGRES_COMMAND_OK || status == PGRES_TUPLES_OK) { + QString val = QString::fromAscii(PQgetvalue(result, 0, 0)); ++ + QRegExp rx(QLatin1String("(\\d+)\\.(\\d+)")); + rx.setMinimal(true); // enforce non-greedy RegExp ++ + if (rx.indexIn(val) != -1) { + int vMaj = rx.cap(1).toInt(); + int vMin = rx.cap(2).toInt(); +- +- switch (vMaj) { +- case 7: +- switch (vMin) { +- case 0: +- serverVersion = QPSQLDriver::Version7; +- break; +- case 1: +- case 2: +- serverVersion = QPSQLDriver::Version71; +- break; +- default: +- serverVersion = QPSQLDriver::Version73; +- break; +- } +- break; +- case 8: +- switch (vMin) { +- case 0: +- serverVersion = QPSQLDriver::Version8; +- break; +- case 1: +- serverVersion = QPSQLDriver::Version81; +- break; +- case 2: +- default: +- serverVersion = QPSQLDriver::Version82; +- break; +- } +- break; +- default: +- break; ++ serverVersion = qMakePSQLVersion(vMaj, vMin); ++#ifdef PG_MAJORVERSION ++ if (rx.indexIn(QLatin1String(PG_MAJORVERSION)) != -1) { ++ vMaj = rx.cap(1).toInt(); ++ vMin = rx.cap(2).toInt(); ++ } ++ QPSQLDriver::Protocol clientVersion = qMakePSQLVersion(vMaj, vMin); ++ ++ if (serverVersion >= QPSQLDriver::Version9 && clientVersion < QPSQLDriver::Version9) { ++ //Client version before QPSQLDriver::Version9 only supports escape mode for bytea type, ++ //but bytea format is set to hex by default in PSQL 9 and above. So need to force the ++ //server use the old escape mode when connects to the new server with old client library. ++ result = PQexec(connection, "SET bytea_output=escape; "); ++ status = PQresultStatus(result); ++ } else if (serverVersion == QPSQLDriver::VersionUnknown) { ++ serverVersion = clientVersion; ++ if (serverVersion != QPSQLDriver::VersionUnknown) ++ qWarning("The server version of this PostgreSQL is unknown, falling back to the client version."); + } ++#endif + } + } + PQclear(result); + +- if (serverVersion < QPSQLDriver::Version71) ++ //keep the old behavior unchanged ++ if (serverVersion == QPSQLDriver::VersionUnknown) ++ serverVersion = QPSQLDriver::Version6; ++ ++ if (serverVersion < QPSQLDriver::Version71) { + qWarning("This version of PostgreSQL is not supported and may not work."); ++ } + + return serverVersion; + } +@@ -852,7 +889,10 @@ bool QPSQLDriver::commitTransaction() + // 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::Version83 || ++ d->pro == QPSQLDriver::Version84 || ++ d->pro == QPSQLDriver::Version9) { + transaction_failed = qstrcmp(PQcmdStatus(res), "ROLLBACK") == 0; + } + +@@ -963,6 +1003,9 @@ QSqlIndex QPSQLDriver::primaryIndex(const QString& tablename) const + case QPSQLDriver::Version8: + case QPSQLDriver::Version81: + case QPSQLDriver::Version82: ++ case QPSQLDriver::Version83: ++ case QPSQLDriver::Version84: ++ case QPSQLDriver::Version9: + stmt = QLatin1String("SELECT pg_attribute.attname, pg_attribute.atttypid::int, " + "pg_class.relname " + "FROM pg_attribute, pg_class " +@@ -1046,6 +1089,9 @@ QSqlRecord QPSQLDriver::record(const QString& tablename) const + case QPSQLDriver::Version8: + case QPSQLDriver::Version81: + case QPSQLDriver::Version82: ++ case QPSQLDriver::Version83: ++ case QPSQLDriver::Version84: ++ 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/src/sql/drivers/psql/qsql_psql.h b/src/sql/drivers/psql/qsql_psql.h +index 22871ff..107da87 100644 +--- a/src/sql/drivers/psql/qsql_psql.h ++++ b/src/sql/drivers/psql/qsql_psql.h +@@ -97,6 +97,7 @@ class Q_EXPORT_SQLDRIVER_PSQL QPSQLDriver : public QSqlDriver + Q_OBJECT + public: + enum Protocol { ++ VersionUnknown = -1, + Version6 = 6, + Version7 = 7, + Version71 = 8, +@@ -104,7 +105,10 @@ public: + Version74 = 10, + Version8 = 11, + Version81 = 12, +- Version82 = 13 ++ Version82 = 13, ++ Version83 = 14, ++ Version84 = 15, ++ Version9 = 16, + }; + + explicit QPSQLDriver(QObject *parent=0); + +-- +1.6.1 + diff -r 3ea9f2d8e3a1 -r 20c7c65ea549 qt4/stuff/fix-multisampling-with-ati-card.patch --- a/qt4/stuff/fix-multisampling-with-ati-card.patch Wed Feb 16 01:53:55 2011 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,25 +0,0 @@ -From e48e50c460434c451c67403390d98f7418c77cce Mon Sep 17 00:00:00 2001 -From: Jonathan Liu -Date: Wed, 25 Aug 2010 14:07:40 +1000 -Subject: [PATCH] Fix OpenGL multisampling for some graphics drivers - ---- - src/opengl/qgl_win.cpp | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/src/opengl/qgl_win.cpp b/src/opengl/qgl_win.cpp -index 5ab944a..8eb6177 100644 ---- a/src/opengl/qgl_win.cpp -+++ b/src/opengl/qgl_win.cpp -@@ -1042,7 +1042,7 @@ int QGLContext::choosePixelFormat(void* dummyPfd, HDC pdc) - iAttributes[i++] = WGL_DRAW_TO_WINDOW_ARB; - iAttributes[i++] = TRUE; - iAttributes[i++] = WGL_COLOR_BITS_ARB; -- iAttributes[i++] = 32; -+ iAttributes[i++] = 24; - iAttributes[i++] = WGL_DOUBLE_BUFFER_ARB; - iAttributes[i++] = d->glFormat.doubleBuffer(); - if (d->glFormat.stereo()) { --- -1.7.2.1 - diff -r 3ea9f2d8e3a1 -r 20c7c65ea549 qt4/stuff/fix-qtbug-15857.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/qt4/stuff/fix-qtbug-15857.patch Wed Feb 16 06:48:23 2011 +0000 @@ -0,0 +1,32 @@ +From 6ae84f1183e91c910ca92a55e37f8254ace805c0 Mon Sep 17 00:00:00 2001 +From: Jiang Jiang +Date: Mon, 6 Dec 2010 13:07:36 +0100 +Subject: [PATCH] Fix QTextEdit::selectAll crash from textChanged() + +Doing selectAll() after the entire block of text has been removed +will cause this crash, because we didn't check if the block we +found is valid or not. + +Task-number: QTBUG-15857 +Reviewed-by: Eskil +--- + src/gui/text/qtextcursor.cpp | 3 +++ + 1 files changed, 3 insertions(+), 0 deletions(-) + +diff --git a/src/gui/text/qtextcursor.cpp b/src/gui/text/qtextcursor.cpp +index 769ab2f..f73cc4b 100644 +--- a/src/gui/text/qtextcursor.cpp ++++ b/src/gui/text/qtextcursor.cpp +@@ -363,6 +363,9 @@ bool QTextCursorPrivate::movePosition(QTextCursor::MoveOperation op, QTextCursor + bool adjustX = true; + QTextBlock blockIt = block(); + ++ if (!blockIt.isValid()) ++ return false; ++ + if (op >= QTextCursor::Left && op <= QTextCursor::WordRight + && blockIt.textDirection() == Qt::RightToLeft) { + if (op == QTextCursor::Left) +-- +1.6.1 + diff -r 3ea9f2d8e3a1 -r 20c7c65ea549 qt4/stuff/fix-scroll-when-last-item-is-removed.patch --- a/qt4/stuff/fix-scroll-when-last-item-is-removed.patch Wed Feb 16 01:53:55 2011 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,38 +0,0 @@ -From 6da6b7099d4e0b49329793e4b90703ec3d868048 Mon Sep 17 00:00:00 2001 -From: Frank Reininghaus -Date: Wed, 22 Sep 2010 10:19:59 +0200 -Subject: [PATCH] QTreeView: do not scroll to top if last item is removed - -When the last item is the current item and is removed, -QTreeViewPrivate::updateScrollBars() is called after QTreeViewPrivate's -viewItems member is cleared. This commit makes sure that viewItems is -restored by calling QTreeView::doItemsLayout() in this case, preventing -that the scroll bar range is set to zero temporarily and the view is -scrolled to the top unexpectedly (this was a regression in 4.7.0: -QTBUG-13567). - -Merge-request: 2481 -Reviewed-by: Olivier Goffart ---- - src/gui/itemviews/qtreeview.cpp | 4 ++++ - tests/auto/qtreeview/tst_qtreeview.cpp | 22 ++++++++++++++++++++++ - 2 files changed, 26 insertions(+), 0 deletions(-) - -diff --git a/src/gui/itemviews/qtreeview.cpp b/src/gui/itemviews/qtreeview.cpp -index b797776..40b51fe 100644 ---- a/src/gui/itemviews/qtreeview.cpp -+++ b/src/gui/itemviews/qtreeview.cpp -@@ -3435,6 +3435,10 @@ void QTreeViewPrivate::updateScrollBars() - if (!viewportSize.isValid()) - viewportSize = QSize(0, 0); - -+ if (viewItems.isEmpty()) { -+ q->doItemsLayout(); -+ } -+ - int itemsInViewport = 0; - if (uniformRowHeights) { - if (defaultItemHeight <= 0) --- -1.6.1 - diff -r 3ea9f2d8e3a1 -r 20c7c65ea549 qtconfig/receipt --- a/qtconfig/receipt Wed Feb 16 01:53:55 2011 +0000 +++ b/qtconfig/receipt Wed Feb 16 06:48:23 2011 +0000 @@ -13,7 +13,6 @@ # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { - _pkg="$WOK/$WANTED/$SOURCE-$VERSION/_pkg" mkdir -p $fs/usr/bin $fs/usr/share/qt/translations cp -a $_pkg/usr/bin/qtconfig $fs/usr/bin cp -a $_pkg/usr/share/qt/translations/qtconfig*.qm $fs/usr/share/qt/translations