rpms/qt/F-13 qt-everywhere-opensource-src-4.6.3-glib_eventloop_nullcheck.patch, NONE, 1.1 qt.spec, 1.401, 1.402

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/qt/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv27853

Modified Files:
	qt.spec 
Added Files:
	qt-everywhere-opensource-src-4.6.3-glib_eventloop_nullcheck.patch 
Log Message:
* Tue Jun 29 2010 Rex Dieter <rdieter at fedoraproject.org. 4.6.3-6
- workaround glib_eventloop crasher induced by gdal/grass (bug #498111)


qt-everywhere-opensource-src-4.6.3-glib_eventloop_nullcheck.patch:
 qguieventdispatcher_glib.cpp |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE qt-everywhere-opensource-src-4.6.3-glib_eventloop_nullcheck.patch ---
diff -up qt-everywhere-opensource-src-4.6.3/src/gui/kernel/qapplication.cpp.grass qt-everywhere-opensource-src-4.6.3/src/gui/kernel/qapplication.cpp
diff -up qt-everywhere-opensource-src-4.6.3/src/gui/kernel/qguieventdispatcher_glib.cpp.grass 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.grass	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:07:58.545073715 -0500
@@ -177,6 +177,8 @@ QGuiEventDispatcherGlibPrivate::QGuiEven
     memset(&x11EventSource->pollfd, 0, sizeof(GPollFD));
     x11EventSource->flags = QEventLoop::AllEvents;
     x11EventSource->q = 0;
+    // workaround NULL dereference https://bugzilla.redhat.com/show_bug.cgi?id=498111#c59 -- Rex
+    if (x11EventSource->d)
     x11EventSource->d = 0;
 
     g_source_attach(&x11EventSource->source, mainContext);


Index: qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt/F-13/qt.spec,v
retrieving revision 1.401
retrieving revision 1.402
diff -u -p -r1.401 -r1.402
--- qt.spec	25 Jun 2010 19:12:03 -0000	1.401
+++ qt.spec	29 Jun 2010 17:13:16 -0000	1.402
@@ -13,7 +13,7 @@ Summary: Qt toolkit
 Name:    qt
 Epoch:   1
 Version: 4.6.3
-Release: 5%{?dist}
+Release: 6%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -48,6 +48,9 @@ Patch21: qt-everywhere-opensource-src-4.
 # use system ca-bundle certs, http://bugzilla.redhat.com/521911
 Patch22: qt-x11-opensource-src-4.5.3-system_ca_certificates.patch 
 Requires: ca-certificates
+# may be upstreamable, not sure yet
+# workaround for gdal/grass crashers wrt glib_eventloop null deref's
+Patch23: qt-everywhere-opensource-src-4.6.3-glib_eventloop_nullcheck.patch
 
 ## upstreamable bits
 # http://bugzilla.redhat.com/485677
@@ -434,6 +437,7 @@ Qt libraries used for drawing widgets an
 %patch19 -p1 -b .servicesfile
 %patch21 -p1 -b .gst-pulsaudio
 %patch22 -p1 -b .system_ca_certificates
+%patch23 -p1 -b .glib_eventloop_nullcheck
 %patch51 -p1 -b .qdoc3
 ## TODO: still worth carrying?  if so, upstream it.
 %patch53 -p1 -b .qatomic-inline-asm
@@ -1065,6 +1069,9 @@ fi
 
 
 %changelog
+* Tue Jun 29 2010 Rex Dieter <rdieter at fedoraproject.org. 4.6.3-6
+- workaround glib_eventloop crasher induced by gdal/grass (bug #498111)
+
 * Fri Jun 20 2010 Rex Dieter <rdieter at fedoraproject.org> 4.6.3-5
 - avoid timestamps in uic-generated files to be multilib-friendly