[qt] adapt patches

[Than Ngo]

commit 52ef45e79ab9ed82f2a10cb5be7276dad9bb49ba
Author: Than Ngo <than at redhat.com>
Date:   Wed Mar 28 17:33:54 2012 +0200

    adapt patches

 qt-4.8.1-webkit-no_Werror.patch                    |   12 +++
 ...ere-opensource-src-4.8.0-QUrl_toLocalFile.patch |   13 ---
 ...rywhere-opensource-src-4.8.0-filter_event.patch |   98 --------------------
 qt.spec                                            |   14 +---
 webkit-qtwebkit-2.2-no_Werror.patch                |   12 ---
 5 files changed, 13 insertions(+), 136 deletions(-)
---
diff --git a/qt-4.8.1-webkit-no_Werror.patch b/qt-4.8.1-webkit-no_Werror.patch
new file mode 100644
index 0000000..ef5d55d
--- /dev/null
+++ b/qt-4.8.1-webkit-no_Werror.patch
@@ -0,0 +1,12 @@
+diff -up qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/Source/WebKit.pri.no_Werror qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/Source/WebKit.pri
+--- qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/Source/WebKit.pri.no_Werror	2012-03-14 15:01:29.000000000 +0100
++++ qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/Source/WebKit.pri	2012-03-28 17:12:33.391294004 +0200
+@@ -102,8 +102,6 @@ CONFIG -= warn_on
+ 
+ # Treat warnings as errors on x86/Linux/GCC
+ linux-g++* {
+-    !CONFIG(standalone_package):isEqual(QT_ARCH,x86_64)|isEqual(QT_ARCH,i386): QMAKE_CXXFLAGS += -Werror
+-
+     greaterThan(QT_GCC_MAJOR_VERSION, 3):greaterThan(QT_GCC_MINOR_VERSION, 5) {
+         if (!contains(QMAKE_CXXFLAGS, -std=c++0x) && !contains(QMAKE_CXXFLAGS, -std=gnu++0x)) {
+             # We need to deactivate those warnings because some names conflicts with upcoming c++0x types (e.g.nullptr).
diff --git a/qt.spec b/qt.spec
index e12663f..ce95eba 100644
--- a/qt.spec
+++ b/qt.spec
@@ -68,7 +68,7 @@ Patch67: qt-everywhere-opensource-src-4.8.0-beta1-s390.patch
 
 # https://bugs.webkit.org/show_bug.cgi?id=63941
 # -Wall + -Werror = fail
-Patch68: webkit-qtwebkit-2.2-no_Werror.patch
+Patch68: qt-4.8.1-webkit-no_Werror.patch
 
 # revert qlist.h commit that seems to induce crashes in qDeleteAll<QList (QTBUG-22037)
 Patch69: qt-everywhere-opensource-src-4.8.0-QTBUG-22037.patch
@@ -79,10 +79,6 @@ Patch70: qt-everywhere-opensource-src-4.8.0-QTBUG-14724.patch
 # Buttons in Qt applications not clickable when run under gnome-shell (#742658, QTBUG-21900)
 Patch71:  qt-everywhere-opensource-src-4.8.0-QTBUG-21900.patch
 
-# restore Qt-4.7 behavior (which kde needs) to QUrl.toLocalfile
-# https://bugzilla.redhat.com/show_bug.cgi?id=749213
-Patch72: qt-everywhere-opensource-src-4.8.0-QUrl_toLocalFile.patch
-
 # QtWebKit wtf library: GMutex is a union rather than a struct in GLib >= 2.31
 # fixes FTBFS: https://bugs.webkit.org/show_bug.cgi?id=69840
 Patch73: qt-everywhere-opensource-src-4.8.0-qtwebkit-glib231.patch
@@ -100,10 +96,6 @@ Patch76: qt-everywhere-opensource-src-4.8.0-s390-atomic.patch
 # don't spam if libicu is not present at runtime
 Patch77:  qt-everywhere-opensource-src-4.8.0-icu_no_spam.patch
 
-# avoid dropping events, which lead to "ghost entries in kde task manager" problem
-# https://bugs.kde.org/show_bug.cgi?id=275469
-Patch78: qt-everywhere-opensource-src-4.8.0-filter_event.patch
-
 # fix qvfb build
 Patch79: qt-everywhere-opensource-src-4.8.0-qvfb.patch
 
@@ -426,13 +418,10 @@ rm -fv mkspecs/linux-g++*/qmake.conf.multilib-optflags
 %patch64 -p1 -b .QTBUG-14467
 %patch65 -p1 -b .qtreeview-kpackagekit-crash
 %patch67 -p1 -b .s390
-pushd src/3rdparty/webkit
 %patch68 -p1 -b .no_Werror
-popd
 %patch69 -p1 -b .QTBUG-22037
 %patch70 -p1 -b .QTBUG-14724
 %patch71 -p1 -b .QTBUG-21900
-%patch72 -p1 -b .QUrl_toLocalFile
 %if 0%{?fedora} > 16
 # This quick fix works ONLY with GLib >= 2.31. It's harder to fix this portably.
 # See https://bugs.webkit.org/show_bug.cgi?id=69840 for the gory details.
@@ -442,7 +431,6 @@ popd
 %patch75 -p1 -b .ppc64-crash
 %patch76 -p1 -b .s390-atomic
 %patch77 -p1 -b .icu_no_spam
-%patch78 -p1 -b .filter_events
 %patch79 -p1 -b .qvfb
 %patch80 -p1 -b .ld.gold
 %patch81 -p1 -b .gcc-4.7