rpms
/
qt
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "rebase/unfuzz QTBUG-34614 patch" 

It turns out I just need to swap the QTBUG-34614 and QTBUG-37380 patches.

This reverts commit c3497d8517.
This commit is contained in:
Kevin Kofler 2014-06-07 03:39:24 +02:00
parent c3497d8517
commit 83f139ea97
2 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
qt-everywhere-opensource-src-4.8.6-QTBUG-34614.patch
View File

@ -1,7 +1,6 @@
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 --- src/corelib/kernel/qeventdispatcher_glib.cpp.sav 2014-03-28 15:26:37.000000000 +0100
--- qt-everywhere-opensource-src-4.8.6/src/corelib/kernel/qeventdispatcher_glib.cpp 2014-04-10 20:37:11.000000000 +0200 +++ src/corelib/kernel/qeventdispatcher_glib.cpp 2014-04-24 09:44:09.358659204 +0200
+++ qt-everywhere-opensource-src-4.8.6-QTBUG-34614/src/corelib/kernel/qeventdispatcher_glib.cpp 2014-06-07 02:18:42.000000000 +0200 @@ -255,22 +255,30 @@ struct GPostEventSource
@@ -248,22 +248,30 @@
GSource source; GSource source;
QAtomicInt serialNumber; QAtomicInt serialNumber;
int lastSerialNumber; int lastSerialNumber;
@ -33,7 +32,7 @@ diff -ur qt-everywhere-opensource-src-4.8.6/src/corelib/kernel/qeventdispatcher_
return (!canWait return (!canWait
|| (source->serialNumber != source->lastSerialNumber)); || (source->serialNumber != source->lastSerialNumber));
} }
@@ -277,8 +285,14 @@ @@ -284,8 +292,14 @@ static gboolean postEventSourceDispatch(
{ {
GPostEventSource *source = reinterpret_cast<GPostEventSource *>(s); GPostEventSource *source = reinterpret_cast<GPostEventSource *>(s);
source->lastSerialNumber = source->serialNumber; source->lastSerialNumber = source->serialNumber;
@ -50,7 +49,7 @@ diff -ur qt-everywhere-opensource-src-4.8.6/src/corelib/kernel/qeventdispatcher_
return true; // i dunno, george... return true; // i dunno, george...
} }
@@ -322,6 +336,7 @@ @@ -329,6 +343,7 @@ QEventDispatcherGlibPrivate::QEventDispa
postEventSource = reinterpret_cast<GPostEventSource *>(g_source_new(&postEventSourceFuncs, postEventSource = reinterpret_cast<GPostEventSource *>(g_source_new(&postEventSourceFuncs,
sizeof(GPostEventSource))); sizeof(GPostEventSource)));
postEventSource->serialNumber = 1; postEventSource->serialNumber = 1;
@ -58,26 +57,25 @@ diff -ur qt-everywhere-opensource-src-4.8.6/src/corelib/kernel/qeventdispatcher_
postEventSource->d = this; postEventSource->d = this;
g_source_set_can_recurse(&postEventSource->source, true); g_source_set_can_recurse(&postEventSource->source, true);
g_source_attach(&postEventSource->source, mainContext); g_source_attach(&postEventSource->source, mainContext);
@@ -415,6 +430,7 @@ @@ -423,6 +438,7 @@ bool QEventDispatcherGlib::processEvents
// tell postEventSourcePrepare() and timerSource about any new flags // tell postEventSourcePrepare() and timerSource about any new flags
QEventLoop::ProcessEventsFlags savedFlags = d->timerSource->processEventsFlags; QEventLoop::ProcessEventsFlags savedFlags = d->timerSource->processEventsFlags;
+ d->postEventSource->processEventsFlags = flags; + d->postEventSource->processEventsFlags = flags;
d->timerSource->processEventsFlags = flags; d->timerSource->processEventsFlags = flags;
d->socketNotifierSource->processEventsFlags = flags;
if (!(flags & QEventLoop::EventLoopExec)) { @@ -435,6 +451,7 @@ bool QEventDispatcherGlib::processEvents
@@ -426,6 +442,7 @@
while (!result && canWait) while (!result && canWait)
result = g_main_context_iteration(d->mainContext, canWait); result = g_main_context_iteration(d->mainContext, canWait);
+ d->postEventSource->processEventsFlags = savedFlags; + d->postEventSource->processEventsFlags = savedFlags;
d->timerSource->processEventsFlags = savedFlags; d->timerSource->processEventsFlags = savedFlags;
d->socketNotifierSource->processEventsFlags = savedFlags;
if (canWait) --- src/corelib/kernel/qeventdispatcher_unix.cpp.sav 2013-06-07 07:16:52.000000000 +0200
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 +++ src/corelib/kernel/qeventdispatcher_unix.cpp 2014-04-24 09:43:06.927589535 +0200
--- qt-everywhere-opensource-src-4.8.6/src/corelib/kernel/qeventdispatcher_unix.cpp 2014-04-10 20:37:11.000000000 +0200 @@ -905,7 +905,15 @@ bool QEventDispatcherUNIX::processEvents
+++ 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 // we are awake, broadcast it
emit awake(); emit awake();

4
qt.spec
View File

@ -524,7 +524,7 @@ rm -fv mkspecs/linux-g++*/qmake.conf.multilib-optflags
%patch81 -p1 -b .assistant-crash %patch81 -p1 -b .assistant-crash
%patch82 -p1 -b .QTBUG-4862 %patch82 -p1 -b .QTBUG-4862
%patch83 -p1 -b .poll %patch83 -p1 -b .poll
%patch87 -p1 -b .QTBUG-34614 %patch87 -p0 -b .QTBUG-34614
%patch88 -p1 -b .QTBUG-37380 %patch88 -p1 -b .QTBUG-37380
%patch89 -p0 -b .QTBUG-38585 %patch89 -p0 -b .QTBUG-38585
@ -1237,7 +1237,7 @@ fi
%changelog %changelog
* Sat Jun 07 2014 Kevin Kofler <Kevin@tigcc.ticalc.org> 4.8.6-9 * Fri Jun 06 2014 Kevin Kofler <Kevin@tigcc.ticalc.org> 4.8.6-9
- apply proposed fixes for QTBUG-34614,37380,38585 for LibreOffice (#1105422) - apply proposed fixes for QTBUG-34614,37380,38585 for LibreOffice (#1105422)
* Tue Jun 03 2014 Rex Dieter <rdieter@fedoraproject.org> 4.8.6-8 * Tue Jun 03 2014 Rex Dieter <rdieter@fedoraproject.org> 4.8.6-8