[gnome-shell/f20] Revert "Backport upstream fix for broken crosshairs (again)"

[Florian Müllner]

commit 8d70752aed78f75612e72f1fff5b9496f4696ed5
Author: Florian Müllner <fmuellner at gnome.org>
Date:   Thu Jul 10 18:42:54 2014 +0200

    Revert "Backport upstream fix for broken crosshairs (again)"
    
    This reverts commit 89c32b86ae7d4de84f01559ba99b309bcb2e7de9.

 0001-a11y-initialize-atspi-on-demand.patch |   61 ---------
 fix-broken-crosshairs.patch                |  199 ----------------------------
 gnome-shell.spec                           |   16 +--
 3 files changed, 7 insertions(+), 269 deletions(-)
---
diff --git a/gnome-shell.spec b/gnome-shell.spec
index d1bd0f8..401097c 100644
--- a/gnome-shell.spec
+++ b/gnome-shell.spec
@@ -17,11 +17,8 @@ Patch2: only-set-scale-factor-on-success.patch
 # Make OSK work in modal dialogs, backport from master branch
 # https://bugzilla.gnome.org/show_bug.cgi?id=719451
 # https://bugzilla.redhat.com/show_bug.cgi?id=1071907
-Patch4: 0001-modalDialog-Remove-unused-parentActor-param.patch
-Patch5: 0002-layout-Create-a-group-for-modal-dialogs.patch
-
-Patch6: fix-broken-crosshairs.patch
-Patch7: 0001-a11y-initialize-atspi-on-demand.patch
+Patch3: 0001-modalDialog-Remove-unused-parentActor-param.patch
+Patch4: 0002-layout-Create-a-group-for-modal-dialogs.patch
 
 %define clutter_version 1.13.4
 %define gnome_bluetooth_version 1:3.9.0
@@ -126,10 +123,8 @@ easy to use experience.
 %setup -q
 %patch1 -p1 -b .firefox
 %patch2 -p1 -b .scale-factor-success
-%patch4 -p1 -b .osk_modal1
-%patch5 -p1 -b .osk_modal2
-%patch6 -p1 -b .broken-crosshairs
-%patch7 -p1 -b .defer-atspi-initialization
+%patch3 -p1 -b .osk_modal1
+%patch4 -p1 -b .osk_modal2
 
 %build
 (if ! test -x configure; then NOCONFIGURE=1 ./autogen.sh; fi;
@@ -189,6 +184,9 @@ glib-compile-schemas --allow-any-name %{_datadir}/glib-2.0/schemas &> /dev/null
 %exclude %{_datadir}/gtk-doc
 
 %changelog
+* Thu Jul 10 2014 Florian Müllner <fmuellner at redhat.com> - 3.10.4-6
+- Revert last patches again - the performance regression is still present
+
 * Fri Jun 27 2014 Florian Müllner <fmuellner at redhat.com> - 3.10.4-6
 - Add back crosshairs fix plus upstream workaround for the reported
   performance regressions (RH #1083500)