I don't understand gcc/PKGBUILD.mips64el

Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/addresses/PKGBUILD
	community/chmsee/PKGBUILD
	community/coin/PKGBUILD
	community/critterding/PKGBUILD
	community/distcc/PKGBUILD
	community/djview4/PKGBUILD
	community/freedroid/PKGBUILD
	community/gnumail/PKGBUILD
	community/gyachi/PKGBUILD
	community/java-oracle/PKGBUILD
	community/liboop/PKGBUILD
	community/ltris/PKGBUILD
	community/nepim/PKGBUILD
	community/pantomime/PKGBUILD
	community/pyxattr/PKGBUILD
	community/soqt/PKGBUILD
	community/tilda/PKGBUILD
	community/unrealircd/PKGBUILD
	community/uqm/PKGBUILD
	core/dnsutils/PKGBUILD
	core/gcc/PKGBUILD.mips64el
	core/vpnc/PKGBUILD
	extra/apache/PKGBUILD
	extra/bind/PKGBUILD
	extra/bzflag/PKGBUILD
	extra/ccache/PKGBUILD
	extra/claws-mail-extra-plugins/PKGBUILD
	extra/clutter-gst/PKGBUILD
	extra/cups/PKGBUILD
	extra/doxygen/PKGBUILD
	extra/fam/PKGBUILD
	extra/fcitx/PKGBUILD
	extra/gdk-pixbuf2/PKGBUILD
	extra/geoip/PKGBUILD
	extra/gtk2/PKGBUILD
	extra/icedtea-web/PKGBUILD
	extra/libffi/PKGBUILD
	extra/libfwbuilder/PKGBUILD
	extra/libmpd/PKGBUILD
	extra/libreoffice/PKGBUILD
	extra/mesa/PKGBUILD
	extra/pygobject2/PKGBUILD
	extra/qt/PKGBUILD
	extra/samba/PKGBUILD
	extra/wireshark/PKGBUILD
	extra/xulrunner/PKGBUILD
	multilib-testing/lib32-keyutils/PKGBUILD
	multilib-testing/lib32-udev/PKGBUILD
	multilib/lib32-gtk2/PKGBUILD
	multilib/lib32-keyutils/PKGBUILD
	multilib/lib32-libcups/PKGBUILD
	multilib/lib32-qt/PKGBUILD
	multilib/wine/PKGBUILD
	multilib/wine_gecko/PKGBUILD
	testing/dash/PKGBUILD
	testing/libssh2/PKGBUILD

2 files changed, 6 insertions, 73 deletions

diff --git a/extra/qt/PKGBUILD b/extra/qt/PKGBUILD
index 413b9c324..4cd7d78c6 100644
--- a/extra/qt/PKGBUILD
+++ b/extra/qt/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 126981 2011-06-09 07:23:06Z andrea $
+# $Id: PKGBUILD 136831 2011-09-01 23:43:27Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgbase=qt
 pkgname=('qt' 'qt-private-headers')
-pkgver=4.7.3
-pkgrel=3
+pkgver=4.7.4
+pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url='http://qt.nokia.com/'
 license=('GPL3' 'LGPL')
@@ -17,14 +17,12 @@ options=('!libtool')
 _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
@@ -43,9 +41,6 @@ build() {
 
 	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
diff --git a/extra/qt/qtbug-16292.patch b/extra/qt/qtbug-16292.patch
deleted file mode 100644
index 9728e28f5..000000000
--- a/extra/qt/qtbug-16292.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From e340844bd614add505a39a3a6b915632476f6305 Mon Sep 17 00:00:00 2001
-From: Gabriel de Dietrich <gabriel.dietrich-de@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
-