summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2018-10-16 19:16:25 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2018-10-18 20:14:22 +0200
commit2f9834438ec8c1abd82d481ae44d7e54d62ed739 (patch)
tree29ad3af73ae1a086ccffc461c3982caea520599e /kde-plasma/user-manager
parentmedia-libs/mesa: Require libdrm-2.4.96 (diff)
downloadgentoo-2f9834438ec8c1abd82d481ae44d7e54d62ed739.tar.gz
gentoo-2f9834438ec8c1abd82d481ae44d7e54d62ed739.tar.bz2
gentoo-2f9834438ec8c1abd82d481ae44d7e54d62ed739.zip
kde-plasma: Drop KDE Plasma 5.12.5
Obsolete by KDE Plasma 5.13.5 stable. Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> Package-Manager: Portage-2.3.51, Repoman-2.3.11
Diffstat (limited to 'kde-plasma/user-manager')
-rw-r--r--kde-plasma/user-manager/Manifest1
-rw-r--r--kde-plasma/user-manager/files/user-manager-5.12.5-fix-addAccountToCache.patch104
-rw-r--r--kde-plasma/user-manager/user-manager-5.12.5-r1.ebuild29
3 files changed, 0 insertions, 134 deletions
diff --git a/kde-plasma/user-manager/Manifest b/kde-plasma/user-manager/Manifest
index 4a5bbcaac7ab..72f1833f56c2 100644
--- a/kde-plasma/user-manager/Manifest
+++ b/kde-plasma/user-manager/Manifest
@@ -1,4 +1,3 @@
-DIST user-manager-5.12.5.tar.xz 544812 BLAKE2B e885a9be4ecbedb04ea0b957606a3b8d91cf0b0b71f5efe7fd68c29d3c577dd1c2394653dbe5948f40f74f8e2f478a2feb38d05003de762ae1e88eafae7f5932 SHA512 c553287b20d0d25c79972b2de375696c8759026a4f8d2203c3f2e9b547461bd93e27a5e14a5584ccb045a25ac107bc875dbe105e97d59aefdd588406a41c515e
DIST user-manager-5.12.7.tar.xz 545748 BLAKE2B 3cf734475de842f3fce0a7760495336dd14f21fd2bea72ebf24992e29a7051bd2c2d2235582d8fa4b3a13f9e2852452fc56f2b1931da78fc231065c5ab445fc6 SHA512 286b4adc7ff01c25f1f32bc64e9f119aa693d74e0468e575c792d5357df6066c18de233eb78acd5ed4288518902461ffa7408af8d559e8b5f4081893bdec7f8f
DIST user-manager-5.13.5.tar.xz 545008 BLAKE2B 47a2e5cf4e2ee26f7337ab89716519ab248422b686be1acaf75306d44044bdbd931b4d032057a10a243fa12e237cc1dae5aaaeba57012b7e09d048c5ec0a1ca2 SHA512 e18902843b7b6079ad712996cc90850c2e662c710b67e1d54dbec7db9194b1c7c640b6ced0bdf51c1f0974ba24edbff691cad347689e202e4478681a194e5172
DIST user-manager-5.14.1.tar.xz 546200 BLAKE2B 25719d67396211633fa2266755f8ac9b9c09da45e29b6e969676baf577962cb7787f9e724977113a11dc5319ea94d8e867f703991784aa0b15b32a5a478ffe3f SHA512 6687ec4c7dd56e15b4b7dcdc8d9545310af6381f6ccb7e2eb2302adc09563286c0697c4d23e2013262ce143e5e88f2ef37dc12cd7ab8634918acc3eccd22549c
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
deleted file mode 100644
index bc823adf8c9d..000000000000
--- a/kde-plasma/user-manager/files/user-manager-5.12.5-fix-addAccountToCache.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-From ff88e24e4380a341f70f9b005acbce2ae9afa60a Mon Sep 17 00:00:00 2001
-From: Valeriy Malov <jazzvoid@gmail.com>
-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 <void> 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
deleted file mode 100644
index 203763e4f75f..000000000000
--- a/kde-plasma/user-manager/user-manager-5.12.5-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# 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" )