rpms
/
plasma-workspace
20
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to 5.24.4 and remove upstreamed patches

Browse Source
epel9
Justin Zobel 3 years ago
parent a6c7e847f9
commit 2cc26c1583
5 changed files with 4 additions and 207 deletions
Show Stats Download Patch File Download Diff File

1
.gitignore vendored
Unescape View File

@ -75,3 +75,4 @@
/plasma-workspace-5.24.2.tar.xz
/sddm-theme-5.24.80~pre.tar.gz
/plasma-workspace-5.24.3.tar.xz
/plasma-workspace-5.24.4.tar.xz

173
plasma-workspace-PR1508-sddm-theme-pc3.patch
Unescape View File

@ -1,173 +0,0 @@
From 119195493cf2492ddc35fbbc4d97266ceee16ad1 Mon Sep 17 00:00:00 2001
From: Aleix Pol <aleixpol@kde.org>
Date: Sat, 5 Mar 2022 19:48:56 +0100
Subject: [PATCH] Port SDDM theme to PlasmaComponents 3.0
Uses a combobox instead of a menu + button
---
sddm-theme/BreezeMenuStyle.qml | 25 ------------------
sddm-theme/KeyboardButton.qml | 47 ++++++++++++----------------------
sddm-theme/Main.qml | 1 -
sddm-theme/SessionButton.qml | 37 +++++++-------------------
4 files changed, 26 insertions(+), 84 deletions(-)
delete mode 100644 sddm-theme/BreezeMenuStyle.qml
diff --git a/sddm-theme/BreezeMenuStyle.qml b/sddm-theme/BreezeMenuStyle.qml
deleted file mode 100644
index e4a91d4d6..000000000
--- a/sddm-theme/BreezeMenuStyle.qml
+++ /dev/null
@@ -1,25 +0,0 @@
-import QtQuick 2.15
-// Don't bump them any further, these are the latest.
-import QtQuick.Controls 1.6 as QQC
-import QtQuick.Controls.Styles 1.4 as QQCS
-
-import org.kde.plasma.core 2.0 as PlasmaCore
-
-QQCS.MenuStyle {
- frame: Rectangle {
- color: PlasmaCore.ColorScope.backgroundColor
- border.color: Qt.tint(PlasmaCore.ColorScope.textColor, Qt.rgba(color.r, color.g, color.b, 0.7))
- border.width: 1
- }
- itemDelegate.label: QQC.Label {
- height: contentHeight * 1.2
- verticalAlignment: Text.AlignVCenter
- color: styleData.selected ? PlasmaCore.ColorScope.highlightedTextColor : PlasmaCore.ColorScope.textColor
- font.pointSize: config.fontSize
- text: styleData.text
- }
- itemDelegate.background: Rectangle {
- visible: styleData.selected
- color: PlasmaCore.ColorScope.highlightColor
- }
-}
diff --git a/sddm-theme/KeyboardButton.qml b/sddm-theme/KeyboardButton.qml
index 6ebf0d5bb..a95884d04 100644
--- a/sddm-theme/KeyboardButton.qml
+++ b/sddm-theme/KeyboardButton.qml
@@ -1,38 +1,25 @@
-import QtQuick 2.15
-import QtQuick.Controls 1.6 as QQC // Don't bump it any further, this is the latest.
+/*
+ SPDX-FileCopyrightText: 2016 David Edmundson <davidedmundson@kde.org>
-import org.kde.plasma.core 2.0 as PlasmaCore
-import org.kde.plasma.components 2.0 as PlasmaComponents // Because PC3 ToolButton can't take a menu
+ SPDX-License-Identifier: LGPL-2.0-or-later
+*/
-PlasmaComponents.ToolButton {
- id: keyboardButton
+import QtQuick 2.15
- property int currentIndex: -1
+import org.kde.plasma.core 2.0 as PlasmaCore
+import org.kde.plasma.components 3.0 as PlasmaComponents
- text: i18nd("plasma_lookandfeel_org.kde.lookandfeel", "Keyboard Layout: %1", instantiator.objectAt(currentIndex).shortName)
- implicitWidth: minimumWidth
+PlasmaComponents.ComboBox {
+ id: root
- visible: menu.items.length > 1
+ PlasmaCore.ColorScope.colorGroup: PlasmaCore.Theme.NormalColorGroup
+ PlasmaCore.ColorScope.inherit: false
- Component.onCompleted: {
- currentIndex = Qt.binding(() => keyboard.currentLayout);
- }
+ currentIndex: keyboard.currentLayout
+ onCurrentIndexChanged: keyboard.currentLayout = currentIndex
- menu: QQC.Menu {
- id: keyboardMenu
- style: BreezeMenuStyle {}
- Instantiator {
- id: instantiator
- model: keyboard.layouts
- onObjectAdded: keyboardMenu.insertItem(index, object)
- onObjectRemoved: keyboardMenu.removeItem(object)
- delegate: QQC.MenuItem {
- text: modelData.longName
- property string shortName: modelData.shortName
- onTriggered: {
- keyboard.currentLayout = model.index
- }
- }
- }
- }
+ visible: count > 1
+ textRole: "longName"
+ model: keyboard.layouts
+ displayText: currentText.length === 0 ? "" : i18nd("plasma_lookandfeel_org.kde.lookandfeel", "Keyboard Layout: %1", currentText)
}
diff --git a/sddm-theme/Main.qml b/sddm-theme/Main.qml
index 0d6b66e77..690c132e3 100644
--- a/sddm-theme/Main.qml
+++ b/sddm-theme/Main.qml
@@ -6,7 +6,6 @@
import QtQuick 2.15
import QtQuick.Layouts 1.15
-import QtQuick.Controls 1.6 // Don't bump it any further, this is the latest.
import QtQuick.Controls 2.15 as QQC2
import QtGraphicalEffects 1.15
diff --git a/sddm-theme/SessionButton.qml b/sddm-theme/SessionButton.qml
index 6934abda7..ed6ef96c2 100644
--- a/sddm-theme/SessionButton.qml
+++ b/sddm-theme/SessionButton.qml
@@ -5,39 +5,20 @@
*/
import QtQuick 2.15
-import QtQuick.Controls 1.6 as QQC // Don't bump it any further, this is the latest.
import org.kde.plasma.core 2.0 as PlasmaCore
-import org.kde.plasma.components 2.0 as PlasmaComponents // Because PC3 ToolButton can't take a menu
+import org.kde.plasma.components 3.0 as PlasmaComponents
-PlasmaComponents.ToolButton {
+PlasmaComponents.ComboBox {
id: root
- property int currentIndex: -1
- implicitWidth: minimumWidth
+ PlasmaCore.ColorScope.colorGroup: PlasmaCore.Theme.NormalColorGroup
+ PlasmaCore.ColorScope.inherit: false
- visible: menu.items.length > 1
+ currentIndex: sessionModel.lastIndex
- text: i18nd("plasma_lookandfeel_org.kde.lookandfeel", "Desktop Session: %1", instantiator.objectAt(currentIndex).text || "")
-
- Component.onCompleted: {
- currentIndex = sessionModel.lastIndex
- }
-
- menu: QQC.Menu {
- id: menu
- style: BreezeMenuStyle {}
- Instantiator {
- id: instantiator
- model: sessionModel
- onObjectAdded: menu.insertItem(index, object)
- onObjectRemoved: menu.removeItem( object )
- delegate: QQC.MenuItem {
- text: model.name
- onTriggered: {
- root.currentIndex = model.index
- }
- }
- }
- }
+ visible: count > 1
+ model: sessionModel
+ textRole: "name"
+ displayText: currentText.length === 0 ? "" : i18nd("plasma_lookandfeel_org.kde.lookandfeel", "Desktop Session: %1", currentText)
}
--
GitLab

28
plasma-workspace-PR1510-sddm-theme-fix-weird-behavior.patch
Unescape View File

@ -1,28 +0,0 @@
From b1b5877de0231f77f98475daabdb89a57351e4a2 Mon Sep 17 00:00:00 2001
From: Aleix Pol <aleixpol@kde.org>
Date: Sun, 6 Mar 2022 03:05:14 +0100
Subject: [PATCH] sddm/lockscreen: Fix weird behaviour
Only make space for the virtual keyboard when it's visible.
Fixes https://bugzilla.redhat.com/show_bug.cgi?id=2058468
---
lookandfeel/contents/components/VirtualKeyboard_wayland.qml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lookandfeel/contents/components/VirtualKeyboard_wayland.qml b/lookandfeel/contents/components/VirtualKeyboard_wayland.qml
index 42895e2d9..b472fd529 100644
--- a/lookandfeel/contents/components/VirtualKeyboard_wayland.qml
+++ b/lookandfeel/contents/components/VirtualKeyboard_wayland.qml
@@ -10,7 +10,7 @@ import org.kde.plasma.workspace.keyboardlayout 1.0 as Keyboards
Item {
id: inputPanel
- readonly property bool active: Qt.inputMethod.visible
+ readonly property bool active: Keyboards.KWinVirtualKeyboard.visible
property bool activated: false
visible: Qt.inputMethod.visible
--
GitLab

8
plasma-workspace.spec
Unescape View File

@ -27,8 +27,8 @@
Name: plasma-workspace
Summary: Plasma workspace, applications and applets
Version: 5.24.3
Release: 3%{?dist}
Version: 5.24.4
Release: 1%{?dist}
License: GPLv2+
URL: https://invent.kde.org/plasma/%{name}
@ -69,10 +69,6 @@ Source41: spice-vdagent.conf
## upstream Patches (master branch)
## upstreamable Patches
# From: https://invent.kde.org/plasma/plasma-workspace/-/merge_requests/1508
Patch50: plasma-workspace-PR1508-sddm-theme-pc3.patch
# From: https://invent.kde.org/plasma/plasma-workspace/-/merge_requests/1510
Patch51: plasma-workspace-PR1510-sddm-theme-fix-weird-behavior.patch
## downstream Patches
Patch100: plasma-workspace-konsole-in-contextmenu.patch

1
sources
Unescape View File

@ -1,3 +1,4 @@
SHA512 (plasma-workspace-5.24.3.tar.xz) = cc442e4ca064ef99555c00ebfded348d2358b73dbe9d6f34a63267f9e066b63acad8b18576532bc4fa413c239580e823bde1271551f445190f566b87f66646a7
SHA512 (breeze-fedora-0.2.tar.gz) = ff800e686b0dcb498f321bb94d3a8274c89c092f5408ef1ec3fc65333f046aea43444144ecaf166792f807014383af87b1180dc7540905fc10dc375309f8b2a8
SHA512 (sddm-theme-5.24.80~pre.tar.gz) = 3b04c739d6054ecd9149178cafd3d7f53214a48fea834092707c5fd309018ea4986d4a955db7a2888a428c9b264e40403c36adae5f079d51979fe37912895344
SHA512 (plasma-workspace-5.24.4.tar.xz) = 6c917d3ea307bca85e6ca12294357410c3442a9115a4864311df87af29919c20d8dab768f470379bbc4e0510367319a6cf8ce045ab7254db06e8c29477370d89

Write Preview
Loading…
Cancel
Save