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

Accepting request 438378 from KDE:Frameworks5

Browse Source 
1

OBS-URL: https://build.opensuse.org/request/show/438378
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/plasma5-workspace?expand=0&rev=50
This commit is contained in:
Dominique Leuenberger 2016-11-04 19:58:35 +00:00 committed by Git OBS Bridge
commit d9cf0717f7
8 changed files with 107 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
0001-Rename-qdbus-in-startkde.patch
View File

@ -2,11 +2,13 @@ diff --git a/startkde/startkde.cmake b/startkde/startkde.cmake
index 91c8a3c..0c658bd 100644
--- a/startkde/startkde.cmake
+++ b/startkde/startkde.cmake
@@ -21,13 +21,13 @@ unset DYLD_FORCE_FLAT_NAMESPACE
@@ -20,14 +20,14 @@ unset DYLD_FORCE_FLAT_NAMESPACE
# in case we have been started with full pathname spec without being in PATH
bindir=`echo "$0" | sed -n 's,^\(/.*\)/[^/][^/]*$,\1,p'`
if [ -n "$bindir" ]; then
qbindir=`qtpaths --binaries-dir`
- qbindir=`qtpaths --binaries-dir`
- qdbus=$qbindir/qdbus
+ qbindir=`/usr/bin/qtpaths --binaries-dir`
+ qdbus=$qbindir/qdbus-qt5
case $PATH in
$bindir|$bindir:*|*:$bindir|*:$bindir:*) ;;

53
fix-sddm-theme-logic.diff
View File

@ -1,53 +0,0 @@
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] 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.10.1

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

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

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

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

25
plasma5-workspace.changes
View File

