From 30c53e395853f5bfe805a1e429fcf26666eed8f8 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 17 May 2018 22:49:47 +0100 Subject: gentoo resync : 17.05.2018 --- kde-plasma/user-manager/Manifest | 2 + ...user-manager-5.12.5-fix-addAccountToCache.patch | 104 +++++++++++++++++++++ .../user-manager/user-manager-5.12.5-r1.ebuild | 29 ++++++ 3 files changed, 135 insertions(+) create mode 100644 kde-plasma/user-manager/files/user-manager-5.12.5-fix-addAccountToCache.patch create mode 100644 kde-plasma/user-manager/user-manager-5.12.5-r1.ebuild (limited to 'kde-plasma/user-manager') diff --git a/kde-plasma/user-manager/Manifest b/kde-plasma/user-manager/Manifest index f2661d6e0358..d1367eef92bd 100644 --- a/kde-plasma/user-manager/Manifest +++ b/kde-plasma/user-manager/Manifest @@ -1,5 +1,7 @@ +AUX user-manager-5.12.5-fix-addAccountToCache.patch 3634 BLAKE2B 13a41b87627fbbd81dd1a3ed7083df5843a100f26ee1bd3576d98e8a61fd33df717cb1aebaf91bf49b3058089f73dc7e18ebe0ea411a42d7a8a44862df3efc8e SHA512 a0d04f03f76fab413d1f721453c996c3f88bb571eeeffe57ac85870d29447766b6ea66bbd5928b97355022778b5c74ba95021cc886c38b3911c788e3ad5661d4 DIST user-manager-5.11.5.tar.xz 548208 BLAKE2B 92bd23929537bf3a5d6bfc73d04c0aec40029188acfce0859ecf0feb476695c3bcc8ff3b1dd71eed4b7592482e18e8661f54d6f8591da5cd63d9d472d37486c3 SHA512 9c4ae28282bc1ccfc1cc0c817fc89c80185e0e9d756186d920d91d177492de1bf3420cab93e823658614c9e637c8cfeadfde8c093f50097331371efea763cdc6 DIST user-manager-5.12.5.tar.xz 544812 BLAKE2B e885a9be4ecbedb04ea0b957606a3b8d91cf0b0b71f5efe7fd68c29d3c577dd1c2394653dbe5948f40f74f8e2f478a2feb38d05003de762ae1e88eafae7f5932 SHA512 c553287b20d0d25c79972b2de375696c8759026a4f8d2203c3f2e9b547461bd93e27a5e14a5584ccb045a25ac107bc875dbe105e97d59aefdd588406a41c515e EBUILD user-manager-5.11.5.ebuild 668 BLAKE2B 65c027257ba173b05b2ca0161f372c1a478fd84a7301bcef018be3ed2a2d12051920469e94132a6927c6d2217e007c4419e04de61902d66a402cddbcaa884eed SHA512 964458719bf604ca0c37e411a913addfca197bff4a9ef3163ad680cdd308750a349ecfe3c2df4ff1088e2cdbaf9546be31942d1590f8bdc4f3deda991439baa4 +EBUILD user-manager-5.12.5-r1.ebuild 730 BLAKE2B 55d588ebfbaf43544402c43ae1fc19d7c5b2c7b2d5a890d0527c4ec158858e32b6538dc1c71482fda3b198441660eb663d38bd6cf35d3742cba51298c5577ba6 SHA512 c84662796ff033ef895565ef7100105ffe67be790e3265c719bd7f84a3e33cce10a06b52c496ce2774a4d12f3870354c7a2965348db95e9003e4cf1fc1ebba39 EBUILD user-manager-5.12.5.ebuild 670 BLAKE2B 1aafa076398b02922fadbe55f44967398971d0e868f48cb5eae1ccc8ef92a9d4297ea5ad989989cf950acb546af80d35f4d44d3172f88ce1f276009d3402ebf0 SHA512 51ec1c8eb1ec9c686a9be09066524500813f8794c5fe61c8bb95f32e53f69d9426f328b7ccde22e7027fe3ea3591604d2b10b87752560293085aee08bb78ecd0 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 diff --git a/kde-plasma/user-manager/files/user-manager-5.12.5-fix-addAccountToCache.patch b/kde-plasma/user-manager/files/user-manager-5.12.5-fix-addAccountToCache.patch new file mode 100644 index 000000000000..bc823adf8c9d --- /dev/null +++ b/kde-plasma/user-manager/files/user-manager-5.12.5-fix-addAccountToCache.patch @@ -0,0 +1,104 @@ +From ff88e24e4380a341f70f9b005acbce2ae9afa60a Mon Sep 17 00:00:00 2001 +From: Valeriy Malov +Date: Sat, 12 May 2018 18:13:25 +0300 +Subject: Split replaceAccount from addAccountToCache + +Summary: +We were accidentally overwriting first account in the model with +currently logged in user after polling AccountsService + +BUG: 336994 + +Test Plan: check if kcmshell5 user_manager lists mutliple users on cold boot + +Reviewers: #plasma, davidedmundson + +Reviewed By: #plasma, davidedmundson + +Subscribers: davidedmundson, ngraham, rdieter, plasma-devel + +Tags: #plasma + +Differential Revision: https://phabricator.kde.org/D12837 +--- + src/lib/accountmodel.cpp | 26 ++++++++++++++++---------- + src/lib/accountmodel.h | 1 + + 2 files changed, 17 insertions(+), 10 deletions(-) + +diff --git a/src/lib/accountmodel.cpp b/src/lib/accountmodel.cpp +index 8ebc4ff..8258810 100644 +--- a/src/lib/accountmodel.cpp ++++ b/src/lib/accountmodel.cpp +@@ -93,8 +93,8 @@ AccountModel::AccountModel(QObject* parent) + addAccount(path.path()); + } + +- //Adding fake "new user" directly into cache +- addAccountToCache("new-user", 0); ++ // Adding fake "new user" directly into cache ++ addAccountToCache("new-user", nullptr); + + m_kEmailSettings.setProfile(m_kEmailSettings.defaultProfileName()); + +@@ -368,11 +368,7 @@ void AccountModel::addAccount(const QString& path) + void AccountModel::addAccountToCache(const QString& path, Account* acc, int pos) + { + if (pos > -1) { +- if (m_userPath.count() > 0) { +- m_userPath.replace(pos, path); +- } else { +- m_userPath.insert(pos, path); +- } ++ m_userPath.insert(pos, path); + } else { + m_userPath.append(path); + } +@@ -381,6 +377,16 @@ void AccountModel::addAccountToCache(const QString& path, Account* acc, int pos) + m_loggedAccounts[path] = false; + } + ++void AccountModel::replaceAccount(const QString &path, OrgFreedesktopAccountsUserInterface *acc, int pos) ++{ ++ if (pos >= m_userPath.size() || pos < 0) { ++ return; ++ } ++ m_userPath.replace(pos, path); ++ ++ m_users.insert(path, acc); ++ m_loggedAccounts[path] = false; ++} + + void AccountModel::removeAccount(const QString& path) + { +@@ -429,13 +435,13 @@ void AccountModel::UserAdded(const QDBusObjectPath& dbusPath) + } + connect(acc, SIGNAL(Changed()), SLOT(Changed())); + +- //First, we modify "new-user" to become the new created user ++ // First, we modify "new-user" to become the new created user + int row = rowCount(); +- addAccountToCache(path, acc, row - 1); ++ replaceAccount(path, acc, row - 1); + QModelIndex changedIndex = index(row - 1, 0); + emit dataChanged(changedIndex, changedIndex); + +- //Then we add new-user again. ++ // Then we add new-user again. + beginInsertRows(QModelIndex(), row, row); + addAccountToCache("new-user", 0); + endInsertRows(); +diff --git a/src/lib/accountmodel.h b/src/lib/accountmodel.h +index b666239..f515613 100644 +--- a/src/lib/accountmodel.h ++++ b/src/lib/accountmodel.h +@@ -79,6 +79,7 @@ class AccountModel : public QAbstractListModel + const QString accountPathForUid(uint uid) const; + void addAccount(const QString &path); + void addAccountToCache(const QString &path, OrgFreedesktopAccountsUserInterface *acc, int pos = -1); ++ void replaceAccount(const QString &path, OrgFreedesktopAccountsUserInterface *acc, int pos); + void removeAccount(const QString &path); + bool checkForErrors(QDBusPendingReply reply) const; + QString cryptPassword(const QString &password) const; +-- +cgit v0.11.2 + diff --git a/kde-plasma/user-manager/user-manager-5.12.5-r1.ebuild b/kde-plasma/user-manager/user-manager-5.12.5-r1.ebuild new file mode 100644 index 000000000000..7be2c877f074 --- /dev/null +++ b/kde-plasma/user-manager/user-manager-5.12.5-r1.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit kde5 + +DESCRIPTION="Simple system settings module to manage the users of your system" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="" + +DEPEND=" + $(add_frameworks_dep kauth) + $(add_frameworks_dep kcmutils) + $(add_frameworks_dep kconfig) + $(add_frameworks_dep kconfigwidgets) + $(add_frameworks_dep kcoreaddons) + $(add_frameworks_dep ki18n) + $(add_frameworks_dep kiconthemes) + $(add_frameworks_dep kio) + $(add_frameworks_dep kwidgetsaddons) + $(add_qt_dep qtdbus) + $(add_qt_dep qtgui) + $(add_qt_dep qtwidgets) + >=dev-libs/libpwquality-1.3.0 +" +RDEPEND="${DEPEND}" + +PATCHES=( "${FILESDIR}/${P}-fix-addAccountToCache.patch" ) -- cgit v1.2.3