wok-6.x rev 8666
Updated qt4 with upstream fixes.
| author | Christopher Rogers <slaxemulator@gmail.com> |
|---|---|
| date | Wed Feb 16 06:48:23 2011 +0000 (2011-02-16) |
| parents | 3ea9f2d8e3a1 |
| children | dcbf930501e9 |
| files | Qt4-dev/receipt QtDesigner/receipt libQt3Support/receipt libQtClucene/receipt libQtCore/receipt libQtDBus/receipt libQtDesigner/receipt libQtGui/receipt libQtHelp/receipt libQtNetwork/receipt libQtOpenGL/receipt libQtScript/receipt libQtSql/receipt libQtSvg/receipt libQtTest/receipt libQtWebkit/receipt libQtXml/receipt qmake/receipt qt4-phonon/receipt qt4/receipt qt4/stuff/add-postgresql9.patch qt4/stuff/fix-multisampling-with-ati-card.patch qt4/stuff/fix-qtbug-15857.patch qt4/stuff/fix-scroll-when-last-item-is-removed.patch qtconfig/receipt |
line diff
1.1 --- a/Qt4-dev/receipt Wed Feb 16 01:53:55 2011 +0000 1.2 +++ b/Qt4-dev/receipt Wed Feb 16 06:48:23 2011 +0000 1.3 @@ -8,7 +8,7 @@ 1.4 DEPENDS="QtDesigner jpeg tiff libpng mesa libglu-mesa \ 1.5 freetds libmysqlclient libpostgresqlclient libunixODBC xcb-util \ 1.6 libQt3Support libQtClucene libQtDBus libQtHelp libQtOpenGL \ 1.7 -libQtScript libQtSql libQtWebkit qtconfig gcc-lib-base" 1.8 +libQtScript libQtSql libQtWebkit libQtTest qtconfig gcc-lib-base" 1.9 SUGGESTED="libmng nvidia" 1.10 WEB_SITE="http://qt.nokia.com/" 1.11 WANTED="qt4" 1.12 @@ -18,7 +18,6 @@ 1.13 genpkg_rules() 1.14 { 1.15 mkdir -p $fs/usr/lib 1.16 - _pkg="$WOK/$WANTED/$SOURCE-$VERSION/_pkg" 1.17 cp -a $_pkg/usr/include $fs/usr 1.18 cp -a $_pkg/usr/lib/pkgconfig $fs/usr/lib 1.19 cp -a $_pkg/usr/lib/*.*a $fs/usr/lib/
2.1 --- a/QtDesigner/receipt Wed Feb 16 01:53:55 2011 +0000 2.2 +++ b/QtDesigner/receipt Wed Feb 16 06:48:23 2011 +0000 2.3 @@ -9,7 +9,6 @@ 2.4 expat fontconfig freetype glib xorg-libICE xorg-libSM xorg-libX11 xorg-libXau \ 2.5 xorg-libXdmcp xorg-libXext xorg-libXi xorg-libXrandr xorg-libXrender zlib \ 2.6 libpng gcc-lib-base" 2.7 -TARBALL="$PACKAGE-$VERSION.tar.gz" 2.8 WEB_SITE="http://qt.nokia.com/" 2.9 WANTED="qt4" 2.10 SOURCE="qt-everywhere-opensource-src" 2.11 @@ -21,8 +20,7 @@ 2.12 mkdir -p $fs/usr/bin \ 2.13 $fs/usr/share/pixmaps \ 2.14 $fs/usr/share/applications 2.15 - src="$WOK/$WANTED/$SOURCE-$VERSION" 2.16 - _pkg="$src/_pkg" 2.17 + 2.18 cp -a $_pkg/usr/bin/designer* $fs/usr/bin 2.19 cp -a $_pkg/usr/bin/linguist* $fs/usr/bin 2.20 cp -a $_pkg/usr/bin/assistant* $fs/usr/bin
3.1 --- a/libQt3Support/receipt Wed Feb 16 01:53:55 2011 +0000 3.2 +++ b/libQt3Support/receipt Wed Feb 16 06:48:23 2011 +0000 3.3 @@ -6,15 +6,14 @@ 3.4 SHORT_DESC="Qt3 support Library" 3.5 MAINTAINER="allan316@gmail.com" 3.6 DEPENDS="libQtGui libQtSql libQtXml" 3.7 -TARBALL="$PACKAGE-$VERSION.tar.gz" 3.8 WEB_SITE="http://qt.nokia.com/" 3.9 WANTED="qt4" 3.10 SOURCE="qt-everywhere-opensource-src" 3.11 + 3.12 # Rules to gen a SliTaz package suitable for Tazpkg. 3.13 genpkg_rules() 3.14 { 3.15 mkdir -p $fs/usr/lib 3.16 - _pkg="$WOK/$WANTED/$SOURCE-$VERSION/_pkg" 3.17 cp -a $_pkg/usr/lib/libQt3Support.so* $fs/usr/lib 3.18 } 3.19
4.1 --- a/libQtClucene/receipt Wed Feb 16 01:53:55 2011 +0000 4.2 +++ b/libQtClucene/receipt Wed Feb 16 06:48:23 2011 +0000 4.3 @@ -6,15 +6,14 @@ 4.4 SHORT_DESC="Qt clucene Library" 4.5 MAINTAINER="allan316@gmail.com" 4.6 DEPENDS="libQtCore" 4.7 -TARBALL="$PACKAGE-$VERSION.tar.gz" 4.8 WEB_SITE="http://qt.nokia.com/" 4.9 WANTED="qt4" 4.10 SOURCE="qt-everywhere-opensource-src" 4.11 + 4.12 # Rules to gen a SliTaz package suitable for Tazpkg. 4.13 genpkg_rules() 4.14 { 4.15 mkdir -p $fs/usr/lib 4.16 - _pkg="$WOK/$WANTED/$SOURCE-$VERSION/_pkg" 4.17 cp -a $_pkg/usr/lib/libQtCLucene.so* $fs/usr/lib 4.18 } 4.19
5.1 --- a/libQtCore/receipt Wed Feb 16 01:53:55 2011 +0000 5.2 +++ b/libQtCore/receipt Wed Feb 16 06:48:23 2011 +0000 5.3 @@ -6,7 +6,6 @@ 5.4 SHORT_DESC="Qt Core files" 5.5 MAINTAINER="allan316@gmail.com" 5.6 DEPENDS="glib zlib gcc-lib-base" 5.7 -TARBALL="$PACKAGE-$VERSION.tar.gz" 5.8 WEB_SITE="http://qt.nokia.com/" 5.9 WANTED="qt4" 5.10 SOURCE="qt-everywhere-opensource-src" 5.11 @@ -15,8 +14,6 @@ 5.12 genpkg_rules() 5.13 { 5.14 mkdir -p $fs/usr/lib 5.15 - _pkg="$WOK/$WANTED/$SOURCE-$VERSION/_pkg" 5.16 cp -a $_pkg/usr/lib/libQtCore.so* $fs/usr/lib 5.17 - 5.18 } 5.19
6.1 --- a/libQtDBus/receipt Wed Feb 16 01:53:55 2011 +0000 6.2 +++ b/libQtDBus/receipt Wed Feb 16 06:48:23 2011 +0000 6.3 @@ -6,15 +6,14 @@ 6.4 SHORT_DESC="Qt Dbus Library" 6.5 MAINTAINER="allan316@gmail.com" 6.6 DEPENDS="libQtXml" 6.7 -TARBALL="$PACKAGE-$VERSION.tar.gz" 6.8 WEB_SITE="http://qt.nokia.com/" 6.9 WANTED="qt4" 6.10 SOURCE="qt-everywhere-opensource-src" 6.11 + 6.12 # Rules to gen a SliTaz package suitable for Tazpkg. 6.13 genpkg_rules() 6.14 { 6.15 mkdir -p $fs/usr/lib 6.16 - _pkg="$WOK/$WANTED/$SOURCE-$VERSION/_pkg" 6.17 cp -a $_pkg/usr/lib/libQtDBus.so* $fs/usr/lib 6.18 } 6.19
7.1 --- a/libQtDesigner/receipt Wed Feb 16 01:53:55 2011 +0000 7.2 +++ b/libQtDesigner/receipt Wed Feb 16 06:48:23 2011 +0000 7.3 @@ -6,7 +6,6 @@ 7.4 SHORT_DESC="Qt Designer" 7.5 MAINTAINER="allan316@gmail.com" 7.6 DEPENDS="libQtCore libQtGui libQtScript libQtXml" 7.7 -TARBALL="$PACKAGE-$VERSION.tar.gz" 7.8 WEB_SITE="http://www.trolltech.com" 7.9 WANTED="qt4" 7.10 SOURCE="qt-everywhere-opensource-src" 7.11 @@ -15,7 +14,6 @@ 7.12 genpkg_rules() 7.13 { 7.14 mkdir -p $fs/usr/lib 7.15 - _pkg="$WOK/$WANTED/$SOURCE-$VERSION/_pkg" 7.16 cp -a $_pkg/usr/lib/libQtDesigner*.so* $fs/usr/lib 7.17 } 7.18
8.1 --- a/libQtGui/receipt Wed Feb 16 01:53:55 2011 +0000 8.2 +++ b/libQtGui/receipt Wed Feb 16 06:48:23 2011 +0000 8.3 @@ -8,7 +8,6 @@ 8.4 DEPENDS="libQtCore expat fontconfig freetype xorg-libICE xorg-libSM \ 8.5 xorg-libX11 xorg-libXau xorg-libXdmcp xorg-libXext xorg-libXi xorg-libXrandr \ 8.6 xorg-libXrender libpng libegl-mesa" 8.7 -TARBALL="$PACKAGE-$VERSION.tar.gz" 8.8 WEB_SITE="http://qt.nokia.com/" 8.9 WANTED="qt4" 8.10 SOURCE="qt-everywhere-opensource-src" 8.11 @@ -17,7 +16,6 @@ 8.12 genpkg_rules() 8.13 { 8.14 mkdir -p $fs/usr/lib 8.15 - _pkg="$WOK/$WANTED/$SOURCE-$VERSION/_pkg" 8.16 cp -a $_pkg/usr/lib/libQtGui.so* $fs/usr/lib 8.17 } 8.18
9.1 --- a/libQtHelp/receipt Wed Feb 16 01:53:55 2011 +0000 9.2 +++ b/libQtHelp/receipt Wed Feb 16 06:48:23 2011 +0000 9.3 @@ -6,15 +6,14 @@ 9.4 SHORT_DESC="Qt help Library" 9.5 MAINTAINER="allan316@gmail.com" 9.6 DEPENDS="libQtGui libQtClucene libQtSql libQtXml" 9.7 -TARBALL="$PACKAGE-$VERSION.tar.gz" 9.8 WEB_SITE="http://qt.nokia.com/" 9.9 WANTED="qt4" 9.10 SOURCE="qt-everywhere-opensource-src" 9.11 + 9.12 # Rules to gen a SliTaz package suitable for Tazpkg. 9.13 genpkg_rules() 9.14 { 9.15 mkdir -p $fs/usr/lib 9.16 - _pkg="$WOK/$WANTED/$SOURCE-$VERSION/_pkg" 9.17 cp -a $_pkg/usr/lib/libQtHelp.so* $fs/usr/lib 9.18 } 9.19
10.1 --- a/libQtNetwork/receipt Wed Feb 16 01:53:55 2011 +0000 10.2 +++ b/libQtNetwork/receipt Wed Feb 16 06:48:23 2011 +0000 10.3 @@ -6,7 +6,6 @@ 10.4 SHORT_DESC="Qt Network Library" 10.5 MAINTAINER="allan316@gmail.com" 10.6 DEPENDS="libQtCore" 10.7 -TARBALL="$PACKAGE-$VERSION.tar.gz" 10.8 WEB_SITE="http://qt.nokia.com/" 10.9 WANTED="qt4" 10.10 SOURCE="qt-everywhere-opensource-src" 10.11 @@ -15,7 +14,6 @@ 10.12 genpkg_rules() 10.13 { 10.14 mkdir -p $fs/usr/lib 10.15 - _pkg="$WOK/$WANTED/$SOURCE-$VERSION/_pkg" 10.16 cp -a $_pkg/usr/lib/libQtNetwork.so* $fs/usr/lib 10.17 } 10.18
11.1 --- a/libQtOpenGL/receipt Wed Feb 16 01:53:55 2011 +0000 11.2 +++ b/libQtOpenGL/receipt Wed Feb 16 06:48:23 2011 +0000 11.3 @@ -6,7 +6,6 @@ 11.4 SHORT_DESC="Qt Network Library" 11.5 MAINTAINER="allan316@gmail.com" 11.6 DEPENDS="libQtGui mesa libglu-mesa xorg-libXxf86vm xorg-libXdamage libdrm" 11.7 -TARBALL="$PACKAGE-$VERSION.tar.gz" 11.8 WEB_SITE="http://qt.nokia.com/" 11.9 WANTED="qt4" 11.10 SOURCE="qt-everywhere-opensource-src" 11.11 @@ -15,7 +14,6 @@ 11.12 genpkg_rules() 11.13 { 11.14 mkdir -p $fs/usr/lib 11.15 - _pkg="$WOK/$WANTED/$SOURCE-$VERSION/_pkg" 11.16 cp -a $_pkg/usr/lib/libQtOpenGL.so* $fs/usr/lib 11.17 } 11.18
12.1 --- a/libQtScript/receipt Wed Feb 16 01:53:55 2011 +0000 12.2 +++ b/libQtScript/receipt Wed Feb 16 06:48:23 2011 +0000 12.3 @@ -6,7 +6,6 @@ 12.4 SHORT_DESC="Qt Script Lib" 12.5 MAINTAINER="allan316@gmail.com" 12.6 DEPENDS="libQtCore" 12.7 -TARBALL="$PACKAGE-$VERSION.tar.gz" 12.8 WEB_SITE="http://qt.nokia.com/" 12.9 WANTED="qt4" 12.10 SOURCE="qt-everywhere-opensource-src" 12.11 @@ -15,7 +14,6 @@ 12.12 genpkg_rules() 12.13 { 12.14 mkdir -p $fs/usr/lib 12.15 - _pkg="$WOK/$WANTED/$SOURCE-$VERSION/_pkg" 12.16 cp -a $_pkg/usr/lib/libQtScript.so* $fs/usr/lib 12.17 } 12.18
13.1 --- a/libQtSql/receipt Wed Feb 16 01:53:55 2011 +0000 13.2 +++ b/libQtSql/receipt Wed Feb 16 06:48:23 2011 +0000 13.3 @@ -6,15 +6,14 @@ 13.4 SHORT_DESC="Qt sql Library" 13.5 MAINTAINER="allan316@gmail.com" 13.6 DEPENDS="libQtCore" 13.7 -TARBALL="$PACKAGE-$VERSION.tar.gz" 13.8 WEB_SITE="http://qt.nokia.com/" 13.9 WANTED="qt4" 13.10 SOURCE="qt-everywhere-opensource-src" 13.11 + 13.12 # Rules to gen a SliTaz package suitable for Tazpkg. 13.13 genpkg_rules() 13.14 { 13.15 mkdir -p $fs/usr/lib 13.16 - _pkg="$WOK/$WANTED/$SOURCE-$VERSION/_pkg" 13.17 cp -a $_pkg/usr/lib/libQtSql.so* $fs/usr/lib 13.18 } 13.19
14.1 --- a/libQtSvg/receipt Wed Feb 16 01:53:55 2011 +0000 14.2 +++ b/libQtSvg/receipt Wed Feb 16 06:48:23 2011 +0000 14.3 @@ -6,7 +6,6 @@ 14.4 SHORT_DESC="Qt Svg Library" 14.5 MAINTAINER="allan316@gmail.com" 14.6 DEPENDS="libQtCore libQtGui libQtXml libpng" 14.7 -TARBALL="$PACKAGE-$VERSION.tar.gz" 14.8 WEB_SITE="http://qt.nokia.com/" 14.9 WANTED="qt4" 14.10 SOURCE="qt-everywhere-opensource-src" 14.11 @@ -15,7 +14,6 @@ 14.12 genpkg_rules() 14.13 { 14.14 mkdir -p $fs/usr/lib 14.15 - _pkg="$WOK/$WANTED/$SOURCE-$VERSION/_pkg" 14.16 cp -a $_pkg/usr/lib/libQtSvg.so* $fs/usr/lib 14.17 } 14.18
15.1 --- a/libQtTest/receipt Wed Feb 16 01:53:55 2011 +0000 15.2 +++ b/libQtTest/receipt Wed Feb 16 06:48:23 2011 +0000 15.3 @@ -6,7 +6,6 @@ 15.4 SHORT_DESC="Qt Test library" 15.5 MAINTAINER="rocky@slitaz.com" 15.6 DEPENDS="libQtCore" 15.7 -TARBALL="$PACKAGE-$VERSION.tar.gz" 15.8 WEB_SITE="http://qt.nokia.com/" 15.9 WANTED="qt4" 15.10 SOURCE="qt-everywhere-opensource-src" 15.11 @@ -15,7 +14,6 @@ 15.12 genpkg_rules() 15.13 { 15.14 mkdir -p $fs/usr/lib 15.15 - _pkg="$WOK/$WANTED/$SOURCE-$VERSION/_pkg" 15.16 cp -a $_pkg/usr/lib/libQtTest.so* $fs/usr/lib 15.17 } 15.18
16.1 --- a/libQtWebkit/receipt Wed Feb 16 01:53:55 2011 +0000 16.2 +++ b/libQtWebkit/receipt Wed Feb 16 06:48:23 2011 +0000 16.3 @@ -6,7 +6,6 @@ 16.4 SHORT_DESC="Web browser engine for Qt" 16.5 MAINTAINER="allan316@gmail.com" 16.6 DEPENDS="libQtCore libQtGui libQtNetwork libpng" 16.7 -TARBALL="$PACKAGE-$VERSION.tar.gz" 16.8 WEB_SITE="http://qt.nokia.com/" 16.9 WANTED="qt4" 16.10 SOURCE="qt-everywhere-opensource-src" 16.11 @@ -15,7 +14,6 @@ 16.12 genpkg_rules() 16.13 { 16.14 mkdir -p $fs/usr/lib 16.15 - _pkg="$WOK/$WANTED/$SOURCE-$VERSION/_pkg" 16.16 cp -a $_pkg/usr/lib/libQtWebKit.so* $fs/usr/lib 16.17 } 16.18
17.1 --- a/libQtXml/receipt Wed Feb 16 01:53:55 2011 +0000 17.2 +++ b/libQtXml/receipt Wed Feb 16 06:48:23 2011 +0000 17.3 @@ -6,7 +6,6 @@ 17.4 SHORT_DESC="Qt Xml library" 17.5 MAINTAINER="allan316@gmail.com" 17.6 DEPENDS="libQtNetwork" 17.7 -TARBALL="$PACKAGE-$VERSION.tar.gz" 17.8 WEB_SITE="http://qt.nokia.com/" 17.9 WANTED="qt4" 17.10 SOURCE="qt-everywhere-opensource-src" 17.11 @@ -15,7 +14,6 @@ 17.12 genpkg_rules() 17.13 { 17.14 mkdir -p $fs/usr/lib 17.15 - _pkg="$WOK/$WANTED/$SOURCE-$VERSION/_pkg" 17.16 cp -a $_pkg/usr/lib/libQtXml.so* $fs/usr/lib 17.17 cp -a $_pkg/usr/lib/libQtXmlPatterns.so* $fs/usr/lib 17.18 }
18.1 --- a/qmake/receipt Wed Feb 16 01:53:55 2011 +0000 18.2 +++ b/qmake/receipt Wed Feb 16 06:48:23 2011 +0000 18.3 @@ -16,7 +16,6 @@ 18.4 genpkg_rules() 18.5 { 18.6 mkdir -p $fs/usr/bin 18.7 - _pkg="$WOK/$WANTED/$SOURCE-$VERSION/_pkg" 18.8 cp -a $_pkg/usr/bin/qmake $fs/usr/bin 18.9 cp -a $_pkg/usr/bin/moc $fs/usr/bin 18.10 cp -a $_pkg/usr/bin/uic $fs/usr/bin
19.1 --- a/qt4-phonon/receipt Wed Feb 16 01:53:55 2011 +0000 19.2 +++ b/qt4-phonon/receipt Wed Feb 16 06:48:23 2011 +0000 19.3 @@ -15,6 +15,5 @@ 19.4 genpkg_rules() 19.5 { 19.6 mkdir -p $fs/usr/lib 19.7 - _pkg="$WOK/$WANTED/$SOURCE-$VERSION/_pkg" 19.8 cp -a $_pkg/usr/lib/libphonon.so* $fs/usr/lib 19.9 }
20.1 --- a/qt4/receipt Wed Feb 16 01:53:55 2011 +0000 20.2 +++ b/qt4/receipt Wed Feb 16 06:48:23 2011 +0000 20.3 @@ -27,7 +27,11 @@ 20.4 compile_rules() 20.5 { 20.6 cd $src 20.7 - 20.8 + 20.9 + # Already fixed upstream 20.10 + patch -Np1 -i ../stuff/fix-qtbug-15857.patch 20.11 + patch -Np1 -i ../stuff/add-postgresql9.patch 20.12 + 20.13 ./configure -v \ 20.14 -prefix /usr \ 20.15 -confirm-license -opensource \
21.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 21.2 +++ b/qt4/stuff/add-postgresql9.patch Wed Feb 16 06:48:23 2011 +0000 21.3 @@ -0,0 +1,215 @@ 21.4 +From 03f94089a16cf6b6a3b533ba1f90444eb18c29ab Mon Sep 17 00:00:00 2001 21.5 +From: Charles Yin <charles.yin@nokia.com> 21.6 +Date: Thu, 4 Nov 2010 15:38:57 +1000 21.7 +Subject: [PATCH] Add Postgresql 8.x and 9 supports 21.8 + 21.9 +Change-Id: Ic740686ead768cc3e106703049d878549dfd3c6a 21.10 +Task-number:QTBUG-14206 21.11 +Reviewed-by: Michael Goddard 21.12 +--- 21.13 + src/sql/drivers/psql/qsql_psql.cpp | 116 +++++++++++++++++++++--------- 21.14 + src/sql/drivers/psql/qsql_psql.h | 6 ++- 21.15 + tests/auto/qsqldatabase/tst_databases.h | 2 + 21.16 + 3 files changed, 88 insertions(+), 36 deletions(-) 21.17 + 21.18 +diff --git a/src/sql/drivers/psql/qsql_psql.cpp b/src/sql/drivers/psql/qsql_psql.cpp 21.19 +index 2a4e595..bf9685f 100644 21.20 +--- a/src/sql/drivers/psql/qsql_psql.cpp 21.21 ++++ b/src/sql/drivers/psql/qsql_psql.cpp 21.22 +@@ -54,7 +54,6 @@ 21.23 + #include <qstringlist.h> 21.24 + #include <qmutex.h> 21.25 + 21.26 +- 21.27 + #include <libpq-fe.h> 21.28 + #include <pg_config.h> 21.29 + 21.30 +@@ -619,6 +618,50 @@ static void setDatestyle(PGconn* connection) 21.31 + PQclear(result); 21.32 + } 21.33 + 21.34 ++static QPSQLDriver::Protocol qMakePSQLVersion(int vMaj, int vMin) 21.35 ++{ 21.36 ++ switch (vMaj) { 21.37 ++ case 6: 21.38 ++ return QPSQLDriver::Version6; 21.39 ++ case 7: 21.40 ++ { 21.41 ++ switch (vMin) { 21.42 ++ case 1: 21.43 ++ return QPSQLDriver::Version71; 21.44 ++ case 3: 21.45 ++ return QPSQLDriver::Version73; 21.46 ++ case 4: 21.47 ++ return QPSQLDriver::Version74; 21.48 ++ default: 21.49 ++ return QPSQLDriver::Version7; 21.50 ++ } 21.51 ++ break; 21.52 ++ } 21.53 ++ case 8: 21.54 ++ { 21.55 ++ switch (vMin) { 21.56 ++ case 1: 21.57 ++ return QPSQLDriver::Version81; 21.58 ++ case 2: 21.59 ++ return QPSQLDriver::Version82; 21.60 ++ case 3: 21.61 ++ return QPSQLDriver::Version83; 21.62 ++ case 4: 21.63 ++ return QPSQLDriver::Version84; 21.64 ++ default: 21.65 ++ return QPSQLDriver::Version8; 21.66 ++ } 21.67 ++ break; 21.68 ++ } 21.69 ++ case 9: 21.70 ++ return QPSQLDriver::Version9; 21.71 ++ break; 21.72 ++ default: 21.73 ++ break; 21.74 ++ } 21.75 ++ return QPSQLDriver::VersionUnknown; 21.76 ++} 21.77 ++ 21.78 + static QPSQLDriver::Protocol getPSQLVersion(PGconn* connection) 21.79 + { 21.80 + QPSQLDriver::Protocol serverVersion = QPSQLDriver::Version6; 21.81 +@@ -626,50 +669,44 @@ static QPSQLDriver::Protocol getPSQLVersion(PGconn* connection) 21.82 + int status = PQresultStatus(result); 21.83 + if (status == PGRES_COMMAND_OK || status == PGRES_TUPLES_OK) { 21.84 + QString val = QString::fromAscii(PQgetvalue(result, 0, 0)); 21.85 ++ 21.86 + QRegExp rx(QLatin1String("(\\d+)\\.(\\d+)")); 21.87 + rx.setMinimal(true); // enforce non-greedy RegExp 21.88 ++ 21.89 + if (rx.indexIn(val) != -1) { 21.90 + int vMaj = rx.cap(1).toInt(); 21.91 + int vMin = rx.cap(2).toInt(); 21.92 +- 21.93 +- switch (vMaj) { 21.94 +- case 7: 21.95 +- switch (vMin) { 21.96 +- case 0: 21.97 +- serverVersion = QPSQLDriver::Version7; 21.98 +- break; 21.99 +- case 1: 21.100 +- case 2: 21.101 +- serverVersion = QPSQLDriver::Version71; 21.102 +- break; 21.103 +- default: 21.104 +- serverVersion = QPSQLDriver::Version73; 21.105 +- break; 21.106 +- } 21.107 +- break; 21.108 +- case 8: 21.109 +- switch (vMin) { 21.110 +- case 0: 21.111 +- serverVersion = QPSQLDriver::Version8; 21.112 +- break; 21.113 +- case 1: 21.114 +- serverVersion = QPSQLDriver::Version81; 21.115 +- break; 21.116 +- case 2: 21.117 +- default: 21.118 +- serverVersion = QPSQLDriver::Version82; 21.119 +- break; 21.120 +- } 21.121 +- break; 21.122 +- default: 21.123 +- break; 21.124 ++ serverVersion = qMakePSQLVersion(vMaj, vMin); 21.125 ++#ifdef PG_MAJORVERSION 21.126 ++ if (rx.indexIn(QLatin1String(PG_MAJORVERSION)) != -1) { 21.127 ++ vMaj = rx.cap(1).toInt(); 21.128 ++ vMin = rx.cap(2).toInt(); 21.129 ++ } 21.130 ++ QPSQLDriver::Protocol clientVersion = qMakePSQLVersion(vMaj, vMin); 21.131 ++ 21.132 ++ if (serverVersion >= QPSQLDriver::Version9 && clientVersion < QPSQLDriver::Version9) { 21.133 ++ //Client version before QPSQLDriver::Version9 only supports escape mode for bytea type, 21.134 ++ //but bytea format is set to hex by default in PSQL 9 and above. So need to force the 21.135 ++ //server use the old escape mode when connects to the new server with old client library. 21.136 ++ result = PQexec(connection, "SET bytea_output=escape; "); 21.137 ++ status = PQresultStatus(result); 21.138 ++ } else if (serverVersion == QPSQLDriver::VersionUnknown) { 21.139 ++ serverVersion = clientVersion; 21.140 ++ if (serverVersion != QPSQLDriver::VersionUnknown) 21.141 ++ qWarning("The server version of this PostgreSQL is unknown, falling back to the client version."); 21.142 + } 21.143 ++#endif 21.144 + } 21.145 + } 21.146 + PQclear(result); 21.147 + 21.148 +- if (serverVersion < QPSQLDriver::Version71) 21.149 ++ //keep the old behavior unchanged 21.150 ++ if (serverVersion == QPSQLDriver::VersionUnknown) 21.151 ++ serverVersion = QPSQLDriver::Version6; 21.152 ++ 21.153 ++ if (serverVersion < QPSQLDriver::Version71) { 21.154 + qWarning("This version of PostgreSQL is not supported and may not work."); 21.155 ++ } 21.156 + 21.157 + return serverVersion; 21.158 + } 21.159 +@@ -852,7 +889,10 @@ bool QPSQLDriver::commitTransaction() 21.160 + // This hack can dissapear once there is an API to query this sort of information. 21.161 + if (d->pro == QPSQLDriver::Version8 || 21.162 + d->pro == QPSQLDriver::Version81 || 21.163 +- d->pro == QPSQLDriver::Version82) { 21.164 ++ d->pro == QPSQLDriver::Version82 || 21.165 ++ d->pro == QPSQLDriver::Version83 || 21.166 ++ d->pro == QPSQLDriver::Version84 || 21.167 ++ d->pro == QPSQLDriver::Version9) { 21.168 + transaction_failed = qstrcmp(PQcmdStatus(res), "ROLLBACK") == 0; 21.169 + } 21.170 + 21.171 +@@ -963,6 +1003,9 @@ QSqlIndex QPSQLDriver::primaryIndex(const QString& tablename) const 21.172 + case QPSQLDriver::Version8: 21.173 + case QPSQLDriver::Version81: 21.174 + case QPSQLDriver::Version82: 21.175 ++ case QPSQLDriver::Version83: 21.176 ++ case QPSQLDriver::Version84: 21.177 ++ case QPSQLDriver::Version9: 21.178 + stmt = QLatin1String("SELECT pg_attribute.attname, pg_attribute.atttypid::int, " 21.179 + "pg_class.relname " 21.180 + "FROM pg_attribute, pg_class " 21.181 +@@ -1046,6 +1089,9 @@ QSqlRecord QPSQLDriver::record(const QString& tablename) const 21.182 + case QPSQLDriver::Version8: 21.183 + case QPSQLDriver::Version81: 21.184 + case QPSQLDriver::Version82: 21.185 ++ case QPSQLDriver::Version83: 21.186 ++ case QPSQLDriver::Version84: 21.187 ++ case QPSQLDriver::Version9: 21.188 + stmt = QLatin1String("select pg_attribute.attname, pg_attribute.atttypid::int, " 21.189 + "pg_attribute.attnotnull, pg_attribute.attlen, pg_attribute.atttypmod, " 21.190 + "pg_attrdef.adsrc " 21.191 +diff --git a/src/sql/drivers/psql/qsql_psql.h b/src/sql/drivers/psql/qsql_psql.h 21.192 +index 22871ff..107da87 100644 21.193 +--- a/src/sql/drivers/psql/qsql_psql.h 21.194 ++++ b/src/sql/drivers/psql/qsql_psql.h 21.195 +@@ -97,6 +97,7 @@ class Q_EXPORT_SQLDRIVER_PSQL QPSQLDriver : public QSqlDriver 21.196 + Q_OBJECT 21.197 + public: 21.198 + enum Protocol { 21.199 ++ VersionUnknown = -1, 21.200 + Version6 = 6, 21.201 + Version7 = 7, 21.202 + Version71 = 8, 21.203 +@@ -104,7 +105,10 @@ public: 21.204 + Version74 = 10, 21.205 + Version8 = 11, 21.206 + Version81 = 12, 21.207 +- Version82 = 13 21.208 ++ Version82 = 13, 21.209 ++ Version83 = 14, 21.210 ++ Version84 = 15, 21.211 ++ Version9 = 16, 21.212 + }; 21.213 + 21.214 + explicit QPSQLDriver(QObject *parent=0); 21.215 + 21.216 +-- 21.217 +1.6.1 21.218 +
22.1 --- a/qt4/stuff/fix-multisampling-with-ati-card.patch Wed Feb 16 01:53:55 2011 +0000 22.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 22.3 @@ -1,25 +0,0 @@ 22.4 -From e48e50c460434c451c67403390d98f7418c77cce Mon Sep 17 00:00:00 2001 22.5 -From: Jonathan Liu <net147@gmail.com> 22.6 -Date: Wed, 25 Aug 2010 14:07:40 +1000 22.7 -Subject: [PATCH] Fix OpenGL multisampling for some graphics drivers 22.8 - 22.9 ---- 22.10 - src/opengl/qgl_win.cpp | 2 +- 22.11 - 1 files changed, 1 insertions(+), 1 deletions(-) 22.12 - 22.13 -diff --git a/src/opengl/qgl_win.cpp b/src/opengl/qgl_win.cpp 22.14 -index 5ab944a..8eb6177 100644 22.15 ---- a/src/opengl/qgl_win.cpp 22.16 -+++ b/src/opengl/qgl_win.cpp 22.17 -@@ -1042,7 +1042,7 @@ int QGLContext::choosePixelFormat(void* dummyPfd, HDC pdc) 22.18 - iAttributes[i++] = WGL_DRAW_TO_WINDOW_ARB; 22.19 - iAttributes[i++] = TRUE; 22.20 - iAttributes[i++] = WGL_COLOR_BITS_ARB; 22.21 -- iAttributes[i++] = 32; 22.22 -+ iAttributes[i++] = 24; 22.23 - iAttributes[i++] = WGL_DOUBLE_BUFFER_ARB; 22.24 - iAttributes[i++] = d->glFormat.doubleBuffer(); 22.25 - if (d->glFormat.stereo()) { 22.26 --- 22.27 -1.7.2.1 22.28 -
23.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 23.2 +++ b/qt4/stuff/fix-qtbug-15857.patch Wed Feb 16 06:48:23 2011 +0000 23.3 @@ -0,0 +1,32 @@ 23.4 +From 6ae84f1183e91c910ca92a55e37f8254ace805c0 Mon Sep 17 00:00:00 2001 23.5 +From: Jiang Jiang <jiang.jiang@nokia.com> 23.6 +Date: Mon, 6 Dec 2010 13:07:36 +0100 23.7 +Subject: [PATCH] Fix QTextEdit::selectAll crash from textChanged() 23.8 + 23.9 +Doing selectAll() after the entire block of text has been removed 23.10 +will cause this crash, because we didn't check if the block we 23.11 +found is valid or not. 23.12 + 23.13 +Task-number: QTBUG-15857 23.14 +Reviewed-by: Eskil 23.15 +--- 23.16 + src/gui/text/qtextcursor.cpp | 3 +++ 23.17 + 1 files changed, 3 insertions(+), 0 deletions(-) 23.18 + 23.19 +diff --git a/src/gui/text/qtextcursor.cpp b/src/gui/text/qtextcursor.cpp 23.20 +index 769ab2f..f73cc4b 100644 23.21 +--- a/src/gui/text/qtextcursor.cpp 23.22 ++++ b/src/gui/text/qtextcursor.cpp 23.23 +@@ -363,6 +363,9 @@ bool QTextCursorPrivate::movePosition(QTextCursor::MoveOperation op, QTextCursor 23.24 + bool adjustX = true; 23.25 + QTextBlock blockIt = block(); 23.26 + 23.27 ++ if (!blockIt.isValid()) 23.28 ++ return false; 23.29 ++ 23.30 + if (op >= QTextCursor::Left && op <= QTextCursor::WordRight 23.31 + && blockIt.textDirection() == Qt::RightToLeft) { 23.32 + if (op == QTextCursor::Left) 23.33 +-- 23.34 +1.6.1 23.35 +
24.1 --- a/qt4/stuff/fix-scroll-when-last-item-is-removed.patch Wed Feb 16 01:53:55 2011 +0000 24.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 24.3 @@ -1,38 +0,0 @@ 24.4 -From 6da6b7099d4e0b49329793e4b90703ec3d868048 Mon Sep 17 00:00:00 2001 24.5 -From: Frank Reininghaus <frank78ac@googlemail.com> 24.6 -Date: Wed, 22 Sep 2010 10:19:59 +0200 24.7 -Subject: [PATCH] QTreeView: do not scroll to top if last item is removed 24.8 - 24.9 -When the last item is the current item and is removed, 24.10 -QTreeViewPrivate::updateScrollBars() is called after QTreeViewPrivate's 24.11 -viewItems member is cleared. This commit makes sure that viewItems is 24.12 -restored by calling QTreeView::doItemsLayout() in this case, preventing 24.13 -that the scroll bar range is set to zero temporarily and the view is 24.14 -scrolled to the top unexpectedly (this was a regression in 4.7.0: 24.15 -QTBUG-13567). 24.16 - 24.17 -Merge-request: 2481 24.18 -Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com> 24.19 ---- 24.20 - src/gui/itemviews/qtreeview.cpp | 4 ++++ 24.21 - tests/auto/qtreeview/tst_qtreeview.cpp | 22 ++++++++++++++++++++++ 24.22 - 2 files changed, 26 insertions(+), 0 deletions(-) 24.23 - 24.24 -diff --git a/src/gui/itemviews/qtreeview.cpp b/src/gui/itemviews/qtreeview.cpp 24.25 -index b797776..40b51fe 100644 24.26 ---- a/src/gui/itemviews/qtreeview.cpp 24.27 -+++ b/src/gui/itemviews/qtreeview.cpp 24.28 -@@ -3435,6 +3435,10 @@ void QTreeViewPrivate::updateScrollBars() 24.29 - if (!viewportSize.isValid()) 24.30 - viewportSize = QSize(0, 0); 24.31 - 24.32 -+ if (viewItems.isEmpty()) { 24.33 -+ q->doItemsLayout(); 24.34 -+ } 24.35 -+ 24.36 - int itemsInViewport = 0; 24.37 - if (uniformRowHeights) { 24.38 - if (defaultItemHeight <= 0) 24.39 --- 24.40 -1.6.1 24.41 -
25.1 --- a/qtconfig/receipt Wed Feb 16 01:53:55 2011 +0000 25.2 +++ b/qtconfig/receipt Wed Feb 16 06:48:23 2011 +0000 25.3 @@ -13,7 +13,6 @@ 25.4 # Rules to gen a SliTaz package suitable for Tazpkg. 25.5 genpkg_rules() 25.6 { 25.7 - _pkg="$WOK/$WANTED/$SOURCE-$VERSION/_pkg" 25.8 mkdir -p $fs/usr/bin $fs/usr/share/qt/translations 25.9 cp -a $_pkg/usr/bin/qtconfig $fs/usr/bin 25.10 cp -a $_pkg/usr/share/qt/translations/qtconfig*.qm $fs/usr/share/qt/translations