Date: Thursday, September 1, 2011 @ 19:40:36 Author: andrea Revision: 136830
upgpkg: qt 4.7.4-1 upstream release Modified: qt/trunk/PKGBUILD Deleted: qt/trunk/qtbug-16292.patch -------------------+ PKGBUILD | 15 ++++-------- qtbug-16292.patch | 62 ---------------------------------------------------- 2 files changed, 5 insertions(+), 72 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2011-09-01 21:49:29 UTC (rev 136829) +++ PKGBUILD 2011-09-01 23:40:36 UTC (rev 136830) @@ -4,8 +4,8 @@ pkgbase=qt pkgname=('qt' 'qt-private-headers') -pkgver=4.7.3 -pkgrel=3 +pkgver=4.7.4 +pkgrel=1 arch=('i686' 'x86_64') url='http://qt.nokia.com/' license=('GPL3' 'LGPL') @@ -17,14 +17,12 @@ _pkgfqn="qt-everywhere-opensource-src-${pkgver}" source=("ftp://ftp.qt.nokia.com/qt/source/${_pkgfqn}.tar.gz" 'assistant.desktop' 'designer.desktop' 'linguist.desktop' - 'qtconfig.desktop' - 'qtbug-16292.patch') -md5sums=('49b96eefb1224cc529af6fe5608654fe' + 'qtconfig.desktop') +md5sums=('ddf7d83f912cf1283aa066368464fa22' 'fc211414130ab2764132e7370f8e5caa' '85179f5e0437514f8639957e1d8baf62' 'f11852b97583610f3dbb669ebc3e21bc' - '6b771c8a81dd90b45e8a79afa0e5bbfd' - 'dc7ed8c2e8c68a175f7f05a34dccc937') + '6b771c8a81dd90b45e8a79afa0e5bbfd') build() { unset QMAKESPEC @@ -37,9 +35,6 @@ cd $srcdir/$_pkgfqn - # Already fixed upstream - patch -p1 -i "${srcdir}"/qtbug-16292.patch - sed -i "s|-O2|$CXXFLAGS|" mkspecs/common/g++.conf sed -i "/^QMAKE_RPATH/s| -Wl,-rpath,||g" mkspecs/common/g++.conf sed -i "/^QMAKE_LFLAGS\s/s|+=|+= $LDFLAGS|g" mkspecs/common/g++.conf Deleted: qtbug-16292.patch =================================================================== --- qtbug-16292.patch 2011-09-01 21:49:29 UTC (rev 136829) +++ qtbug-16292.patch 2011-09-01 23:40:36 UTC (rev 136830) @@ -1,62 +0,0 @@ -From e340844bd614add505a39a3a6b915632476f6305 Mon Sep 17 00:00:00 2001 -From: Gabriel de Dietrich <gabriel.dietrich...@nokia.com> -Date: Tue, 15 Feb 2011 11:19:26 +0100 -Subject: [PATCH] Fix crash in KPackageKit - -QTreeViewPrivate::itemHeight() may refer to an invalid QModelIndex -after calling QTreeView::indexRowSizeHint(). - -Same thing inside QTreeView::indexRowSizeHint(), since -QHeaderView::count() will call -QAbstractItemViewPrivate::executePostedLayout() which may invalidate -all the QModelIndex. - -Reviewed-by: Olivier -Task-number: QTBUG-16292 ---- - src/gui/itemviews/qtreeview.cpp | 11 ++++++----- - 1 files changed, 6 insertions(+), 5 deletions(-) - -diff --git a/src/gui/itemviews/qtreeview.cpp b/src/gui/itemviews/qtreeview.cpp -index f1f3236..c0573bb 100644 ---- a/src/gui/itemviews/qtreeview.cpp -+++ b/src/gui/itemviews/qtreeview.cpp -@@ -2753,6 +2753,7 @@ int QTreeView::indexRowSizeHint(const QModelIndex &index) const - - int start = -1; - int end = -1; -+ int indexRow = index.row(); - int count = d->header->count(); - bool emptyHeader = (count == 0); - QModelIndex parent = index.parent(); -@@ -2789,7 +2790,7 @@ int QTreeView::indexRowSizeHint(const QModelIndex &index) const - int logicalColumn = emptyHeader ? column : d->header->logicalIndex(column); - if (d->header->isSectionHidden(logicalColumn)) - continue; -- QModelIndex idx = d->model->index(index.row(), logicalColumn, parent); -+ QModelIndex idx = d->model->index(indexRow, logicalColumn, parent); - if (idx.isValid()) { - QWidget *editor = d->editorForIndex(idx).editor; - if (editor && d->persistent.contains(editor)) { -@@ -3224,14 +3225,14 @@ int QTreeViewPrivate::itemHeight(int item) const - if (viewItems.isEmpty()) - return 0; - const QModelIndex &index = viewItems.at(item).index; -+ if (!index.isValid()) -+ return 0; - int height = viewItems.at(item).height; -- if (height <= 0 && index.isValid()) { -+ if (height <= 0) { - height = q_func()->indexRowSizeHint(index); - viewItems[item].height = height; - } -- if (!index.isValid() || height < 0) -- return 0; -- return height; -+ return qMax(height, 0); - } - - --- -1.6.1 -