rpms/qt/F-13 qt-everywhere-opensource-src-4.6.3-glib_eventloop_nullcheck.patch, 1.2, 1.3 qt.spec, 1.402, 1.403
Rex Dieter
rdieter at fedoraproject.org
Tue Jun 29 19:55:43 UTC 2010
- Previous message: rpms/phpMyAdmin/devel phpMyAdmin.spec,1.54,1.55
- Next message: rpms/gnaughty/EL-6 .cvsignore, 1.3, 1.4 gnaughty.spec, 1.2, 1.3 import.log, 1.1, 1.2 sources, 1.3, 1.4
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: rdieter
Update of /cvs/pkgs/rpms/qt/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv10561
Modified Files:
qt-everywhere-opensource-src-4.6.3-glib_eventloop_nullcheck.patch
qt.spec
Log Message:
respin glib_eventloop_nullcheck.patch
qt-everywhere-opensource-src-4.6.3-glib_eventloop_nullcheck.patch:
qguieventdispatcher_glib.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Index: qt-everywhere-opensource-src-4.6.3-glib_eventloop_nullcheck.patch
===================================================================
RCS file: /cvs/pkgs/rpms/qt/F-13/qt-everywhere-opensource-src-4.6.3-glib_eventloop_nullcheck.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- qt-everywhere-opensource-src-4.6.3-glib_eventloop_nullcheck.patch 29 Jun 2010 17:33:57 -0000 1.2
+++ qt-everywhere-opensource-src-4.6.3-glib_eventloop_nullcheck.patch 29 Jun 2010 19:55:43 -0000 1.3
@@ -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<GX11EventSource *>(s);
return (XEventsQueued(X11->display, QueuedAfterFlush)
@@ -10,3 +10,12 @@ diff -up qt-everywhere-opensource-src-4.
}
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)
Index: qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt/F-13/qt.spec,v
retrieving revision 1.402
retrieving revision 1.403
diff -u -p -r1.402 -r1.403
--- qt.spec 29 Jun 2010 17:13:16 -0000 1.402
+++ qt.spec 29 Jun 2010 19:55:43 -0000 1.403
@@ -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 <rdieter at fedoraproject.org. 4.6.3-6
+* Tue Jun 29 2010 Rex Dieter <rdieter at fedoraproject.org. 4.6.3-7
- workaround glib_eventloop crasher induced by gdal/grass (bug #498111)
* Fri Jun 20 2010 Rex Dieter <rdieter at fedoraproject.org> 4.6.3-5
- Previous message: rpms/phpMyAdmin/devel phpMyAdmin.spec,1.54,1.55
- Next message: rpms/gnaughty/EL-6 .cvsignore, 1.3, 1.4 gnaughty.spec, 1.2, 1.3 import.log, 1.1, 1.2 sources, 1.3, 1.4
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list