diff -Nru qt4-x11-4.8.1/debian/changelog qt4-x11-4.8.1/debian/changelog --- qt4-x11-4.8.1/debian/changelog 2013-12-19 09:41:39.000000000 +0000 +++ qt4-x11-4.8.1/debian/changelog 2014-04-24 14:38:58.000000000 +0000 @@ -1,3 +1,11 @@ +qt4-x11 (4:4.8.1-0ubuntu4.8) precise; urgency=medium + + [ 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 18:13:21 +0100 + qt4-x11 (4:4.8.1-0ubuntu4.6) precise-proposed; urgency=low * Query for Xi 2.2 first before falling back to Xi 2.1. (LP: #1242633) diff -Nru qt4-x11-4.8.1/debian/patches/kubuntu_98_a11y_fix_crash.diff qt4-x11-4.8.1/debian/patches/kubuntu_98_a11y_fix_crash.diff --- qt4-x11-4.8.1/debian/patches/kubuntu_98_a11y_fix_crash.diff 1970-01-01 00:00:00.000000000 +0000 +++ qt4-x11-4.8.1/debian/patches/kubuntu_98_a11y_fix_crash.diff 2014-03-12 17:08:53.000000000 +0000 @@ -0,0 +1,37 @@ +Index: qt4-x11-4.8.4+dfsg/src/declarative/qml/qdeclarativeengine.cpp +=================================================================== +--- qt4-x11-4.8.4+dfsg.orig/src/declarative/qml/qdeclarativeengine.cpp 2014-03-12 14:48:09.853607295 +0100 ++++ qt4-x11-4.8.4+dfsg/src/declarative/qml/qdeclarativeengine.cpp 2014-03-12 14:48:09.845607295 +0100 +@@ -2555,4 +2555,10 @@ + return true; + } + ++QDeclarativeAccessibilityUpdater *QDeclarativeEnginePrivate::getAccessibilityUpdater(QDeclarativeEngine *e) ++{ ++ static QDeclarativeAccessibilityUpdater accessibilityUpdater; ++ return &accessibilityUpdater; ++} ++ + QT_END_NAMESPACE +Index: qt4-x11-4.8.4+dfsg/src/declarative/qml/qdeclarativeengine_p.h +=================================================================== +--- qt4-x11-4.8.4+dfsg.orig/src/declarative/qml/qdeclarativeengine_p.h 2014-03-12 14:48:09.853607295 +0100 ++++ qt4-x11-4.8.4+dfsg/src/declarative/qml/qdeclarativeengine_p.h 2014-03-12 14:49:13.857603675 +0100 +@@ -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.1/debian/patches/series qt4-x11-4.8.1/debian/patches/series --- qt4-x11-4.8.1/debian/patches/series 2013-12-19 09:45:34.000000000 +0000 +++ qt4-x11-4.8.1/debian/patches/series 2014-04-24 14:27:58.000000000 +0000 @@ -54,6 +54,7 @@ kubuntu_94_xinput_valuators_fix.diff kubuntu_95_qt_disable_bounce.diff kubuntu_97_a11y_qt_and_qml_backport.diff +kubuntu_98_a11y_fix_crash.diff kubuntu_31_unity_workarea_atom.diff kubuntu_33_shaped_drag.diff kubuntu_35_text_cursor_position.diff