@ -1,3 +1,28 @@
-------------------------------------------------------------------
Wed Nov 2 12:24:35 UTC 2016 - wbauer@tmo.at
- Call qtpaths with an absolute path in startkde to make sure the
system one is used (boo#1004769)
-------------------------------------------------------------------
Wed Nov 2 11:12:23 UTC 2016 - alarrosa@suse.com
- Add use-nearest-aspect-ratio-available-wallpaper.diff to improve the
selection of wallpapers keeping the same (or as similar as possible)
aspect ratio (boo#990257). Include the latest changes submitted
upstream to work better with QUAD HD screen resolutions.
-------------------------------------------------------------------
Tue Nov 1 10:36:40 UTC 2016 - fabian@ritter-vogt.de
- Update to 5.8.3
* New bugfix release
* For more details please see:
https://www.kde.org/announcements/plasma-5.8.3.php
- Remove upstream patches:
* fix-sddm-theme-logic.diff
* remove-sddm-graphicaleffects-dep.patch
-------------------------------------------------------------------
Sun Oct 23 11:59:55 UTC 2016 - fabian@ritter-vogt.de

9
plasma5-workspace.spec
View File

@ -20,7 +20,7 @@
%bcond_without lang
Name: plasma5-workspace
Version: 5.8.2
Version: 5.8.3
Release: 0
%{!?_plasma5_version: %global _plasma5_version %{version}}
Summary: The KDE Plasma Workspace Components
@ -40,10 +40,8 @@ Patch3: add-tray-icon-cache.patch
# PATCHES 100-200 and above are from upstream 5.8 branch
# PATCH-FIX-UPSTREAM keep-wallpaper-aspect-ratio-wallpaper-on-screen-resolution-change.diff alarrosa@suse.com -- Keep wallpaper aspect ratio on screen resolution change
Patch100: keep-wallpaper-aspect-ratio-wallpaper-on-screen-resolution-change.diff
# PATCH-FIX-UPSTREAM fix-sddm-theme-logic.diff boo#1003742 alarrosa@suse.com -- Fix sddm logic to use avatar list or text entry when usermodel.count is 0
Patch101: fix-sddm-theme-logic.diff
# PATCH-FIX-UPSTREAM remove-sddm-graphicaleffects-dep.patch kde#371493 kde@privat.broulik.de -- Remove unused import QtGraphicalEffects
Patch102: remove-sddm-graphicaleffects-dep.patch
# PATCH-FIX-UPSTREAM use-nearest-aspect-ratio-available-wallpaper.diff alarrosa@suse.com -- New distance algorithm to simplify and improve the wallpaper selection
Patch101: use-nearest-aspect-ratio-available-wallpaper.diff
# PATCHES 201-300 and above are from upstream master/5.9 branch
BuildRequires: breeze5-icons
BuildRequires: fdupes
@ -216,7 +214,6 @@ workspace. Development files.
%patch3 -p1
%patch100 -p1
%patch101 -p1
%patch102 -p1
%build
%cmake_kf5 -d build -- -DKDE4_COMMON_PAM_SERVICE=xdm -DKDE_DEFAULT_HOME=.kde4 -DCMAKE_INSTALL_LOCALEDIR=%{_kf5_localedir}

24
remove-sddm-graphicaleffects-dep.patch
View File

@ -1,24 +0,0 @@
From: Kai Uwe Broulik <kde@privat.broulik.de>
Date: Sun, 23 Oct 2016 11:24:00 +0000
Subject: Remove unused import QtGraphicalEffects
X-Git-Url: http://quickgit.kde.org/?p=plasma-workspace.git&a=commitdiff&h=b61c232722aa80567590ee6dfee655e93e95f7ff
---
Remove unused import QtGraphicalEffects
BUG: 371493
FIXED-IN: 5.8.3
---
--- 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

72
use-nearest-aspect-ratio-available-wallpaper.diff Normal file
View File

@ -0,0 +1,72 @@
Index: plasma-workspace-5.8.2/wallpapers/image/image.cpp
===================================================================
--- plasma-workspace-5.8.2.orig/wallpapers/image/image.cpp
+++ plasma-workspace-5.8.2/wallpapers/image/image.cpp
@@ -156,13 +156,14 @@ void Image::setRenderingMode(RenderingMo
float distance(const QSize& size, const QSize& desired)
{
// compute difference of areas
- float delta = size.width() * size.height() -
- desired.width() * desired.height();
- // scale down to about 1.0
- delta /= ((desired.width() * desired.height())+(size.width() * size.height()))/2;
+ float desiredAspectRatio = ( desired.height() > 0 ) ? desired.width() / (float)desired.height() : 0;
+ float candidateAspectRatio = (size.height() > 0 ) ? size.width() / (float)size.height() : FLT_MAX;
+
+ float delta = size.width() - desired.width();
+ delta = (delta >= 0.0 ? delta : -delta*2 ); // Penalize for scaling up
+
+ return qAbs(candidateAspectRatio - desiredAspectRatio)*25000 + delta;
- // Difference of areas, slight preference to scale down
- return delta >= 0.0 ? delta : -delta + 2.0;
}
QSize resSize(const QString &str)
@@ -187,42 +188,28 @@ void Image::findPreferedImageInPackage(K
return;
}
- //qDebug() << "wanted" << m_targetSize << "options" << images;
+ //float targetAspectRatio = (m_targetSize.height() > 0 ) ? m_targetSize.width() / (float)m_targetSize.height() : 0;
+ //qDebug() << "wanted" << m_targetSize << "options" << images << "aspect ratio" << targetAspectRatio;
- // choose the nearest resolution, always preferring images with the same aspect ratio
float best = FLT_MAX;
- float bestWithSameAspectRatio = FLT_MAX;
- float targetAspectRatio = ( m_targetSize.height() > 0 ) ? m_targetSize.width() / (float)m_targetSize.height() : 0;
-
QString bestImage;
- QString bestImageWithSameAspectRatio;
foreach (const QString &entry, images) {
QSize candidate = resSize(QFileInfo(entry).baseName());
if (candidate == QSize()) {
continue;
}
- float candidateAspectRatio = (candidate.height() > 0 ) ? candidate.width() / (float)candidate.height() : FLT_MAX;
+ //float candidateAspectRatio = (candidate.height() > 0 ) ? candidate.width() / (float)candidate.height() : FLT_MAX;
double dist = distance(candidate, m_targetSize);
//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) {
+ 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"));