From 44bc0883d1fa8009f873f475ca794010309745cd Mon Sep 17 00:00:00 2001 From: Eric Hameleers Date: Wed, 14 Oct 2015 13:50:17 +0200 Subject: Apply patch to fix KDEBUG #351785: crashes in the KDE Telepathy tray icon. According to https://bugs.kde.org/show_bug.cgi?id=351785 this should have gone into ktp-accounts-kcm-15.08.2 but in fact it is missing from the source tarball. --- kde/build/ktp-accounts-kcm | 1 + kde/patch/ktp-accounts-kcm.patch | 4 +++ .../ktp-accounts-kcm_kdebug_351785.patch | 32 ++++++++++++++++++++++ 3 files changed, 37 insertions(+) create mode 100644 kde/build/ktp-accounts-kcm create mode 100644 kde/patch/ktp-accounts-kcm.patch create mode 100644 kde/patch/ktp-accounts-kcm/ktp-accounts-kcm_kdebug_351785.patch (limited to 'kde') diff --git a/kde/build/ktp-accounts-kcm b/kde/build/ktp-accounts-kcm new file mode 100644 index 0000000..0cfbf08 --- /dev/null +++ b/kde/build/ktp-accounts-kcm @@ -0,0 +1 @@ +2 diff --git a/kde/patch/ktp-accounts-kcm.patch b/kde/patch/ktp-accounts-kcm.patch new file mode 100644 index 0000000..8d1c0da --- /dev/null +++ b/kde/patch/ktp-accounts-kcm.patch @@ -0,0 +1,4 @@ +# Fix a crash in KDE Telepathy which was supposed to be fixed in 15.08.2: +# See also https://bugs.kde.org/show_bug.cgi?id=351785 +cat $CWD/patch/ktp-accounts-kcm/ktp-accounts-kcm_kdebug_351785.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } + diff --git a/kde/patch/ktp-accounts-kcm/ktp-accounts-kcm_kdebug_351785.patch b/kde/patch/ktp-accounts-kcm/ktp-accounts-kcm_kdebug_351785.patch new file mode 100644 index 0000000..aa77aae --- /dev/null +++ b/kde/patch/ktp-accounts-kcm/ktp-accounts-kcm_kdebug_351785.patch @@ -0,0 +1,32 @@ +From: Martin Klapetek +Date: Thu, 17 Sep 2015 16:11:30 +0000 +Subject: [kaccounts] Emit configUiReady() when config UI is ready +X-Git-Url: http://quickgit.kde.org/?p=ktp-accounts-kcm.git&a=commitdiff&h=07c7cc5309e11171b2e552678d58257ccfc44e42 +--- +[kaccounts] Emit configUiReady() when config UI is ready + +Should prevent the crash when clicking the Configure button + +(requires kaccounts-integration 15.08.2) + +BUG: 351785 +FIXED-IN: 15.08.2 +--- + + +--- a/plugins/kaccounts/kaccounts-ui-provider.cpp ++++ b/plugins/kaccounts/kaccounts-ui-provider.cpp +@@ -106,10 +106,10 @@ + + if (d->type == KAccountsUiPlugin::ConfigureAccountDialog) { + if (d->accountManager->isReady()) { +- Q_EMIT uiReady(); ++ Q_EMIT configUiReady(); + } else { + // let's wait for AM to become ready first +- connect(d->accountManager->becomeReady(), &Tp::PendingOperation::finished, this, &KAccountsUiProvider::uiReady); ++ connect(d->accountManager->becomeReady(), &Tp::PendingOperation::finished, this, &KAccountsUiProvider::configUiReady); + } + } + } + -- cgit v1.2.3