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

- workaround glib_eventloop crasher induced by gdal/grass (bug #498111)

Browse Source
This commit is contained in:
Rex Dieter 2010-06-29 17:18:06 +00:00
parent 0a74c97247
commit 0b36370aaf
2 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
qt-everywhere-opensource-src-4.6.3-glib_eventloop_nullcheck.patch Normal file
View File

@ -0,0 +1,13 @@
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);

9
qt.spec
View File

@ -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.20.%{pre}%{?dist} Release: 0.21.%{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
@ -49,6 +49,9 @@ Patch19: qt-x11-opensource-src-4.5.1-phonon.patch
# use system ca-bundle certs, http://bugzilla.redhat.com/521911 # use system ca-bundle certs, http://bugzilla.redhat.com/521911
Patch22: qt-x11-opensource-src-4.5.3-system_ca_certificates.patch Patch22: qt-x11-opensource-src-4.5.3-system_ca_certificates.patch
Requires: ca-certificates 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 ## upstreamable bits
# fix invalid inline assembly in qatomic_{i386,x86_64}.h (de)ref implementations # fix invalid inline assembly in qatomic_{i386,x86_64}.h (de)ref implementations
@ -418,6 +421,7 @@ Qt libraries used for drawing widgets and OpenGL items.
%patch16 -p1 -b .kde4_plugins %patch16 -p1 -b .kde4_plugins
%patch19 -p1 -b .servicesfile %patch19 -p1 -b .servicesfile
%patch22 -p1 -b .system_ca_certificates %patch22 -p1 -b .system_ca_certificates
%patch23 -p1 -b .glib_eventloop_nullcheck
## TODO: still worth carrying? if so, upstream it. ## TODO: still worth carrying? if so, upstream it.
%patch53 -p1 -b .qatomic-inline-asm %patch53 -p1 -b .qatomic-inline-asm
## TODO: upstream me ## TODO: upstream me
@ -1084,6 +1088,9 @@ fi
%changelog %changelog
* Tue Jun 29 2010 Rex Dieter <rdieter@fedoraproject.org. 4.7.0-0.21.beta1
- 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
- avoid timestamps in uic-generated files to be multilib-friendly - avoid timestamps in uic-generated files to be multilib-friendly