pool/plasma5-workspace
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 432217 from home:Vogtinator:branches:KDE:Frameworks5:LTS

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/432217
OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5:LTS/plasma5-workspace?expand=0&rev=19
This commit is contained in:
Antonio Larrosa 2016-10-01 22:03:19 +00:00 committed by Git OBS Bridge
parent 887c70796b
commit cee548f889
7 changed files with 13 additions and 167 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
0001-wait-before-creating-the-panel.patch
View File

@ -1,36 +0,0 @@
From 6449c8f939d5cf84dbf0199180e9a536d922b0e2 Mon Sep 17 00:00:00 2001
From: Marco Martin <notmart@gmail.com>
Date: Wed, 21 Sep 2016 16:34:04 +0200
Subject: [PATCH] wait before creating the panel
not creating the panel view yet in order to have the same code path
between the first and subsequent plasma starts.
we want to have the panel appearing only when its layout is completed, to not have
many visible relayouts. otherwise we had even panel resizes at startup that
made al lthe full representations be loaded.
reviewed-by: David Edmundson
---
shell/shellcorona.cpp | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/shell/shellcorona.cpp b/shell/shellcorona.cpp
index 65ef01f..94ad07d 100644
--- a/shell/shellcorona.cpp
+++ b/shell/shellcorona.cpp
@@ -1732,7 +1732,11 @@ Plasma::Containment *ShellCorona::addPanel(const QString &plugin)
Q_ASSERT(panel);
m_waitingPanels << panel;
- createWaitingPanels();
+ //not creating the panel view yet in order to have the same code path
+ //between the first and subsequent plasma starts. we want to have the panel appearing only when its layout is completed, to not have
+ //many visible relayouts. otherwise we had even panel resizes at startup that
+ //made al lthe full representations be loaded.
+ m_waitingPanelsTimer.start();
const QPoint cursorPos(QCursor::pos());
foreach (QScreen *screen, QGuiApplication::screens()) {
--
2.10.0

62
fix-breeze-sddm-theme-with-many-users-2.patch
View File

@ -1,62 +0,0 @@
diff -ru breeze-openSUSE.backup/sddm-theme/Login.qml breeze-openSUSE/sddm-theme/Login.qml
--- breeze-openSUSE.backup/sddm-theme/Login.qml 2016-09-26 12:27:33.000000000 -0400
+++ breeze-openSUSE/sddm-theme/Login.qml 2016-09-27 07:28:49.640000000 -0400
@@ -8,7 +8,7 @@
SessionManagementScreen {
- property bool showUsernamePrompt: false
+ property bool showUsernamePrompt: !showUserList
signal loginRequest(string username, string password)
diff -ru breeze-openSUSE.backup/sddm-theme/Main.qml breeze-openSUSE/sddm-theme/Main.qml
--- breeze-openSUSE.backup/sddm-theme/Main.qml 2016-09-26 12:27:33.000000000 -0400
+++ breeze-openSUSE/sddm-theme/Main.qml 2016-09-27 08:18:31.940000000 -0400
@@ -81,6 +81,7 @@
}
initialItem: Login {
+ id: userListComponent
userListModel: userModel
userListCurrentIndex: userModel.lastIndex >= 0 ? userModel.lastIndex : 0
@@ -108,8 +109,9 @@
ActionButton {
iconSource: "system-search"
text: i18nd("plasma_lookandfeel_org.kde.lookandfeel","Different User")
- onClicked: mainStack.push(userPrompt)
+ onClicked: mainStack.push(userPromptComponent)
enabled: true
+ visible: !userListComponent.showUsernamePrompt
}
]
@@ -128,7 +130,7 @@
}
Component {
- id: userPrompt
+ id: userPromptComponent
Login {
showUsernamePrompt: true
notificationMessage: root.notificationMessage
diff -ru breeze-openSUSE.backup/lookandfeel/contents/components/SessionManagementScreen.qml breeze-openSUSE/lookandfeel/contents/components/SessionManagementScreen.qml
--- breeze-openSUSE.backup/lookandfeel/contents/components/SessionManagementScreen.qml 2016-09-26 12:27:33.000000000 -0400
+++ breeze-openSUSE/lookandfeel/contents/components/SessionManagementScreen.qml 2016-09-27 07:27:45.660000000 -0400
@@ -57,6 +57,7 @@
*/
property alias userListCurrentIndex: userListView.currentIndex
property var userListCurrentModelData: userListView.currentItem === null ? [] : userListView.currentItem.m
+ property bool showUserList: (userListModel.count && userListModel.disableAvatarsThreshold) ? userListModel.count <= userListModel.disableAvatarsThreshold : true
property alias userList: userListView
@@ -65,6 +66,7 @@
UserList {
id: userListView
+ visible: showUserList
anchors {
bottom: parent.verticalCenter
left: parent.left

55
fix-wallpaper-not-having-correct-aspect-ratio.diff
View File

@ -1,55 +0,0 @@
Index: plasma-workspace-5.7.95/wallpapers/image/image.cpp
===================================================================
--- plasma-workspace-5.7.95.orig/wallpapers/image/image.cpp
+++ plasma-workspace-5.7.95/wallpapers/image/image.cpp
@@ -182,30 +182,43 @@ void Image::findPreferedImageInPackage(K
return;
}
- //qDebug() << "wanted" << size;
+ //qDebug() << "wanted" << m_targetSize;
+ //qDebug() << "options" << images;
- // choose the nearest resolution
+ // choose the nearest resolution, always preferring images with the same aspect ratio
float best = FLT_MAX;
+ float bestWithSameAspectRatio = FLT_MAX;
+ float targetAspectRatio = m_targetSize.width()/(float)m_targetSize.height();
QString bestImage;
+ QString bestImageWithSameAspectRatio;
foreach (const QString &entry, images) {
QSize candidate = resSize(QFileInfo(entry).baseName());
if (candidate == QSize()) {
continue;
}
+ float candidateAspectRatio = candidate.width()/(float)candidate.height();
double dist = distance(candidate, m_targetSize);
- //qDebug() << "candidate" << candidate << "distance" << dist;
- if (bestImage.isEmpty() || dist < best) {
- bestImage = entry;
- best = dist;
- //qDebug() << "best" << bestImage;
+ //qDebug() << "candidate" << candidate << "distance" << dist << "aspect ratio" << candidateAspectRatio;
+
+ if ( candidateAspectRatio == targetAspectRatio && (bestImageWithSameAspectRatio.isEmpty() || dist < bestWithSameAspectRatio) ) {
+ bestImageWithSameAspectRatio = entry;
+ bestWithSameAspectRatio = dist;
+ //qDebug() << "bestWithSameAspectRatio" << bestImageWithSameAspectRatio;
if (dist == 0) {
break;
}
+ } else if (bestImage.isEmpty() || dist < best) {
+ bestImage = entry;
+ best = dist;
+ //qDebug() << "best" << bestImage;
}
}
+ if (!bestImageWithSameAspectRatio.isEmpty()) // Always prefer an image with the same aspect ratio as the target (if available)
+ bestImage=bestImageWithSameAspectRatio;
+
//qDebug() << "best image" << bestImage;
package.removeDefinition("preferred");
package.addFileDefinition("preferred", "images/" + bestImage, i18n("Recommended wallpaper file"));

3
plasma-workspace-5.7.95.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c4ed7be1ae8495aab2330f60a8181bb3ad16941f6afb41af269470935c6599c6
size 7373804

3
plasma-workspace-5.8.0.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:365b152c69ee7863bd1abe0e339707e412384beeb10294aacbc07e3d9da2b319
size 7411612

8
plasma5-workspace.changes
View File

@ -5,6 +5,14 @@ Sat Oct 1 17:25:04 UTC 2016 - fabian@ritter-vogt.de
* The default SDDM face icons are too dark to be used with
the default backgrounds
-------------------------------------------------------------------
Thu Sep 29 16:36:28 UTC 2016 - fabian@ritter-vogt.de
- Update to 5.8.0
* New LTS feature release
* For more details please see:
https://www.kde.org/announcements/plasma-5.8.0.php
-------------------------------------------------------------------
Tue Sep 27 12:29:41 UTC 2016 - alarrosa@suse.com

13
plasma5-workspace.spec
View File

@ -20,7 +20,7 @@
%bcond_without lang
Name: plasma5-workspace
Version: 5.7.95
Version: 5.8.0
Release: 0
%{!?_plasma5_version: %global _plasma5_version %{version}}
Summary: The KDE Plasma Workspace Components
@ -35,13 +35,7 @@ Patch0: 0001-Rename-qdbus-in-startkde.patch
Patch1: change-kioremote-severity.patch
# PATCH-FIX-OPENSUSE 0001-Ignore-default-sddm-face-icons.patch boo#1001364 fabian@ritter-vogt.de -- Ignore default sddm face icons
Patch2: 0001-Ignore-default-sddm-face-icons.patch
# PATCH-FIX-UPSTREAM fix-wallpaper-not-having-correct-aspect-ratio.diff bnc#990257 alarrosa@suse.com -- Make plasma prefer wallpapers with the same aspect ratio as the screen instead of a wallpaper with the most similar area
Patch5: fix-wallpaper-not-having-correct-aspect-ratio.diff
# PATCH-FIX-UPSTREAM fix-breeze-sddm-theme-with-many-users-2.patch alarrosa@suse.com -- Asks for user/password and hide the user list when there's a large number of users. Updated for the plasma 5.8 sddm theme
Patch6: fix-breeze-sddm-theme-with-many-users-2.patch
# PATCHES 100-200 and above are from upstream 5.8 branch
# PATCH-FIX-UPSTREAM 0001-wait-before-creating-the-panel.patch boo#1000109 -- Wait before creating the panel
Patch100: 0001-wait-before-creating-the-panel.patch
# PATCHES 201-300 and above are from upstream master/5.9 branch
BuildRequires: breeze5-icons
BuildRequires: fdupes
@ -211,9 +205,6 @@ workspace. Development files.
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch5 -p1
%patch6 -p1
%patch100 -p1
%build
%cmake_kf5 -d build -- -DKDE4_COMMON_PAM_SERVICE=xdm -DKDE_DEFAULT_HOME=.kde4 -DCMAKE_INSTALL_LOCALEDIR=%{_kf5_localedir}
@ -341,7 +332,7 @@ workspace. Development files.
%if %{with lang}
%files lang -f %{name}.lang
%doc %lang(de) %{_kf5_htmldir}/de/
%doc %lang(ca) %{_kf5_htmldir}/ca/
%endif
%changelog