[qt] rebase/unfuzz QTBUG-34614 patch

[Kevin Kofler]

commit c3497d85173f6598c194d922f7bff443e169262f
Author: Kevin Kofler <Kevin at tigcc.ticalc.org>
Date:   Sat Jun 7 02:41:57 2014 +0200

    rebase/unfuzz QTBUG-34614 patch

 ...erywhere-opensource-src-4.8.6-QTBUG-34614.patch |   26 ++++++++++---------
 qt.spec                                            |    4 +-
 2 files changed, 16 insertions(+), 14 deletions(-)
---
diff --git a/qt-everywhere-opensource-src-4.8.6-QTBUG-34614.patch b/qt-everywhere-opensource-src-4.8.6-QTBUG-34614.patch
index 6d3bf2f..1b84010 100644
--- a/qt-everywhere-opensource-src-4.8.6-QTBUG-34614.patch
+++ b/qt-everywhere-opensource-src-4.8.6-QTBUG-34614.patch
@@ -1,6 +1,7 @@
---- src/corelib/kernel/qeventdispatcher_glib.cpp.sav	2014-03-28 15:26:37.000000000 +0100
-+++ src/corelib/kernel/qeventdispatcher_glib.cpp	2014-04-24 09:44:09.358659204 +0200
-@@ -255,22 +255,30 @@ struct GPostEventSource
+diff -ur qt-everywhere-opensource-src-4.8.6/src/corelib/kernel/qeventdispatcher_glib.cpp qt-everywhere-opensource-src-4.8.6-QTBUG-34614/src/corelib/kernel/qeventdispatcher_glib.cpp
+--- qt-everywhere-opensource-src-4.8.6/src/corelib/kernel/qeventdispatcher_glib.cpp	2014-04-10 20:37:11.000000000 +0200
++++ qt-everywhere-opensource-src-4.8.6-QTBUG-34614/src/corelib/kernel/qeventdispatcher_glib.cpp	2014-06-07 02:18:42.000000000 +0200
+@@ -248,22 +248,30 @@
      GSource source;
      QAtomicInt serialNumber;
      int lastSerialNumber;
@@ -32,7 +33,7 @@
      return (!canWait
              || (source->serialNumber != source->lastSerialNumber));
  }
-@@ -284,8 +292,14 @@ static gboolean postEventSourceDispatch(
+@@ -277,8 +285,14 @@
  {
      GPostEventSource *source = reinterpret_cast<GPostEventSource *>(s);
      source->lastSerialNumber = source->serialNumber;
@@ -49,7 +50,7 @@
      return true; // i dunno, george...
  }
  
-@@ -329,6 +343,7 @@ QEventDispatcherGlibPrivate::QEventDispa
+@@ -322,6 +336,7 @@
      postEventSource = reinterpret_cast<GPostEventSource *>(g_source_new(&postEventSourceFuncs,
                                                                          sizeof(GPostEventSource)));
      postEventSource->serialNumber = 1;
@@ -57,25 +58,26 @@
      postEventSource->d = this;
      g_source_set_can_recurse(&postEventSource->source, true);
      g_source_attach(&postEventSource->source, mainContext);
-@@ -423,6 +438,7 @@ bool QEventDispatcherGlib::processEvents
+@@ -415,6 +430,7 @@
  
      // tell postEventSourcePrepare() and timerSource about any new flags
      QEventLoop::ProcessEventsFlags savedFlags = d->timerSource->processEventsFlags;
 +    d->postEventSource->processEventsFlags = flags;
      d->timerSource->processEventsFlags = flags;
-     d->socketNotifierSource->processEventsFlags = flags;
  
-@@ -435,6 +451,7 @@ bool QEventDispatcherGlib::processEvents
+     if (!(flags & QEventLoop::EventLoopExec)) {
+@@ -426,6 +442,7 @@
      while (!result && canWait)
          result = g_main_context_iteration(d->mainContext, canWait);
  
 +    d->postEventSource->processEventsFlags = savedFlags;
      d->timerSource->processEventsFlags = savedFlags;
-     d->socketNotifierSource->processEventsFlags = savedFlags;
  
---- src/corelib/kernel/qeventdispatcher_unix.cpp.sav	2013-06-07 07:16:52.000000000 +0200
-+++ src/corelib/kernel/qeventdispatcher_unix.cpp	2014-04-24 09:43:06.927589535 +0200
-@@ -905,7 +905,15 @@ bool QEventDispatcherUNIX::processEvents
+     if (canWait)
+diff -ur qt-everywhere-opensource-src-4.8.6/src/corelib/kernel/qeventdispatcher_unix.cpp qt-everywhere-opensource-src-4.8.6-QTBUG-34614/src/corelib/kernel/qeventdispatcher_unix.cpp
+--- qt-everywhere-opensource-src-4.8.6/src/corelib/kernel/qeventdispatcher_unix.cpp	2014-04-10 20:37:11.000000000 +0200
++++ qt-everywhere-opensource-src-4.8.6-QTBUG-34614/src/corelib/kernel/qeventdispatcher_unix.cpp	2014-06-07 02:18:42.000000000 +0200
+@@ -905,7 +905,15 @@
  
      // we are awake, broadcast it
      emit awake();
diff --git a/qt.spec b/qt.spec
index 4f74b82..0b6c4d9 100644
--- a/qt.spec
+++ b/qt.spec
@@ -524,7 +524,7 @@ rm -fv mkspecs/linux-g++*/qmake.conf.multilib-optflags
 %patch81 -p1 -b .assistant-crash
 %patch82 -p1 -b .QTBUG-4862
 %patch83 -p1 -b .poll
-%patch87 -p0 -b .QTBUG-34614
+%patch87 -p1 -b .QTBUG-34614
 %patch88 -p1 -b .QTBUG-37380
 %patch89 -p0 -b .QTBUG-38585
 
@@ -1237,7 +1237,7 @@ fi
 
 
 %changelog
-* Fri Jun 06 2014 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.8.6-9
+* Sat Jun 07 2014 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.8.6-9
 - apply proposed fixes for QTBUG-34614,37380,38585 for LibreOffice (#1105422)
 
 * Tue Jun 03 2014 Rex Dieter <rdieter at fedoraproject.org> 4.8.6-8