pool/plasma5-workspace
SHA256
12
0
Fork 1
Code Issues Pull Requests Activity

Accepting request 416685 from KDE:Frameworks5

Browse Source 
- Added fix-breeze-sddm-theme-with-many-users.patch again. 
  This is still needed since upstream dropped the planned changes
  on the login breeze theme from the 5.7 release.

- Add 0001-Workaround-kde-362531.patch as a workaround for
    kde#362531

- Remove 0005-Missing-method-for-activity-deletion-from-plasma-scr.patch
  Not only unnecessary, but also reverted by later patch.

- Added patches from upstream:
  0002-don-t-try-to-load-layout-before-kamd-starts.patch
  0005-Missing-method-for-activity-deletion-from-plasma-scr.patch
  0006-Treat-IsDemandingAttention-as-IsOnAllVirtualDesktops.patch
  0007-apparently-containment-can-be-null.patch
  0010-Properly-registering-existing-activities-before-load.patch
  0001-check-harder-to-include-only-desktops-in-desktops.patch

- Update to 5.7.2
  * New bugfix release
  * For more details please see:
    https://www.kde.org/announcements/plasma-5.7.2.php

- Added Configuration-option-for-System-Tray-icon-size.patch from
  upstream

- Update to 5.7.1
  * New bugfix release
  * For more details please see:
    https://www.kde.org/announcements/plasma-5.7.1.php

OBS-URL: https://build.opensuse.org/request/show/416685
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/plasma5-workspace?expand=0&rev=42
This commit is contained in:
Dominique Leuenberger
2016-08-08 11:58:51 +00:00
committed by Git OBS Bridge
parent ac256f6101 6834ec5b55
commit 96260ba3e1
13 changed files with 511 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
0001-Workaround-kde-362531.patch Normal file
View File

@@ -0,0 +1,26 @@
From 84c03dc24aa32346bedc9a1f128a14a7f912d19c Mon Sep 17 00:00:00 2001
From: Fabian Vogt <fabian@ritter-vogt.de>
Date: Sat, 30 Jul 2016 23:54:46 +0200
Subject: [PATCH] Workaround kde#362531
Delay plasmashell startup by a second so that KWin effects can be queried
Signed-off-by: Fabian Vogt <fabian@ritter-vogt.de>
---
shell/plasmashell.desktop | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/shell/plasmashell.desktop b/shell/plasmashell.desktop
index c186f5a..17f10ae 100644
--- a/shell/plasmashell.desktop
+++ b/shell/plasmashell.desktop
@@ -1,5 +1,5 @@
[Desktop Entry]
-Exec=plasmashell --shut-up
+Exec=sh -c "sleep 1; plasmashell"
X-DBUS-StartupType=Unique
Name=Plasma Desktop Workspace
Name[ar]=مساحة عمل سطح مكتب بلازما
--
2.9.2

28
0001-check-harder-to-include-only-desktops-in-desktops.patch Normal file
View File

@@ -0,0 +1,28 @@
From a2850caf4a442c5e92d4c027b9a1c78c9dee24b5 Mon Sep 17 00:00:00 2001
From: Marco Martin <notmart@gmail.com>
Date: Fri, 29 Jul 2016 13:23:18 +0200
Subject: [PATCH 1/2] check harder to include only desktops in desktops()
only desktops have an assigned activtyId, but some
containments are !isPanel() (like the systray)
---
shell/scripting/scriptengine.cpp | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/shell/scripting/scriptengine.cpp b/shell/scripting/scriptengine.cpp
index f368e7e3b918bb09e69a3cb486680ab3d85fd15e..a17ba1a708ddc69caa483a667c7c390c52d6d84b 100644
--- a/shell/scripting/scriptengine.cpp
+++ b/shell/scripting/scriptengine.cpp
@@ -882,7 +882,8 @@ QScriptValue ScriptEngine::desktops(QScriptContext *context, QScriptEngine *engi
int count = 0;
foreach (Plasma::Containment *c, env->corona()->containments()) {
- if (!isPanel(c)) {
+ //make really sure we get actual desktops, so check for a non empty activty id
+ if (!isPanel(c) && !c->activity().isEmpty()) {
containments.setProperty(count, env->wrap(c));
++count;
}
--
2.6.6

39
0002-don-t-try-to-load-layout-before-kamd-starts.patch Normal file
View File

@@ -0,0 +1,39 @@
From f7ef6ee87b8957bebc976b6fc9e0df279cea05f1 Mon Sep 17 00:00:00 2001
From: Marco Martin <notmart@gmail.com>
Date: Wed, 20 Jul 2016 13:57:08 +0200
Subject: [PATCH 02/11] don't try to load layout before kamd starts
if the status of kamd is anything but running, refuse to
execute load()
this fixes activity creation in default layout initialization
---
shell/shellcorona.cpp | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/shell/shellcorona.cpp b/shell/shellcorona.cpp
index 93a218addeb965ca421ac593f1ab5373bc344431..8b873aa8a382399b8bfc7ae7c6ff0ba65041d37e 100644
--- a/shell/shellcorona.cpp
+++ b/shell/shellcorona.cpp
@@ -302,7 +302,9 @@ void ShellCorona::setShell(const QString &shell)
connect(m_activityController, &KActivities::Controller::serviceStatusChanged, this, &ShellCorona::load, Qt::UniqueConnection);
- load();
+ if (m_activityController->serviceStatus() == KActivities::Controller::Running) {
+ load();
+ }
}
QString ShellCorona::shell() const
@@ -330,7 +332,7 @@ static QList<QScreen*> sortOutputs(const QList<QScreen*> &outputs)
void ShellCorona::load()
{
if (m_shell.isEmpty() ||
- m_activityController->serviceStatus() == KActivities::Controller::Unknown) {
+ m_activityController->serviceStatus() != KActivities::Controller::Running) {
return;
}
--
2.6.6

27
0006-Treat-IsDemandingAttention-as-IsOnAllVirtualDesktops.patch Normal file
View File

@@ -0,0 +1,27 @@
From da5c2fd5058e60d12bfbdfa2b1863433ab20dfbb Mon Sep 17 00:00:00 2001
From: Eike Hein <hein@kde.org>
Date: Sat, 23 Jul 2016 05:47:51 +0900
Subject: [PATCH 06/11] Treat IsDemandingAttention as IsOnAllVirtualDesktops.
BUG:365970
---
libtaskmanager/taskfilterproxymodel.cpp | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/libtaskmanager/taskfilterproxymodel.cpp b/libtaskmanager/taskfilterproxymodel.cpp
index 79b902e5b7fe9d2c975405b88c60a747f1385685..803db2199417a979916bd267536a9e1f67db603f 100644
--- a/libtaskmanager/taskfilterproxymodel.cpp
+++ b/libtaskmanager/taskfilterproxymodel.cpp
@@ -288,7 +288,8 @@ bool TaskFilterProxyModel::filterAcceptsRow(int sourceRow, const QModelIndex &so
// Filter by virtual desktop.
if (d->filterByVirtualDesktop && d->virtualDesktop != 0) {
- if (!sourceIdx.data(AbstractTasksModel::IsOnAllVirtualDesktops).toBool()) {
+ if (!sourceIdx.data(AbstractTasksModel::IsOnAllVirtualDesktops).toBool()
+ && !sourceIdx.data(AbstractTasksModel::IsDemandingAttention).toBool()) {
const QVariant &virtualDesktop = sourceIdx.data(AbstractTasksModel::VirtualDesktop);
if (!virtualDesktop.isNull()) {
--
2.6.6

27
0007-apparently-containment-can-be-null.patch Normal file
View File

@@ -0,0 +1,27 @@
From 214443fdff330629104509de9e1738aadcfe36b6 Mon Sep 17 00:00:00 2001
From: Marco Martin <notmart@gmail.com>
Date: Mon, 25 Jul 2016 10:16:03 +0200
Subject: [PATCH 07/11] apparently containment() can be null
null in some rare occasions during startup
CCBUG:365989
---
shell/desktopview.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/shell/desktopview.cpp b/shell/desktopview.cpp
index 509184dc4ae77014800517ecea076f5faee2ebdd..83866dc77ab394b7c8f91d5a1016669b29abb5c3 100644
--- a/shell/desktopview.cpp
+++ b/shell/desktopview.cpp
@@ -193,7 +193,7 @@ bool DesktopView::event(QEvent *e)
} else if (e->type() == QEvent::FocusIn) { //FIXME: this should *not* be needed
ensureWindowType();
- } else if (e->type() == QEvent::FocusOut) {
+ } else if (e->type() == QEvent::FocusOut && containment()) {
QObject *graphicObject = containment()->property("_plasma_graphicObject").value<QObject *>();
if (graphicObject) {
graphicObject->setProperty("focus", false);
--
2.6.6

52
0010-Properly-registering-existing-activities-before-load.patch Normal file
View File

@@ -0,0 +1,52 @@
From 475bed7373142afe20927acbc465f269cfa59878 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ivan=20=C4=8Cuki=C4=87?= <ivan.cukic@kde.org>
Date: Mon, 25 Jul 2016 22:48:13 +0200
Subject: [PATCH 10/11] Properly registering existing activities before loading
layout.js
Reviewers: #plasma, mart, davidedmundson
Subscribers: plasma-devel
Tags: #plasma
Differential Revision: https://phabricator.kde.org/D2288
---
shell/shellcorona.cpp | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/shell/shellcorona.cpp b/shell/shellcorona.cpp
index 757b32c0a8fd44a6427594ab752d74a802867f35..c993eec300e0eb5a375449c0fe35e6d4c548ce35 100644
--- a/shell/shellcorona.cpp
+++ b/shell/shellcorona.cpp
@@ -345,7 +345,12 @@ void ShellCorona::load()
loadLayout("plasma-" + m_shell + "-appletsrc");
checkActivities();
+
if (containments().isEmpty()) {
+ // Seems like we never really get to this point since loadLayout already
+ // (virtually) calls loadDefaultLayout if it does not load anything
+ // from the config file. Maybe if the config file is not empty,
+ // but still does not have any containments
loadDefaultLayout();
processUpdateScripts();
} else {
@@ -575,6 +580,14 @@ void ShellCorona::loadDefaultLayout()
QString code = file.readAll();
qDebug() << "evaluating startup script:" << script;
+ // We need to know which activities are here in order for
+ // the scripting engine to work. activityAdded does not mind
+ // if we pass it the same activity multiple times
+ QStringList existingActivities = m_activityController->activities();
+ foreach (const QString &id, existingActivities) {
+ activityAdded(id);
+ }
+
WorkspaceScripting::ScriptEngine scriptEngine(this);
connect(&scriptEngine, &WorkspaceScripting::ScriptEngine::printError, this,
--
2.6.6

42
Configuration-option-for-System-Tray-icon-size.patch Normal file
View File

@@ -0,0 +1,42 @@
From: Marco Martin <notmart@gmail.com>
Date: Thu, 14 Jul 2016 11:02:25 +0000
Subject: Configuration option for System Tray's icon size
X-Git-Url: http://quickgit.kde.org/?p=plasma-workspace.git&a=commitdiff&h=7f060403a2d44fc76b2b14fc9ebf43ee272d1c54
---
Configuration option for System Tray's icon size
the option is not user exposed, so can only either be set manually
or by the default configuration script in the look and feel kcm
patch by John Salatas jsalatas@gmail.com
REVIEW:128400
---
--- a/applets/systemtray/package/contents/config/main.xml
+++ b/applets/systemtray/package/contents/config/main.xml
@@ -45,6 +45,9 @@
<entry name="knownItems" type="StringList">
<default></default>
</entry>
+ <entry name="iconSize" type="Int">
+ <default>2</default>
+ </entry>
</group>
</kcfg>
--- a/applets/systemtray/package/contents/ui/main.qml
+++ b/applets/systemtray/package/contents/ui/main.qml
@@ -30,8 +30,10 @@
Layout.minimumHeight: vertical ? tasksRow.implicitHeight+ expander.implicitHeight + units.smallSpacing : units.smallSpacing
+ property var iconSizes: ["small", "smallMedium", "medium", "large", "huge", "enormous"];
+
property bool vertical: plasmoid.formFactor == PlasmaCore.Types.Vertical
- property int itemSize: units.roundToIconSize(Math.min(Math.min(width, height), units.iconSizes.medium))
+ property int itemSize: units.roundToIconSize(Math.min(Math.min(width, height), units.iconSizes[iconSizes[plasmoid.configuration.iconSize]]))
property int hiddenItemSize: units.iconSizes.smallMedium
property alias expanded: dialog.visible
property Item activeApplet

181
fix-breeze-sddm-theme-with-many-users.patch Normal file
View File

@@ -0,0 +1,181 @@
Index: plasma-workspace-5.5.0/lookandfeel/contents/components/UserSelect.qml
===================================================================
--- plasma-workspace-5.5.0.orig/lookandfeel/contents/components/UserSelect.qml
+++ plasma-workspace-5.5.0/lookandfeel/contents/components/UserSelect.qml
@@ -27,11 +27,15 @@ FocusScope {
id: root
property alias model: usersList.model
property alias selectedUser: usersList.selectedUser
+ property var username: usersList.visible ? usersList.selectedUser : userPasswordPrompt.username
+ property alias password: userPasswordPrompt.password
property alias selectedIndex: usersList.currentIndex
property alias selectedItem: usersList.currentItem
property alias delegate: usersList.delegate
property alias notification: notificationLabel.text
property alias infoPaneVisible: infoPaneLoader.active
+ property bool showUserList: (usersList.model.count && usersList.model.disableAvatarsThreshold) ? usersList.model.count <= usersList.model.disableAvatarsThreshold : true
+ property alias pwFieldEnabled: userPasswordPrompt.pwFieldEnabled
activeFocusOnTab: true
@@ -43,6 +47,10 @@ FocusScope {
usersList.decrementCurrentIndex()
}
+ function reenablePasswordInput() {
+ userPasswordPrompt.reenablePasswordInput();
+ }
+
Loader {
id: infoPaneLoader
anchors {
@@ -57,6 +65,7 @@ FocusScope {
id: usersList
focus: true
+ visible: root.showUserList
anchors {
top: parent.top
@@ -96,6 +105,21 @@ FocusScope {
]
}
+ UserPasswordPrompt {
+ id: userPasswordPrompt
+
+ focus: true
+ visible: !root.showUserList
+
+ anchors {
+ left: parent.horizontalCenter
+ top: parent.top
+ right: parent.right
+
+ topMargin: parent.height*0.2
+ }
+ }
+
BreezeLabel {
id: notificationLabel
anchors {
Index: plasma-workspace-5.4.3/lookandfeel/contents/components/UserPasswordPrompt.qml
===================================================================
--- plasma-workspace-5.4.3.orig/lookandfeel/contents/components/UserPasswordPrompt.qml 2015-11-11 16:14:28.277434982 +0100
+++ plasma-workspace-5.4.3/lookandfeel/contents/components/UserPasswordPrompt.qml 2015-11-11 15:25:12.528242834 +0100
@@ -0,0 +1,54 @@
+import QtQuick 2.2
+import SddmComponents 2.0
+import QtQuick.Layouts 1.1
+import org.kde.plasma.components 2.0 as PlasmaComponents
+
+Rectangle {
+ readonly property string username: usernameInput.text
+ readonly property string password: passwordInput.text
+ property alias pwFieldEnabled: passwordInput.enabled
+ color: "transparent"
+
+ function reenablePasswordInput() {
+ passwordInput.enabled = true
+ passwordInput.selectAll()
+ passwordInput.forceActiveFocus()
+ }
+
+ ColumnLayout {
+ anchors.fill: parent
+ PlasmaComponents.TextField {
+ id: usernameInput
+ placeholderText: i18nd("plasma_lookandfeel_org.kde.lookandfeel","Username")
+ onAccepted: nextItemInFocusChain().forceActiveFocus();
+ focus: true
+ text: userModel.lastUser
+ }
+
+ PlasmaComponents.TextField {
+ id: passwordInput
+ placeholderText: i18nd("plasma_lookandfeel_org.kde.lookandfeel","Password")
+ echoMode: TextInput.Password
+ onAccepted: loginPrompt.startLogin()
+ focus: true
+
+ //focus works in qmlscene
+ //but this seems to be needed when loaded from SDDM
+ //I don't understand why, but we have seen this before in the old lock screen
+ Timer {
+ interval: 200
+ running: parent.visible
+ onTriggered: passwordInput.forceActiveFocus()
+ }
+ //end hack
+
+ Keys.onEscapePressed: {
+ //nextItemInFocusChain(false) is previous Item
+ nextItemInFocusChain(false).forceActiveFocus();
+ }
+
+ }
+
+ } // ColumnLayout
+
+}
Index: plasma-workspace-5.4.3/lookandfeel/contents/loginmanager/Main.qml
===================================================================
--- plasma-workspace-5.4.3.orig/lookandfeel/contents/loginmanager/Main.qml 2015-11-05 13:49:30.000000000 +0100
+++ plasma-workspace-5.4.3/lookandfeel/contents/loginmanager/Main.qml 2015-11-11 15:25:12.832242854 +0100
@@ -78,6 +78,9 @@ Image {
initialItem: BreezeBlock {
id: loginPrompt
+ property var showUserList: mainItem.showUserList
+ property var username: mainItem.username
+ property var password: mainItem.showUserList ? controlsItem.password : mainItem.password
//Enable clipping whilst animating, otherwise the items would be shifted to other screens in multiscreen setups
//As there are only 2 items (loginPrompt and logoutScreenComponent), it's sufficient to do it only in this component
@@ -145,13 +148,14 @@ Image {
echoMode: TextInput.Password
onAccepted: loginPrompt.startLogin()
focus: true
+ visible: loginPrompt.mainItem.showUserList
//focus works in qmlscene
//but this seems to be needed when loaded from SDDM
//I don't understand why, but we have seen this before in the old lock screen
Timer {
interval: 200
- running: true
+ running: passwordInput.visible
onTriggered: passwordInput.forceActiveFocus()
}
//end hack
@@ -239,9 +243,13 @@ Image {
target: sddm
onLoginFailed: {
//Re-enable button and textfield
- passwordInput.enabled = true
- passwordInput.selectAll()
- passwordInput.forceActiveFocus()
+ if (loginPrompt.showUserList) {
+ passwordInput.enabled = true
+ passwordInput.selectAll()
+ passwordInput.forceActiveFocus()
+ } else {
+ loginPrompt.mainItem.reenablePasswordInput(true);
+ }
loginButton.enabled = true;
}
}
@@ -250,11 +258,12 @@ Image {
function startLogin () {
//Disable button and textfield while password check is running
+ loginPrompt.mainItem.pwFieldEnabled = false
controlsItem.pwFieldEnabled = false;
controlsItem.buttonEnabled = false;
//Clear notification in case the notificationResetTimer hasn't expired yet
mainItem.notification = ""
- sddm.login(mainItem.selectedUser, controlsItem.password, controlsItem.sessionIndex)
+ sddm.login(loginPrompt.username, loginPrompt.password, controlsItem.sessionIndex)
}
Component {

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

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

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

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

2
plasma5-workspace-rpmlintrc
View File

@@ -1,2 +0,0 @@
# we don't use find_lang macro as it doesn't searches in subdirectories
addFilter("file-not-in-%lang .*")

59
plasma5-workspace.changes
View File

@@ -1,3 +1,62 @@
-------------------------------------------------------------------
Mon Aug 1 11:42:08 UTC 2016 - alarrosa@suse.com
- Added fix-breeze-sddm-theme-with-many-users.patch again.
This is still needed since upstream dropped the planned changes
on the login breeze theme from the 5.7 release.
-------------------------------------------------------------------
Sat Jul 30 21:59:11 UTC 2016 - fabian@ritter-vogt.de
- Add 0001-Workaround-kde-362531.patch as a workaround for
kde#362531
-------------------------------------------------------------------
Fri Jul 29 18:05:53 UTC 2016 - fabian@ritter-vogt.de
- Remove 0005-Missing-method-for-activity-deletion-from-plasma-scr.patch
Not only unnecessary, but also reverted by later patch.
-------------------------------------------------------------------
Thu Jul 28 20:33:35 UTC 2016 - hrvoje.senjan@gmail.com
- Added patches from upstream:
0002-don-t-try-to-load-layout-before-kamd-starts.patch
0005-Missing-method-for-activity-deletion-from-plasma-scr.patch
0006-Treat-IsDemandingAttention-as-IsOnAllVirtualDesktops.patch
0007-apparently-containment-can-be-null.patch
0010-Properly-registering-existing-activities-before-load.patch
0001-check-harder-to-include-only-desktops-in-desktops.patch
-------------------------------------------------------------------
Wed Jul 20 08:54:41 UTC 2016 - hrvoje.senjan@gmail.com
- Update to 5.7.2
* New bugfix release
* For more details please see:
https://www.kde.org/announcements/plasma-5.7.2.php
-------------------------------------------------------------------
Sat Jul 16 00:28:50 UTC 2016 - hrvoje.senjan@gmail.com
- Added Configuration-option-for-System-Tray-icon-size.patch from
upstream
-------------------------------------------------------------------
Wed Jul 13 06:13:37 UTC 2016 - hrvoje.senjan@gmail.com
- Update to 5.7.1
* New bugfix release
* For more details please see:
https://www.kde.org/announcements/plasma-5.7.1.php
-------------------------------------------------------------------
Tue Jul 5 11:57:06 UTC 2016 - wbauer@tmo.at
- Use the new %kf5_find_lang macro to create the file list for the
lang package
- Remove rpmlintrc file, it is not needed any more now
-------------------------------------------------------------------
Thu Jun 30 12:02:33 UTC 2016 - hrvoje.senjan@gmail.com

36
plasma5-workspace.spec
View File

@@ -18,24 +18,34 @@
%bcond_without lang
Name: plasma5-workspace
Version: 5.7.0
Version: 5.7.2
Release: 0
%define plasma_version 5.7.0
%define plasma_version 5.7.2
Summary: The KDE Plasma Workspace Components
License: GPL-2.0+
Group: System/GUI/KDE
Url: http://www.kde.org/
Source: plasma-workspace-%{version}.tar.xz
Source1: baselibs.conf
Source99: %{name}-rpmlintrc
# PATCH-FIX_OPENSUSE 0001-Rename-qdbus-in-startkde.patch cgiboudeaux@gmx.com -- Rename the qdbus executable in startkde
Patch0: 0001-Rename-qdbus-in-startkde.patch
# PATCH-FIX_OPENSUSE require-qt56.diff
Patch1: require-qt56.diff
# PATCH-FIX_OPENSUSE fix-breeze-sddm-theme-with-many-users.patch alarrosa@suse.com -- Asks for user/password and hide the user list when there's a large number of users
Patch2: fix-breeze-sddm-theme-with-many-users.patch
# PATCH-FIX-OPENSUSE plasmashell-disable-windowclosing-on-logout.patch kde#349805 wbauer@tmo.at -- Prevent plasma from closing too early on logout resulting in an unusable desktop if the logout is cancelled
Patch4: plasmashell-disable-windowclosing-on-logout.patch
# PATCH-FIX-OPENSUSE 0001-Workaround-kde-362531.patch kde#362531 fabian@ritter-vogt.de -- Delay plasma startup by a second so that effects can be queried
Patch5: 0001-Workaround-kde-362531.patch
# PATCHES 100-200 and above are from upstream 5.7 branch
Patch100: 0002-don-t-try-to-load-layout-before-kamd-starts.patch
Patch102: 0006-Treat-IsDemandingAttention-as-IsOnAllVirtualDesktops.patch
Patch103: 0007-apparently-containment-can-be-null.patch
Patch104: 0010-Properly-registering-existing-activities-before-load.patch
Patch105: 0001-check-harder-to-include-only-desktops-in-desktops.patch
# PATCHES 201-300 and above are from upstream master/5.8 branch
# PATCH-FEATURE-UPSTREAM Configuration-option-for-System-Tray-icon-size.patch
Patch201: Configuration-option-for-System-Tray-icon-size.patch
BuildRequires: breeze5-icons
BuildRequires: fdupes
BuildRequires: kf5-filesystem
@@ -49,9 +59,7 @@ BuildRequires: cmake(KF5DBusAddons) >= 5.15.0
BuildRequires: cmake(KF5Declarative) >= 5.15.0
BuildRequires: cmake(KF5DocTools) >= 5.15.0
BuildRequires: cmake(KF5GlobalAccel) >= 5.15.0
%if 0%{?is_opensuse} || 0%{?suse_version} > 1320
BuildRequires: cmake(KF5Holidays)
%endif
BuildRequires: cmake(KF5I18n) >= 5.15.0
BuildRequires: cmake(KF5IdleTime) >= 5.15.0
BuildRequires: cmake(KF5JsEmbed) >= 5.15.0
@@ -213,16 +221,27 @@ workspace. Development files.
%setup -q -n plasma-workspace-%{plasma_version}
%patch0 -p1
%patch1 -p1
%patch2 -p1
%if 0%{?is_opensuse} || 0%{?suse_version} > 1315
%patch4 -p1
%endif
%patch5 -p1
%patch100 -p1
%patch102 -p1
%patch103 -p1
%patch104 -p1
%patch105 -p1
%patch201 -p1
%build
%cmake_kf5 -d build -- -DKDE4_COMMON_PAM_SERVICE=xdm -DKDE_DEFAULT_HOME=.kde4 -DCMAKE_INSTALL_LOCALEDIR=share/locale/kf5
%cmake_kf5 -d build -- -DKDE4_COMMON_PAM_SERVICE=xdm -DKDE_DEFAULT_HOME=.kde4 -DCMAKE_INSTALL_LOCALEDIR=%{_kf5_localedir}
%make_jobs
%install
%kf5_makeinstall -C build
%if %{with lang}
%kf5_find_lang
%endif
install -p -D -m755 drkonqi/doc/examples/installdbgsymbols_suse.sh \
%{buildroot}/usr/bin/installdbgsymbols.sh
%suse_update_desktop_file -r %{buildroot}%{_kf5_applicationsdir}/org.kde.klipper.desktop System TrayIcon
@@ -344,10 +363,9 @@ workspace. Development files.
%{_kf5_sharedir}/dbus-1/interfaces/
%if %{with lang}
%files lang
%defattr(-,root,root)
%{_kf5_localedir}/
%files lang -f %{name}.lang
%doc %lang(ca) %{_kf5_htmldir}/ca/
%doc %lang(cs) %{_kf5_htmldir}/cs/
%endif
%changelog