From 23e5d3403d66f4a5c025833282308d274f7602b4 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 29 Jun 2010 19:55:43 +0000 Subject: [PATCH] respin glib_eventloop_nullcheck.patch --- ...pensource-src-4.6.3-glib_eventloop_nullcheck.patch | 11 ++++++++++- qt.spec | 4 ++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/qt-everywhere-opensource-src-4.6.3-glib_eventloop_nullcheck.patch b/qt-everywhere-opensource-src-4.6.3-glib_eventloop_nullcheck.patch index 7d12759..f0c9eaa 100644 --- a/qt-everywhere-opensource-src-4.6.3-glib_eventloop_nullcheck.patch +++ b/qt-everywhere-opensource-src-4.6.3-glib_eventloop_nullcheck.patch @@ -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 --- 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 GX11EventSource *source = reinterpret_cast(s); 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) +@@ -84,7 +84,7 @@ static gboolean x11EventSourceCheck(GSou + GX11EventSource *source = reinterpret_cast(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) diff --git a/qt.spec b/qt.spec index 6a35c4a..45b148c 100644 --- a/qt.spec +++ b/qt.spec @@ -13,7 +13,7 @@ Summary: Qt toolkit Name: qt Epoch: 1 Version: 4.6.3 -Release: 6%{?dist} +Release: 7%{?dist} # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details License: LGPLv2 with exceptions or GPLv3 with exceptions @@ -1069,7 +1069,7 @@ fi %changelog -* Tue Jun 29 2010 Rex Dieter 4.6.3-5