kde-apps/kaccounts-integration: backport patch from upstream fixing telepathy authentication failure

2 files changed, 46 insertions, 0 deletions

diff --git a/kde-apps/kaccounts-integration/files/kaccounts-integration-15.08.3-telepathy.patch b/kde-apps/kaccounts-integration/files/kaccounts-integration-15.08.3-telepathy.patch
new file mode 100644
index 000000000000..be6a8191c51f
--- /dev/null
+++ b/kde-apps/kaccounts-integration/files/kaccounts-integration-15.08.3-telepathy.patch
@@ -0,0 +1,44 @@
+From fe6b9c7b2511ba5ebc15542b0b7280c55e17ffa4 Mon Sep 17 00:00:00 2001
+From: Georgy Kirichenko <kirichenkoga@gmail.com>
+Date: Fri, 4 Dec 2015 14:00:36 -0500
+Subject: [PATCH] [createaccount] Fix wrongly set username on a service instead
+ of account
+
+BUG: 354949
+FIXED-IN: 15.12.0
+---
+ src/jobs/createaccount.cpp | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/jobs/createaccount.cpp b/src/jobs/createaccount.cpp
+index b55264b..22aff1b 100644
+--- a/src/jobs/createaccount.cpp
++++ b/src/jobs/createaccount.cpp
+@@ -141,8 +141,8 @@ void CreateAccount::pluginFinished(const QString &screenName, const QString &sec
+ 
+     m_done = true;
+ 
+-    m_identity->storeCredentials();
+     connect(m_identity, &SignOn::Identity::credentialsStored, m_identity, &SignOn::Identity::queryInfo);
++    m_identity->storeCredentials();
+ }
+ 
+ void CreateAccount::pluginError(const QString &error)
+@@ -177,12 +177,12 @@ void CreateAccount::info(const SignOn::IdentityInfo &info)
+         return;
+     }
+ 
++    m_account->selectService();
++
+     if (m_account->displayName().isEmpty()) {
+         m_account->setDisplayName(info.userName());
+     }
+     m_account->setValue("username", info.userName());
+-
+-    m_account->selectService();
+     m_account->setCredentialsId(info.id());
+ 
+     Accounts::AuthData authData = m_accInfo->authData();
+-- 
+2.4.10
+
diff --git a/kde-apps/kaccounts-integration/kaccounts-integration-15.08.3.ebuild b/kde-apps/kaccounts-integration/kaccounts-integration-15.08.3-r1.ebuild
index 3c73c78a1702..a35f36ebc2b3 100644
--- a/kde-apps/kaccounts-integration/kaccounts-integration-15.08.3.ebuild
+++ b/kde-apps/kaccounts-integration/kaccounts-integration-15.08.3-r1.ebuild
@@ -39,3 +39,5 @@ DEPEND="${RDEPEND}
 
 # bug #549444
 RESTRICT="test"
+
+PATCHES=( "${FILESDIR}/${P}-telepathy.patch" )