diff options
author | Eric Hameleers <alien@slackware.com> | 2015-12-10 12:39:35 +0100 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2015-12-10 12:39:35 +0100 |
commit | 83c0688ee8dc710286091d30cc1fbaea32ce1554 (patch) | |
tree | 7c3013a4dedf0a9a51c2406bc439b464b17d0c75 /kde/patch | |
parent | 105d02bc290a959153570c5d87dec09a8aaaf300 (diff) | |
download | ktown-83c0688ee8dc710286091d30cc1fbaea32ce1554.tar.gz ktown-83c0688ee8dc710286091d30cc1fbaea32ce1554.tar.xz |
KDE 5_15.11: recompilations as a result of major library updates in -current.5_15.11
Diffstat (limited to 'kde/patch')
-rw-r--r-- | kde/patch/kaccounts-integration.patch | 4 | ||||
-rw-r--r-- | kde/patch/kaccounts-integration/kaccounts-integration-15.08.3_service.patch | 28 | ||||
-rw-r--r-- | kde/patch/ktp-accounts-kcm.patch | 2 |
3 files changed, 33 insertions, 1 deletions
diff --git a/kde/patch/kaccounts-integration.patch b/kde/patch/kaccounts-integration.patch new file mode 100644 index 0000000..f9870eb --- /dev/null +++ b/kde/patch/kaccounts-integration.patch @@ -0,0 +1,4 @@ +# A bug with 15.08.2/.3 breaks KDE Telepathy accounts connection . +# Will be fixed in 15.12.0: +cat $CWD/patch/kaccounts-integration/kaccounts-integration-15.08.3_service.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } + diff --git a/kde/patch/kaccounts-integration/kaccounts-integration-15.08.3_service.patch b/kde/patch/kaccounts-integration/kaccounts-integration-15.08.3_service.patch new file mode 100644 index 0000000..e41d58b --- /dev/null +++ b/kde/patch/kaccounts-integration/kaccounts-integration-15.08.3_service.patch @@ -0,0 +1,28 @@ +--- a/src/jobs/createaccount.cpp ++++ b/src/jobs/createaccount.cpp +@@ -141,8 +141,8 @@ + + m_done = true; + ++ connect(m_identity, &SignOn::Identity::credentialsStored, m_identity, &SignOn::Identity::queryInfo); + m_identity->storeCredentials(); +- connect(m_identity, &SignOn::Identity::credentialsStored, m_identity, &SignOn::Identity::queryInfo); + } + + void CreateAccount::pluginError(const QString &error) +@@ -177,12 +177,12 @@ + 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(); + diff --git a/kde/patch/ktp-accounts-kcm.patch b/kde/patch/ktp-accounts-kcm.patch index 8d1c0da..ea37b9e 100644 --- a/kde/patch/ktp-accounts-kcm.patch +++ b/kde/patch/ktp-accounts-kcm.patch @@ -1,4 +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 ; } +#cat $CWD/patch/ktp-accounts-kcm/ktp-accounts-kcm_kdebug_351785.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } |