respin glib_eventloop_nullcheck.patch
This commit is contained in:
parent
659f8c9ee5
commit
53d9fccd83
@ -1,6 +1,6 @@
|
|||||||
diff -up qt-everywhere-opensource-src-4.6.3/src/gui/kernel/qguieventdispatcher_glib.cpp.glib_eventloop_nullcheck qt-everywhere-opensource-src-4.6.3/src/gui/kernel/qguieventdispatcher_glib.cpp
|
diff -up qt-everywhere-opensource-src-4.6.3/src/gui/kernel/qguieventdispatcher_glib.cpp.glib_eventloop_nullcheck qt-everywhere-opensource-src-4.6.3/src/gui/kernel/qguieventdispatcher_glib.cpp
|
||||||
--- qt-everywhere-opensource-src-4.6.3/src/gui/kernel/qguieventdispatcher_glib.cpp.glib_eventloop_nullcheck 2010-06-01 21:03:15.000000000 -0500
|
--- qt-everywhere-opensource-src-4.6.3/src/gui/kernel/qguieventdispatcher_glib.cpp.glib_eventloop_nullcheck 2010-06-01 21:03:15.000000000 -0500
|
||||||
+++ qt-everywhere-opensource-src-4.6.3/src/gui/kernel/qguieventdispatcher_glib.cpp 2010-06-29 12:32:48.268074623 -0500
|
+++ qt-everywhere-opensource-src-4.6.3/src/gui/kernel/qguieventdispatcher_glib.cpp 2010-06-29 14:58:12.299073784 -0500
|
||||||
@@ -76,7 +76,7 @@ static gboolean x11EventSourcePrepare(GS
|
@@ -76,7 +76,7 @@ static gboolean x11EventSourcePrepare(GS
|
||||||
GX11EventSource *source = reinterpret_cast<GX11EventSource *>(s);
|
GX11EventSource *source = reinterpret_cast<GX11EventSource *>(s);
|
||||||
return (XEventsQueued(X11->display, QueuedAfterFlush)
|
return (XEventsQueued(X11->display, QueuedAfterFlush)
|
||||||
@ -10,3 +10,12 @@ diff -up qt-everywhere-opensource-src-4.6.3/src/gui/kernel/qguieventdispatcher_g
|
|||||||
}
|
}
|
||||||
|
|
||||||
static gboolean x11EventSourceCheck(GSource *s)
|
static gboolean x11EventSourceCheck(GSource *s)
|
||||||
|
@@ -84,7 +84,7 @@ static gboolean x11EventSourceCheck(GSou
|
||||||
|
GX11EventSource *source = reinterpret_cast<GX11EventSource *>(s);
|
||||||
|
return (XEventsQueued(X11->display, QueuedAfterFlush)
|
||||||
|
|| (!(source->flags & QEventLoop::ExcludeUserInputEvents)
|
||||||
|
- && !source->d->queuedUserInputEvents.isEmpty()));
|
||||||
|
+ && source->d && !source->d->queuedUserInputEvents.isEmpty()));
|
||||||
|
}
|
||||||
|
|
||||||
|
static gboolean x11EventSourceDispatch(GSource *s, GSourceFunc callback, gpointer user_data)
|
||||||
|
4
qt.spec
4
qt.spec
@ -19,7 +19,7 @@ Summary: Qt toolkit
|
|||||||
Name: qt
|
Name: qt
|
||||||
Epoch: 1
|
Epoch: 1
|
||||||
Version: 4.7.0
|
Version: 4.7.0
|
||||||
Release: 0.21.%{pre}%{?dist}
|
Release: 0.22.%{pre}%{?dist}
|
||||||
|
|
||||||
# See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
|
# See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
|
||||||
License: LGPLv2 with exceptions or GPLv3 with exceptions
|
License: LGPLv2 with exceptions or GPLv3 with exceptions
|
||||||
@ -1088,7 +1088,7 @@ fi
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Tue Jun 29 2010 Rex Dieter <rdieter@fedoraproject.org. 4.7.0-0.21.beta1
|
* Tue Jun 29 2010 Rex Dieter <rdieter@fedoraproject.org. 4.7.0-0.22.beta1
|
||||||
- workaround glib_eventloop crasher induced by gdal/grass (bug #498111)
|
- workaround glib_eventloop crasher induced by gdal/grass (bug #498111)
|
||||||
|
|
||||||
* Fri Jun 20 2010 Rex Dieter <rdieter@fedoraproject.org> 4.7.0-0.20.beta1
|
* Fri Jun 20 2010 Rex Dieter <rdieter@fedoraproject.org> 4.7.0-0.20.beta1
|
||||||
|
Loading…
Reference in New Issue
Block a user