diff options
Diffstat (limited to '')
-rw-r--r-- | kde/patch/kdepimlibs-framework.patch | 3 | ||||
-rw-r--r-- | kde/patch/kdepimlibs-framework/kdepimlibs_autotests.diff | 10 | ||||
-rw-r--r-- | kde/patch/kdepimlibs.patch | 3 | ||||
-rw-r--r-- | kde/patch/kdepimlibs/kdepimlibs_kmail_crash.patch | 59 |
4 files changed, 62 insertions, 13 deletions
diff --git a/kde/patch/kdepimlibs-framework.patch b/kde/patch/kdepimlibs-framework.patch deleted file mode 100644 index 36c99fa..0000000 --- a/kde/patch/kdepimlibs-framework.patch +++ /dev/null @@ -1,3 +0,0 @@ -# The autotests generate ECM errors so skip building them: -cat $CWD/patch/kdepimlibs-framework/kdepimlibs_autotests.diff | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } - diff --git a/kde/patch/kdepimlibs-framework/kdepimlibs_autotests.diff b/kde/patch/kdepimlibs-framework/kdepimlibs_autotests.diff deleted file mode 100644 index 24b21ff..0000000 --- a/kde/patch/kdepimlibs-framework/kdepimlibs_autotests.diff +++ /dev/null @@ -1,10 +0,0 @@ ---- a/syndication/CMakeLists.txt 2014-06-02 13:44:23.000000000 +0200 -+++ b/syndication/CMakeLists.txt 2014-06-02 16:51:00.393339484 +0200 -@@ -41,7 +41,6 @@ - ########### Targets ########### - - add_subdirectory(src/syndication) --add_subdirectory(autotests) - - ########### CMake Config Files ########### - set(CMAKECONFIG_INSTALL_DIR "${CMAKECONFIG_INSTALL_PREFIX}/KF5Syndication") diff --git a/kde/patch/kdepimlibs.patch b/kde/patch/kdepimlibs.patch new file mode 100644 index 0000000..bae1792 --- /dev/null +++ b/kde/patch/kdepimlibs.patch @@ -0,0 +1,3 @@ +# Fix a crash in kmail (fixed in 15.12.1): +cat $CWD/patch/kdepimlibs/kdepimlibs_kmail_crash.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } + diff --git a/kde/patch/kdepimlibs/kdepimlibs_kmail_crash.patch b/kde/patch/kdepimlibs/kdepimlibs_kmail_crash.patch new file mode 100644 index 0000000..1614e07 --- /dev/null +++ b/kde/patch/kdepimlibs/kdepimlibs_kmail_crash.patch @@ -0,0 +1,59 @@ +From: Weng Xuetian <wengxt@gmail.com> +Date: Thu, 17 Dec 2015 16:19:36 +0000 +Subject: Fix possible crash upon application exits (e.g. kmail) +X-Git-Url: http://quickgit.kde.org/?p=kdepimlibs.git&a=commitdiff&h=c6bf33a9018587e96a350bfd0b2bffde1859db27 +--- +Fix possible crash upon application exits (e.g. kmail) + +Qt lambda connection will not automatically disconnect if no context +qobject is provided. Since SessionPrivate is not a qobject, disconnect +the connection in the destructor to prevent accessing deleted object. + +REVIEW: 126395 +--- + + +--- a/akonadi/src/core/session.cpp ++++ b/akonadi/src/core/session.cpp +@@ -301,15 +301,16 @@ + // Shutdown the thread before QApplication event loop quits - the + // thread()->wait() mechanism in ConnectionThread dtor crashes sometimes + // when called from QApplication destructor +- QObject::connect(qApp, &QCoreApplication::aboutToQuit, +- [this]() { +- delete connThread; +- connThread = Q_NULLPTR; +- }); ++ connThreadCleanUp = QObject::connect(qApp, &QCoreApplication::aboutToQuit, ++ [this]() { ++ delete connThread; ++ connThread = Q_NULLPTR; ++ }); + } + + SessionPrivate::~SessionPrivate() + { ++ QObject::disconnect(connThreadCleanUp); + delete connThread; + } + + +--- a/akonadi/src/core/session_p.h ++++ b/akonadi/src/core/session_p.h +@@ -29,6 +29,7 @@ + + #include <QtCore/QQueue> + #include <QtCore/QThreadStorage> ++#include <QtCore/QMetaObject> + #include <QFile> + + class QIODevice; +@@ -125,6 +126,7 @@ + Session *mParent; + QThread *thread; + ConnectionThread *connThread; ++ QMetaObject::Connection connThreadCleanUp; + QByteArray sessionId; + bool connected; + qint64 theNextTag; + |