diff -Nru qt4-x11-4.8.3+dfsg/debian/changelog qt4-x11-4.8.3+dfsg/debian/changelog --- qt4-x11-4.8.3+dfsg/debian/changelog 2013-12-11 14:49:02.000000000 +0000 +++ qt4-x11-4.8.3+dfsg/debian/changelog 2014-03-18 16:07:04.000000000 +0000 @@ -1,3 +1,15 @@ +qt4-x11 (4:4.8.3+dfsg-0ubuntu3.3) quantal-security; urgency=medium + + [ Jonathan Riddell ] + * Add kubuntu_glib-honor-ExcludeSocketNotifiers-flag.diff from LiMux + fix crash in LibreOffice with KDE theme LP: #1290514 + + [ Rohan Garg ] + * Add kubuntu_98_a11y_fix_crash.diff to fix plasma crashing due to + ubuntu-specific accessibility patch LP: #1289600 + + -- Rohan Garg Wed, 12 Mar 2014 16:33:21 +0100 + qt4-x11 (4:4.8.3+dfsg-0ubuntu3.2) quantal-security; urgency=low * SECURITY UPDATE: [XML Entity Expansion Denial of Service] (LP: #1259577). diff -Nru qt4-x11-4.8.3+dfsg/debian/patches/kubuntu_98_a11y_fix_crash.diff qt4-x11-4.8.3+dfsg/debian/patches/kubuntu_98_a11y_fix_crash.diff --- qt4-x11-4.8.3+dfsg/debian/patches/kubuntu_98_a11y_fix_crash.diff 1970-01-01 00:00:00.000000000 +0000 +++ qt4-x11-4.8.3+dfsg/debian/patches/kubuntu_98_a11y_fix_crash.diff 2014-03-18 15:59:01.000000000 +0000 @@ -0,0 +1,37 @@ +Index: qt4-x11-4.8.3+dfsg/src/declarative/qml/qdeclarativeengine.cpp +=================================================================== +--- qt4-x11-4.8.3+dfsg.orig/src/declarative/qml/qdeclarativeengine.cpp 2012-09-11 01:36:52.000000000 +0000 ++++ qt4-x11-4.8.3+dfsg/src/declarative/qml/qdeclarativeengine.cpp 2014-03-18 15:58:54.937263932 +0000 +@@ -2558,4 +2558,10 @@ + return true; + } + ++QDeclarativeAccessibilityUpdater *QDeclarativeEnginePrivate::getAccessibilityUpdater(QDeclarativeEngine *e) ++{ ++ static QDeclarativeAccessibilityUpdater accessibilityUpdater; ++ return &accessibilityUpdater; ++} ++ + QT_END_NAMESPACE +Index: qt4-x11-4.8.3+dfsg/src/declarative/qml/qdeclarativeengine_p.h +=================================================================== +--- qt4-x11-4.8.3+dfsg.orig/src/declarative/qml/qdeclarativeengine_p.h 2014-03-18 15:51:30.000000000 +0000 ++++ qt4-x11-4.8.3+dfsg/src/declarative/qml/qdeclarativeengine_p.h 2014-03-18 15:58:54.969263932 +0000 +@@ -238,8 +238,6 @@ + + mutable QMutex mutex; + +- QDeclarativeAccessibilityUpdater accessibilityUpdater; +- + QDeclarativeTypeLoader typeLoader; + QDeclarativeImportDatabase importDatabase; + +@@ -314,7 +312,7 @@ + static QScriptValue formatTime(QScriptContext*, QScriptEngine*); + static QScriptValue formatDateTime(QScriptContext*, QScriptEngine*); + #endif +- static QDeclarativeAccessibilityUpdater *getAccessibilityUpdater(QDeclarativeEngine *e) { return &e->d_func()->accessibilityUpdater; } ++ static QDeclarativeAccessibilityUpdater *getAccessibilityUpdater(QDeclarativeEngine *e); + static QScriptEngine *getScriptEngine(QDeclarativeEngine *e) { return &e->d_func()->scriptEngine; } + static QDeclarativeEngine *getEngine(QScriptEngine *e) { return static_cast(e)->p->q_func(); } + static QDeclarativeEnginePrivate *get(QDeclarativeEngine *e) { return e->d_func(); } diff -Nru qt4-x11-4.8.3+dfsg/debian/patches/kubuntu_glib-honor-ExcludeSocketNotifiers-flag.diff qt4-x11-4.8.3+dfsg/debian/patches/kubuntu_glib-honor-ExcludeSocketNotifiers-flag.diff --- qt4-x11-4.8.3+dfsg/debian/patches/kubuntu_glib-honor-ExcludeSocketNotifiers-flag.diff 1970-01-01 00:00:00.000000000 +0000 +++ qt4-x11-4.8.3+dfsg/debian/patches/kubuntu_glib-honor-ExcludeSocketNotifiers-flag.diff 2014-03-18 15:59:21.000000000 +0000 @@ -0,0 +1,67 @@ +Description: Honor QEventLoop::ExcludeSocketNotifiers in glib event loop. + Implements QEventLoop::ExcludeSocketNotifiers in the same way + QEventLoop::X11ExcludeTimers is already implemented for the glib + event loop. + Fixes crash in Libreoffice with KDE theme +Forwarded: https://codereview.qt-project.org/#change,80528 +Bug-Qt: https://bugreports.qt-project.org/browse/QTBUG-37380 +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/qt4-x11/+bug/1290514 +Author: Jan-Marek Glogowski +Last-Update: 2014-03-11 + +Index: qt4-x11-4.8.3+dfsg/src/corelib/kernel/qeventdispatcher_glib.cpp +=================================================================== +--- qt4-x11-4.8.3+dfsg.orig/src/corelib/kernel/qeventdispatcher_glib.cpp 2014-03-18 15:59:17.685263715 +0000 ++++ qt4-x11-4.8.3+dfsg/src/corelib/kernel/qeventdispatcher_glib.cpp 2014-03-18 15:59:19.609263697 +0000 +@@ -65,6 +65,7 @@ + struct GSocketNotifierSource + { + GSource source; ++ QEventLoop::ProcessEventsFlags processEventsFlags; + QList pollfds; + }; + +@@ -80,6 +81,9 @@ + GSocketNotifierSource *src = reinterpret_cast(source); + + bool pending = false; ++ if (src->processEventsFlags & QEventLoop::ExcludeSocketNotifiers) ++ return pending; ++ + for (int i = 0; !pending && i < src->pollfds.count(); ++i) { + GPollFDWithQSocketNotifier *p = src->pollfds.at(i); + +@@ -103,6 +107,9 @@ + QEvent event(QEvent::SockAct); + + GSocketNotifierSource *src = reinterpret_cast(source); ++ if (src->processEventsFlags & QEventLoop::ExcludeSocketNotifiers) ++ return true; ++ + for (int i = 0; i < src->pollfds.count(); ++i) { + GPollFDWithQSocketNotifier *p = src->pollfds.at(i); + +@@ -330,6 +337,7 @@ + reinterpret_cast(g_source_new(&socketNotifierSourceFuncs, + sizeof(GSocketNotifierSource))); + (void) new (&socketNotifierSource->pollfds) QList(); ++ socketNotifierSource->processEventsFlags = QEventLoop::AllEvents; + g_source_set_can_recurse(&socketNotifierSource->source, true); + g_source_attach(&socketNotifierSource->source, mainContext); + +@@ -415,6 +423,7 @@ + // tell postEventSourcePrepare() and timerSource about any new flags + QEventLoop::ProcessEventsFlags savedFlags = d->timerSource->processEventsFlags; + d->timerSource->processEventsFlags = flags; ++ d->socketNotifierSource->processEventsFlags = flags; + + if (!(flags & QEventLoop::EventLoopExec)) { + // force timers to be sent at normal priority +@@ -426,6 +435,7 @@ + result = g_main_context_iteration(d->mainContext, canWait); + + d->timerSource->processEventsFlags = savedFlags; ++ d->socketNotifierSource->processEventsFlags = savedFlags; + + if (canWait) + emit awake(); diff -Nru qt4-x11-4.8.3+dfsg/debian/patches/series qt4-x11-4.8.3+dfsg/debian/patches/series --- qt4-x11-4.8.3+dfsg/debian/patches/series 2013-12-11 14:49:02.000000000 +0000 +++ qt4-x11-4.8.3+dfsg/debian/patches/series 2014-03-18 15:56:01.000000000 +0000 @@ -68,3 +68,5 @@ CVE-2012-6093.patch CVE-2013-0254.patch CVE-2013-4549.patch +kubuntu_glib-honor-ExcludeSocketNotifiers-flag.diff +kubuntu_98_a11y_fix_crash.diff