summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2022-10-08 14:13:31 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2022-10-10 11:47:06 +0200
commite7fade83b75818e8616a08e68fb9dc8027c0de86 (patch)
tree7e4a20c5f604048dcf766a48bc2a164900c4a4c6 /kde-plasma/plasma-desktop/files
parentkde-plasma/plasma-browser-integration: drop 5.24.6 (diff)
downloadgentoo-e7fade83b75818e8616a08e68fb9dc8027c0de86.tar.gz
gentoo-e7fade83b75818e8616a08e68fb9dc8027c0de86.tar.bz2
gentoo-e7fade83b75818e8616a08e68fb9dc8027c0de86.zip
kde-plasma/plasma-desktop: drop 5.24.6-r2
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'kde-plasma/plasma-desktop/files')
-rw-r--r--kde-plasma/plasma-desktop/files/plasma-desktop-5.24.6-fix-buttongroupmgmt.patch108
-rw-r--r--kde-plasma/plasma-desktop/files/plasma-desktop-5.24.6-fix-mouse-settings-loading.patch44
2 files changed, 0 insertions, 152 deletions
diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.24.6-fix-buttongroupmgmt.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.24.6-fix-buttongroupmgmt.patch
deleted file mode 100644
index 0a86d08c5121..000000000000
--- a/kde-plasma/plasma-desktop/files/plasma-desktop-5.24.6-fix-buttongroupmgmt.patch
+++ /dev/null
@@ -1,108 +0,0 @@
-From fffa899345df967ed815104cf88de8466d97b374 Mon Sep 17 00:00:00 2001
-From: ivan tkachenko <me@ratijas.tk>
-Date: Sat, 9 Jul 2022 21:45:37 +0300
-Subject: [PATCH] [applets/pager] Fix button group management on configuration
- page
-
-More declarative and centralized approach fixes the case when the "Text
-display:" section may have no radio buttons selected.
-
-Amends c50e4b987dc365d741880794ee6f2924065a87a6.
-
-BUG: 456525
-FIXED-IN: 5.24.7 5.25.4 5.26
-(cherry picked from commit 4d835be8808b6372d69c424a66c3c7a1493cd6c3)
----
- .../package/contents/ui/configGeneral.qml | 48 ++++---------------
- 1 file changed, 10 insertions(+), 38 deletions(-)
-
-diff --git a/applets/pager/package/contents/ui/configGeneral.qml b/applets/pager/package/contents/ui/configGeneral.qml
-index b66620e16..c5404b9e1 100644
---- a/applets/pager/package/contents/ui/configGeneral.qml
-+++ b/applets/pager/package/contents/ui/configGeneral.qml
-@@ -25,39 +25,6 @@ Kirigami.FormLayout {
- property alias cfg_showOnlyCurrentScreen: showOnlyCurrentScreen.checked
- property alias cfg_wrapPage: wrapPage.checked
-
-- onCfg_displayedTextChanged: {
-- switch (cfg_displayedText) {
-- case 0:
-- displayedTextGroup.checkedButton = desktopNumberRadio;
-- break;
-- case 1:
-- displayedTextGroup.checkedButton = desktopNameRadio;
-- break;
-- default:
-- case 2:
-- displayedTextGroup.checkedButton = noTextRadio;
-- break;
-- }
-- }
--
-- onCfg_currentDesktopSelectedChanged: {
-- switch (cfg_currentDesktopSelected) {
-- case 0:
-- currentDesktopSelectedGroup.checkedButton = doesNothingRadio;
-- break;
-- case 1:
-- currentDesktopSelectedGroup.checkedButton = showsDesktopRadio;
-- break;
-- default:
-- break;
-- }
-- }
--
-- Component.onCompleted: {
-- cfg_currentDesktopSelectedChanged();
-- cfg_displayedTextChanged();
-- }
--
- QtControls.ButtonGroup {
- id: displayedTextGroup
- }
-@@ -113,19 +80,22 @@ Kirigami.FormLayout {
-
- QtControls.ButtonGroup.group: displayedTextGroup
- text: i18n("No text")
-- onCheckedChanged: if (checked) cfg_displayedText = 2;
-+ checked: cfg_displayedText === 2
-+ onToggled: if (checked) cfg_displayedText = 2;
- }
- QtControls.RadioButton {
- id: desktopNumberRadio
- QtControls.ButtonGroup.group: displayedTextGroup
- text: isActivityPager ? i18n("Activity number") : i18n("Desktop number")
-- onCheckedChanged: if (checked) cfg_displayedText = 0;
-+ checked: cfg_displayedText === 0
-+ onToggled: if (checked) cfg_displayedText = 0;
- }
- QtControls.RadioButton {
- id: desktopNameRadio
- QtControls.ButtonGroup.group: displayedTextGroup
- text: isActivityPager ? i18n("Activity name") : i18n("Desktop name")
-- onCheckedChanged: if (checked) cfg_displayedText = 1;
-+ checked: cfg_displayedText === 1
-+ onToggled: if (checked) cfg_displayedText = 1;
- }
-
-
-@@ -141,12 +111,14 @@ Kirigami.FormLayout {
-
- QtControls.ButtonGroup.group: currentDesktopSelectedGroup
- text: i18n("Does nothing")
-- onCheckedChanged: if (checked) cfg_currentDesktopSelected = 0;
-+ checked: cfg_currentDesktopSelected === 0
-+ onToggled: if (checked) cfg_currentDesktopSelected = 0;
- }
- QtControls.RadioButton {
- id: showsDesktopRadio
- QtControls.ButtonGroup.group: currentDesktopSelectedGroup
- text: i18n("Shows the desktop")
-- onCheckedChanged: if (checked) cfg_currentDesktopSelected = 1;
-+ checked: cfg_currentDesktopSelected === 1
-+ onToggled: if (checked) cfg_currentDesktopSelected = 1;
- }
- }
---
-GitLab
-
diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.24.6-fix-mouse-settings-loading.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.24.6-fix-mouse-settings-loading.patch
deleted file mode 100644
index 69996e532e10..000000000000
--- a/kde-plasma/plasma-desktop/files/plasma-desktop-5.24.6-fix-mouse-settings-loading.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 0351cdfc9210f6f88863419534250ab7b8ce04ed Mon Sep 17 00:00:00 2001
-From: ivan tkachenko <me@ratijas.tk>
-Date: Mon, 25 Jul 2022 20:06:12 +0300
-Subject: [PATCH] Fix mouse settings not being loaded when a mouse is connected
-
-Keyboard daemon was calling into the wrong module name. There are only
-so much kcminit modules, and all of them are required to be named and
-referenced with a "kcm_" prefix.
-
-Postmortem:
-
-- Mouse settings' saving and loading worked fine.
-- Changing settings on the fly worked fine, and if they were not loaded
- before due to this bug, KCM loaded them and applied, after which
- mouse worked fine until disconnected.
-- Starting computer with mouse already connected worked fine.
-- Plug&Play (i.e. connecting mouse after session has started) was the
- only thing that was broken, because this reconfiguration failed to
- launch the proper mouse module.
-
-Co-Authored-By: David Edmundson <kde@davidedmundson.co.uk>
-BUG: 435113
-FIXED-IN: 5.24.7, 5.25.4, 5.26
-(cherry picked from commit 0d7eccfbba7c3656487396dd381fcee0717bb1ec)
----
- kcms/keyboard/keyboard_daemon.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/kcms/keyboard/keyboard_daemon.cpp b/kcms/keyboard/keyboard_daemon.cpp
-index ae44b0ef2..56a93c4aa 100644
---- a/kcms/keyboard/keyboard_daemon.cpp
-+++ b/kcms/keyboard/keyboard_daemon.cpp
-@@ -89,7 +89,7 @@ void KeyboardDaemon::configureKeyboard()
- void KeyboardDaemon::configureMouse()
- {
- QStringList modules;
-- modules << QStringLiteral("mouse");
-+ modules << QStringLiteral("kcm_mouse");
- QProcess::startDetached(QStringLiteral("kcminit"), modules);
- }
-
---
-GitLab
-