diff --git a/.gitignore b/.gitignore index 1a2eb65..86c6072 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/plasma-workspace-5.8.2.tar.xz +/plasma-workspace-5.8.3.tar.xz diff --git a/0002-Directly-show-the-username-password-textboxes-when-u.patch b/0002-Directly-show-the-username-password-textboxes-when-u.patch deleted file mode 100644 index 8db530e..0000000 --- a/0002-Directly-show-the-username-password-textboxes-when-u.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 70fc5cc70281abad8e50ae17a9d0d90817488813 Mon Sep 17 00:00:00 2001 -From: Antonio Larrosa -Date: Fri, 21 Oct 2016 14:33:04 +0200 -Subject: [PATCH 2/3] Directly show the username/password textboxes when user - list is empty - -Summary: -If the user list is empty (for example, because regular users are hidden -or sddm's configuration includes something like MinimumUid=2000) -show directly the username/password textboxes instead of an empty -user list. - -Test Plan: -I edited /etc/sddm.conf and added MinimumUid=2000 to the [Users] group, -then restarted sddm. - -Reviewers: #plasma, davidedmundson - -Reviewed By: #plasma, davidedmundson - -Subscribers: plasma-devel - -Tags: #plasma - -Differential Revision: https://phabricator.kde.org/D3128 ---- - sddm-theme/Main.qml | 10 +++++++++- - 1 file changed, 9 insertions(+), 1 deletion(-) - -diff --git a/sddm-theme/Main.qml b/sddm-theme/Main.qml -index 4230cbe..9078743 100644 ---- a/sddm-theme/Main.qml -+++ b/sddm-theme/Main.qml -@@ -90,7 +90,15 @@ PlasmaCore.ColorScope { - id: userListComponent - userListModel: userModel - userListCurrentIndex: userModel.lastIndex >= 0 ? userModel.lastIndex : 0 -- showUserList: (userListModel.count && userListModel.disableAvatarsThreshold) ? userListModel.count <= userListModel.disableAvatarsThreshold : true -+ showUserList: { -+ if ( !userListModel.hasOwnProperty("count") -+ || !userListModel.hasOwnProperty("disableAvatarsThreshold")) -+ return true -+ -+ if ( userListModel.count == 0 ) return false -+ -+ return userListModel.count <= userListModel.disableAvatarsThreshold -+ } - - notificationMessage: { - var text = "" --- -2.7.4 - diff --git a/0003-Remove-unused-import-QtGraphicalEffects.patch b/0003-Remove-unused-import-QtGraphicalEffects.patch deleted file mode 100644 index e407257..0000000 --- a/0003-Remove-unused-import-QtGraphicalEffects.patch +++ /dev/null @@ -1,27 +0,0 @@ -From b61c232722aa80567590ee6dfee655e93e95f7ff Mon Sep 17 00:00:00 2001 -From: Kai Uwe Broulik -Date: Sun, 23 Oct 2016 13:24:00 +0200 -Subject: [PATCH 3/3] Remove unused import QtGraphicalEffects - -BUG: 371493 -FIXED-IN: 5.8.3 ---- - sddm-theme/Background.qml | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/sddm-theme/Background.qml b/sddm-theme/Background.qml -index 9a15c94..085ea74 100644 ---- a/sddm-theme/Background.qml -+++ b/sddm-theme/Background.qml -@@ -23,8 +23,6 @@ - ***************************************************************************/ - - import QtQuick 2.2 --import QtGraphicalEffects 1.0 -- - - FocusScope { - property alias source: image.source --- -2.7.4 - diff --git a/plasma-workspace.spec b/plasma-workspace.spec index 2d70f2e..7dfee6f 100644 --- a/plasma-workspace.spec +++ b/plasma-workspace.spec @@ -6,8 +6,8 @@ Name: plasma-workspace Summary: Plasma workspace, applications and applets -Version: 5.8.2 -Release: 4%{?dist} +Version: 5.8.3 +Release: 1%{?dist} License: GPLv2+ URL: https://quickgit.kde.org/?p=%{name}.git @@ -52,8 +52,6 @@ Patch51: kde-runtime-4.9.0-installdbgsymbols.patch Patch52: plasma-workspace-5.6.4-installdbgsymbols.patch ## upstream Patches -Patch2: 0002-Directly-show-the-username-password-textboxes-when-u.patch -Patch3: 0003-Remove-unused-import-QtGraphicalEffects.patch ## upstream Patches (master branch) # systray-related fixes @@ -432,8 +430,6 @@ BuildArch: noarch %setup -q ## upstream patches -%patch2 -p1 -b .0002 -%patch3 -p1 -b .0003 #patch31 -p1 -b .0031 %patch33 -p1 -b .0033 @@ -712,6 +708,9 @@ fi %changelog +* Tue Nov 01 2016 Rex Dieter - 5.8.3-1 +- 5.8.3 + * Sun Oct 23 2016 Rex Dieter - 5.8.2-4 - sddm-breeze: Requires: qt5-qtquickcontrols instead (kde#371493) diff --git a/sources b/sources index 5010ebc..d126b76 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a2e41bb137454542eed849858f893ef9 plasma-workspace-5.8.2.tar.xz +b1dfb4e3dcbc4d5abc292c13c1f56c98 plasma-workspace-5.8.3.tar.xz