From c09bd44de3d6b82ea66f24d7763d048810ff7b54 Mon Sep 17 00:00:00 2001 From: Martin Kyral Date: May 25 2018 07:21:37 +0000 Subject: 5.12.90 --- diff --git a/.gitignore b/.gitignore index dd1c7d9..2dd92fe 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /user-manager-5.12.5.tar.xz +/user-manager-5.12.90.tar.xz diff --git a/0001-Enable-anti-aliasing-for-user-avatars.patch b/0001-Enable-anti-aliasing-for-user-avatars.patch deleted file mode 100644 index a1891e0..0000000 --- a/0001-Enable-anti-aliasing-for-user-avatars.patch +++ /dev/null @@ -1,41 +0,0 @@ -From da05675b4292af42e6757284e60700a8bb25856d Mon Sep 17 00:00:00 2001 -From: Kirill Tatunov -Date: Wed, 2 May 2018 15:44:50 +0100 -Subject: [PATCH 1/3] Enable anti-aliasing for user avatars - -Summary: By default, QT uses fast transformations when scaling pixmaps but it results in a very pixelated image. This patch fixes it for avatars in the user manager module. - -Test Plan: -Resolution of the original avatar image is 256x256. -Before: {F5819211} -After: {F5819213} - -Reviewers: #plasma, davidedmundson - -Reviewed By: #plasma, davidedmundson - -Subscribers: abetts, davidedmundson, ngraham, plasma-devel - -Tags: #plasma - -Differential Revision: https://phabricator.kde.org/D12468 ---- - src/lib/accountmodel.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/lib/accountmodel.cpp b/src/lib/accountmodel.cpp -index e15a657..8ebc4ff 100644 ---- a/src/lib/accountmodel.cpp -+++ b/src/lib/accountmodel.cpp -@@ -149,7 +149,7 @@ QVariant AccountModel::data(const QModelIndex& index, int role) const - if (!file.exists()) { - return QIcon::fromTheme("user-identity").pixmap(size, size); - } -- return QPixmap(file.fileName()).scaled(size, size); -+ return QPixmap(file.fileName()).scaled(size, size, Qt::KeepAspectRatio, Qt::SmoothTransformation); - } - case AccountModel::RealName: - return acc->realName(); --- -2.14.3 - diff --git a/0003-Split-replaceAccount-from-addAccountToCache.patch b/0003-Split-replaceAccount-from-addAccountToCache.patch deleted file mode 100644 index 0cef228..0000000 --- a/0003-Split-replaceAccount-from-addAccountToCache.patch +++ /dev/null @@ -1,104 +0,0 @@ -From ff88e24e4380a341f70f9b005acbce2ae9afa60a Mon Sep 17 00:00:00 2001 -From: Valeriy Malov -Date: Sat, 12 May 2018 18:13:25 +0300 -Subject: [PATCH 3/3] 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; --- -2.14.3 - diff --git a/plasma-user-manager.spec b/plasma-user-manager.spec index 8a5a14d..8a94d71 100644 --- a/plasma-user-manager.spec +++ b/plasma-user-manager.spec @@ -2,8 +2,8 @@ Name: plasma-user-manager Summary: Manage the users of your system -Version: 5.12.5 -Release: 2%{?dist} +Version: 5.12.90 +Release: 1%{?dist} License: GPLv2 URL: https://cgit.kde.org/user-manager.git/ @@ -17,8 +17,6 @@ URL: https://cgit.kde.org/user-manager.git/ Source0: http://download.kde.org/%{stable}/plasma/%{version}/user-manager-%{version}.tar.xz ## upstream patches -Patch1: 0001-Enable-anti-aliasing-for-user-avatars.patch -Patch3: 0003-Split-replaceAccount-from-addAccountToCache.patch ## downstream patches # FIXME: make unconditional and upstreamable @@ -76,6 +74,9 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform} %changelog +* Fri May 18 2018 Martin Kyral - 5.12.90-1 +- 5.12.90 + * Thu May 17 2018 Rex Dieter - 5.12.5-2 - backport upstream fixes diff --git a/sources b/sources index 64a72a3..d9d0cc7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (user-manager-5.12.5.tar.xz) = c553287b20d0d25c79972b2de375696c8759026a4f8d2203c3f2e9b547461bd93e27a5e14a5584ccb045a25ac107bc875dbe105e97d59aefdd588406a41c515e +SHA512 (user-manager-5.12.90.tar.xz) = 2b0d05d2fbe1bc9f0850d66bc32931eff90f6d4d8f39c01115590974d6d3c5e74b47634b7795df1b593be08790c425cad72bac06319c2e431b179c962358abaf