sddm-breeze: Requires: qt5-qtquickcontrols instead (kde#371493)

epel9
Rex Dieter 8 years ago
parent deb3013cf4
commit 28e0cecebd

@ -0,0 +1,53 @@
From 70fc5cc70281abad8e50ae17a9d0d90817488813 Mon Sep 17 00:00:00 2001
From: Antonio Larrosa <larrosa@kde.org>
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

@ -0,0 +1,27 @@
From b61c232722aa80567590ee6dfee655e93e95f7ff Mon Sep 17 00:00:00 2001
From: Kai Uwe Broulik <kde@privat.broulik.de>
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

@ -7,7 +7,7 @@
Name: plasma-workspace Name: plasma-workspace
Summary: Plasma workspace, applications and applets Summary: Plasma workspace, applications and applets
Version: 5.8.2 Version: 5.8.2
Release: 3%{?dist} Release: 4%{?dist}
License: GPLv2+ License: GPLv2+
URL: https://quickgit.kde.org/?p=%{name}.git URL: https://quickgit.kde.org/?p=%{name}.git
@ -52,6 +52,8 @@ Patch51: kde-runtime-4.9.0-installdbgsymbols.patch
Patch52: plasma-workspace-5.6.4-installdbgsymbols.patch Patch52: plasma-workspace-5.6.4-installdbgsymbols.patch
## upstream Patches ## upstream Patches
Patch2: 0002-Directly-show-the-username-password-textboxes-when-u.patch
Patch3: 0003-Remove-unused-import-QtGraphicalEffects.patch
## upstream Patches (master branch) ## upstream Patches (master branch)
# systray-related fixes # systray-related fixes
@ -377,9 +379,8 @@ Summary: SDDM breeze theme
# upgrade path, when sddm-breeze was split out # upgrade path, when sddm-breeze was split out
Obsoletes: plasma-workspace < 5.3.2-8 Obsoletes: plasma-workspace < 5.3.2-8
Requires: kf5-plasma Requires: kf5-plasma
# Background.qml:import QtGraphicalEffects 1.0 # Background.qml:import QtQuick
# see also https://bugs.kde.org/show_bug.cgi?id=371493 Requires: qt5-qtquickcontrols
Requires: qt5-graphicaleffects
# QML imports: # QML imports:
# org.kde.plasma.workspace.components # org.kde.plasma.workspace.components
# org.kde.plasma.workspace.keyboardlayout # org.kde.plasma.workspace.keyboardlayout
@ -431,6 +432,8 @@ BuildArch: noarch
%setup -q %setup -q
## upstream patches ## upstream patches
%patch2 -p1 -b .0002
%patch3 -p1 -b .0003
#patch31 -p1 -b .0031 #patch31 -p1 -b .0031
%patch33 -p1 -b .0033 %patch33 -p1 -b .0033
@ -709,6 +712,9 @@ fi
%changelog %changelog
* Sun Oct 23 2016 Rex Dieter <rdieter@fedoraproject.org> - 5.8.2-4
- sddm-breeze: Requires: qt5-qtquickcontrols instead (kde#371493)
* Sat Oct 22 2016 Rex Dieter <rdieter@fedoraproject.org> - 5.8.2-3 * Sat Oct 22 2016 Rex Dieter <rdieter@fedoraproject.org> - 5.8.2-3
- sddm-breeze: Requires: qt5-qtgraphicaleffects (kde#371493) - sddm-breeze: Requires: qt5-qtgraphicaleffects (kde#371493)

Loading…
Cancel
Save