# HG changeset patch # User Christopher Rogers # Date 1299343045 0 # Node ID 492d81d36df54414f41270de2751846bba398feb # Parent b93c62b5d9fc9b54cb3b4ced728ca29f2b67c913 Up: qt4 to 4.7.2. diff -r b93c62b5d9fc -r 492d81d36df5 Qt4-dev/receipt --- a/Qt4-dev/receipt Sat Mar 05 16:29:18 2011 +0000 +++ b/Qt4-dev/receipt Sat Mar 05 16:37:25 2011 +0000 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="Qt4-dev" -VERSION="4.7.1" +VERSION="4.7.2" CATEGORY="development" SHORT_DESC="qt x11 toolkit" MAINTAINER="allan316@gmail.com" diff -r b93c62b5d9fc -r 492d81d36df5 QtDesigner/receipt --- a/QtDesigner/receipt Sat Mar 05 16:29:18 2011 +0000 +++ b/QtDesigner/receipt Sat Mar 05 16:37:25 2011 +0000 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="QtDesigner" -VERSION="4.7.1" +VERSION="4.7.2" CATEGORY="development" SHORT_DESC="Qt Designer" MAINTAINER="allan316@gmail.com" diff -r b93c62b5d9fc -r 492d81d36df5 libQt3Support/receipt --- a/libQt3Support/receipt Sat Mar 05 16:29:18 2011 +0000 +++ b/libQt3Support/receipt Sat Mar 05 16:37:25 2011 +0000 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="libQt3Support" -VERSION="4.7.1" +VERSION="4.7.2" CATEGORY="development" SHORT_DESC="Qt3 support Library" MAINTAINER="allan316@gmail.com" diff -r b93c62b5d9fc -r 492d81d36df5 libQtClucene/receipt --- a/libQtClucene/receipt Sat Mar 05 16:29:18 2011 +0000 +++ b/libQtClucene/receipt Sat Mar 05 16:37:25 2011 +0000 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="libQtClucene" -VERSION="4.7.1" +VERSION="4.7.2" CATEGORY="development" SHORT_DESC="Qt clucene Library" MAINTAINER="allan316@gmail.com" diff -r b93c62b5d9fc -r 492d81d36df5 libQtCore/receipt --- a/libQtCore/receipt Sat Mar 05 16:29:18 2011 +0000 +++ b/libQtCore/receipt Sat Mar 05 16:37:25 2011 +0000 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="libQtCore" -VERSION="4.7.1" +VERSION="4.7.2" CATEGORY="development" SHORT_DESC="Qt Core files" MAINTAINER="allan316@gmail.com" diff -r b93c62b5d9fc -r 492d81d36df5 libQtDBus/receipt --- a/libQtDBus/receipt Sat Mar 05 16:29:18 2011 +0000 +++ b/libQtDBus/receipt Sat Mar 05 16:37:25 2011 +0000 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="libQtDBus" -VERSION="4.7.1" +VERSION="4.7.2" CATEGORY="development" SHORT_DESC="Qt Dbus Library" MAINTAINER="allan316@gmail.com" diff -r b93c62b5d9fc -r 492d81d36df5 libQtDesigner/receipt --- a/libQtDesigner/receipt Sat Mar 05 16:29:18 2011 +0000 +++ b/libQtDesigner/receipt Sat Mar 05 16:37:25 2011 +0000 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="libQtDesigner" -VERSION="4.7.1" +VERSION="4.7.2" CATEGORY="development" SHORT_DESC="Qt Designer" MAINTAINER="allan316@gmail.com" diff -r b93c62b5d9fc -r 492d81d36df5 libQtGui/receipt --- a/libQtGui/receipt Sat Mar 05 16:29:18 2011 +0000 +++ b/libQtGui/receipt Sat Mar 05 16:37:25 2011 +0000 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="libQtGui" -VERSION="4.7.1" +VERSION="4.7.2" CATEGORY="development" SHORT_DESC="Qt Gui Library" MAINTAINER="allan316@gmail.com" diff -r b93c62b5d9fc -r 492d81d36df5 libQtHelp/receipt --- a/libQtHelp/receipt Sat Mar 05 16:29:18 2011 +0000 +++ b/libQtHelp/receipt Sat Mar 05 16:37:25 2011 +0000 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="libQtHelp" -VERSION="4.7.1" +VERSION="4.7.2" CATEGORY="development" SHORT_DESC="Qt help Library" MAINTAINER="allan316@gmail.com" diff -r b93c62b5d9fc -r 492d81d36df5 libQtNetwork/receipt --- a/libQtNetwork/receipt Sat Mar 05 16:29:18 2011 +0000 +++ b/libQtNetwork/receipt Sat Mar 05 16:37:25 2011 +0000 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="libQtNetwork" -VERSION="4.7.1" +VERSION="4.7.2" CATEGORY="development" SHORT_DESC="Qt Network Library" MAINTAINER="allan316@gmail.com" diff -r b93c62b5d9fc -r 492d81d36df5 libQtOpenGL/receipt --- a/libQtOpenGL/receipt Sat Mar 05 16:29:18 2011 +0000 +++ b/libQtOpenGL/receipt Sat Mar 05 16:37:25 2011 +0000 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="libQtOpenGL" -VERSION="4.7.1" +VERSION="4.7.2" CATEGORY="development" SHORT_DESC="Qt Network Library" MAINTAINER="allan316@gmail.com" diff -r b93c62b5d9fc -r 492d81d36df5 libQtScript/receipt --- a/libQtScript/receipt Sat Mar 05 16:29:18 2011 +0000 +++ b/libQtScript/receipt Sat Mar 05 16:37:25 2011 +0000 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="libQtScript" -VERSION="4.7.1" +VERSION="4.7.2" CATEGORY="development" SHORT_DESC="Qt Script Lib" MAINTAINER="allan316@gmail.com" diff -r b93c62b5d9fc -r 492d81d36df5 libQtSql/receipt --- a/libQtSql/receipt Sat Mar 05 16:29:18 2011 +0000 +++ b/libQtSql/receipt Sat Mar 05 16:37:25 2011 +0000 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="libQtSql" -VERSION="4.7.1" +VERSION="4.7.2" CATEGORY="development" SHORT_DESC="Qt sql Library" MAINTAINER="allan316@gmail.com" diff -r b93c62b5d9fc -r 492d81d36df5 libQtSvg/receipt --- a/libQtSvg/receipt Sat Mar 05 16:29:18 2011 +0000 +++ b/libQtSvg/receipt Sat Mar 05 16:37:25 2011 +0000 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="libQtSvg" -VERSION="4.7.1" +VERSION="4.7.2" CATEGORY="development" SHORT_DESC="Qt Svg Library" MAINTAINER="allan316@gmail.com" diff -r b93c62b5d9fc -r 492d81d36df5 libQtTest/receipt --- a/libQtTest/receipt Sat Mar 05 16:29:18 2011 +0000 +++ b/libQtTest/receipt Sat Mar 05 16:37:25 2011 +0000 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="libQtTest" -VERSION="4.7.1" +VERSION="4.7.2" CATEGORY="development" SHORT_DESC="Qt Test library" MAINTAINER="rocky@slitaz.com" diff -r b93c62b5d9fc -r 492d81d36df5 libQtWebkit/receipt --- a/libQtWebkit/receipt Sat Mar 05 16:29:18 2011 +0000 +++ b/libQtWebkit/receipt Sat Mar 05 16:37:25 2011 +0000 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="libQtWebkit" -VERSION="4.7.1" +VERSION="4.7.2" CATEGORY="development" SHORT_DESC="Web browser engine for Qt" MAINTAINER="allan316@gmail.com" diff -r b93c62b5d9fc -r 492d81d36df5 libQtXml/receipt --- a/libQtXml/receipt Sat Mar 05 16:29:18 2011 +0000 +++ b/libQtXml/receipt Sat Mar 05 16:37:25 2011 +0000 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="libQtXml" -VERSION="4.7.1" +VERSION="4.7.2" CATEGORY="development" SHORT_DESC="Qt Xml library" MAINTAINER="allan316@gmail.com" diff -r b93c62b5d9fc -r 492d81d36df5 qmake/receipt --- a/qmake/receipt Sat Mar 05 16:29:18 2011 +0000 +++ b/qmake/receipt Sat Mar 05 16:37:25 2011 +0000 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="qmake" -VERSION="4.7.1" +VERSION="4.7.2" CATEGORY="development" SHORT_DESC="Qt make" MAINTAINER="allan316@gmail.com" diff -r b93c62b5d9fc -r 492d81d36df5 qt4-phonon/receipt --- a/qt4-phonon/receipt Sat Mar 05 16:29:18 2011 +0000 +++ b/qt4-phonon/receipt Sat Mar 05 16:37:25 2011 +0000 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="qt4-phonon" -VERSION="4.7.1" +VERSION="4.7.2" CATEGORY="multimedia" SHORT_DESC="Qt phonon library" MAINTAINER="pankso@slitaz.org" diff -r b93c62b5d9fc -r 492d81d36df5 qt4/receipt --- a/qt4/receipt Sat Mar 05 16:29:18 2011 +0000 +++ b/qt4/receipt Sat Mar 05 16:37:25 2011 +0000 @@ -2,7 +2,7 @@ PACKAGE="qt4" SOURCE="qt-everywhere-opensource-src" -VERSION="4.7.1" +VERSION="4.7.2" CATEGORY="meta" SHORT_DESC="qt x11 toolkit" MAINTAINER="allan316@gmail.com" @@ -27,10 +27,6 @@ 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 \ diff -r b93c62b5d9fc -r 492d81d36df5 qt4/stuff/add-postgresql9.patch --- a/qt4/stuff/add-postgresql9.patch Sat Mar 05 16:29:18 2011 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,215 +0,0 @@ -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 b93c62b5d9fc -r 492d81d36df5 qt4/stuff/fix-qtbug-15857.patch --- a/qt4/stuff/fix-qtbug-15857.patch Sat Mar 05 16:29:18 2011 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,32 +0,0 @@ -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 b93c62b5d9fc -r 492d81d36df5 qtconfig/receipt --- a/qtconfig/receipt Sat Mar 05 16:29:18 2011 +0000 +++ b/qtconfig/receipt Sat Mar 05 16:37:25 2011 +0000 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="qtconfig" -VERSION="4.7.1" +VERSION="4.7.2" CATEGORY="x-window" SHORT_DESC="Qtconfig is a tool that allows users to customize the default settings for Qt applications." MAINTAINER="slaxemulator@gmail.com" diff -r b93c62b5d9fc -r 492d81d36df5 qtconfig/stuff/qtconfig.desktop --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/qtconfig/stuff/qtconfig.desktop Sat Mar 05 16:37:25 2011 +0000 @@ -0,0 +1,10 @@ +[Desktop Entry] +Name=Qt Config +Comment=Configure Qt behavior, styles, fonts +Exec=/usr/bin/qtconfig +Icon=qtlogo +Terminal=false +Encoding=UTF-8 +Type=Application +Categories=Qt;Settings; +NoDisplay=true