summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--kde/build/ktp-accounts-kcm1
-rw-r--r--kde/patch/ktp-accounts-kcm.patch4
-rw-r--r--kde/patch/ktp-accounts-kcm/ktp-accounts-kcm_kdebug_351785.patch32
3 files changed, 37 insertions, 0 deletions
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 <mklapetek@kde.org>
+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);
+ }
+ }
+ }
+