try to fix qt-debug

qt/PKGBUILD

@@ -64,7 +64,6 @@ source=("ftp://ftp.qt.nokia.com/qt/source/${_pkgfqn}.tar.gz"
 	'linguist.desktop'
 	'qtconfig.desktop'
 	'demosexamples-manual-install.patch'
-	'qmake-linker-flags-as-needed.patch'
 	'appmenu.patch')
 
 
@@ -75,7 +74,6 @@ md5sums=('6f88d96507c84e9fea5bf3a71ebeb6d7'
          'a9bfeeffab8ba103bc8153fdb31474a1'
          '83b2a4aece6c9d86301c53a979af0b63'
          '579e63488320a8d692d25502551787af'
-         'c436732fc467271e8a3838145c122070'
          'dba7f852bce6e1ebd78f6a78f9979c68')
 
 # source PKGBUILD && _create-kdeqt-patch
@@ -112,15 +110,13 @@ build() {
 	sed -i -e 's/^.*kde-qt .*/        echo "   kde-qt '${kdeqtver}'"/' $startdir/qt.install
 
 	msg "apply other patches"
-	# Already fixed in 4.7.2
-	patch -Np1 -i ${srcdir}/qmake-linker-flags-as-needed.patch || return 1
-
 	# apply appmenu patch from Aurelien Gateau
 	patch -Np1 -i ${srcdir}/appmenu.patch || return 1
 
 	# we want our cflags etc
-	sed -i "s|-O2|$CXXFLAGS|" mkspecs/common/g++.conf
-	sed -i "/^QMAKE_RPATH/s| -Wl,-rpath,||g" mkspecs/common/g++.conf
+        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
 	
 	msg "starting configure"
 
@@ -206,7 +202,7 @@ package_qt()
 	mv $pkgdir/usr/bin/linguist $srcdir/bin
     
 	# move out debug symbols into a temp dir and put them into qt-debug later below
-	mkdir $srcdir/debug
+	mkdir -p $srcdir/debug
 	for x in `find $pkgdir -name *.debug`
 	do
 		basedir=`dirname $x`

qt/fix-multisampling-with-ati-card.patch

@@ -1,25 +0,0 @@
-From e48e50c460434c451c67403390d98f7418c77cce Mon Sep 17 00:00:00 2001
-From: Jonathan Liu <net147@gmail.com>
-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
-

qt/fix-scroll-when-last-item-is-removed.patch

@@ -1,38 +0,0 @@
-From 6da6b7099d4e0b49329793e4b90703ec3d868048 Mon Sep 17 00:00:00 2001
-From: Frank Reininghaus <frank78ac@googlemail.com>
-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 <olivier.goffart@nokia.com>
----
- 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
-

qt/qmake-linker-flags-as-needed.patch

@@ -1,16 +0,0 @@
-author: Fathi Boudra <fabo@debian.org>
-
-workaround as LDFLAGS isn't honored by configure script.
-Bug reported to Trolltech.
-
---- a/configure
-+++ b/configure
-@@ -583,6 +583,8 @@ mkdir -p "$outpath/config.tests"
- rm -f "$outpath/config.tests/.qmake.cache"
- cp "$QMAKE_VARS_FILE" "$outpath/config.tests/.qmake.cache"
- 
-+QMakeVar add QMAKE_LFLAGS -Wl,--as-needed
-+
- QMakeVar add styles "cde mac motif plastique cleanlooks windows"
- QMakeVar add decorations "default windows styled"
- QMakeVar add gfx-drivers "linuxfb"