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

Accepting request 957629 from home:Vogtinator:plasma5.24

Browse Source 
- Add patch to fix the apply button in the touchpad KCM (kde#449843):
  * 0001-kcms-touchpad-Remove-weird-Q_EMIT-changed-false-in-r.patch

- Adjust patch for khelpcenter desktop file rename:
  * 0001-Apply-branding-to-default-favorites.patch

OBS-URL: https://build.opensuse.org/request/show/957629
OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/plasma5-desktop?expand=0&rev=509
This commit is contained in:
Luca Beltrame
2022-02-28 07:03:39 +00:00
committed by Git OBS Bridge
parent b4e70a7663
commit e8ad7949b1
4 changed files with 55 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
0001-Apply-branding-to-default-favorites.patch
View File

@@ -1,4 +1,4 @@
From 3d0ba10fb69c3b2b8274ad08c06dd065804e6c05 Mon Sep 17 00:00:00 2001
From 45fe4074ac137abcf64b0ff7b79256d301c697b7 Mon Sep 17 00:00:00 2001
From: Fabian Vogt <fabian@ritter-vogt.de>
Date: Tue, 11 Jan 2022 09:12:32 +0100
Subject: [PATCH 1/2] Apply branding to default favorites
@@ -10,13 +10,16 @@ As a workaround, copy favorites from plasma-openSUSE into the config, and:
- Update desktop filenames (fix Amarok, LO for both Leap/TW)
- Remove Amarok
- Add Kate
Use both org.kde.khelpcenter.desktop as well as the previous org.kde.Help name
from khelpcenter <= v21.12.
---
applets/kicker/package/contents/config/main.xml | 2 +-
applets/kickoff/package/contents/config/main.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/applets/kicker/package/contents/config/main.xml b/applets/kicker/package/contents/config/main.xml
index 3bc537b6b..c8965f91a 100644
index 3bc537b6b..4ae1fe6c8 100644
--- a/applets/kicker/package/contents/config/main.xml
+++ b/applets/kicker/package/contents/config/main.xml
@@ -38,7 +38,7 @@
@@ -24,12 +27,12 @@ index 3bc537b6b..c8965f91a 100644
<entry name="favoriteApps" type="StringList">
<label>List of general favorites. Supported values are menu id's (usually .desktop file names), special URLs that expand into default applications (e.g. preferred://browser), document URLs and KPeople contact URIs.</label>
- <default>preferred://browser,org.kde.kontact.desktop,systemsettings.desktop,org.kde.dolphin.desktop,ktp-contactlist.desktop,org.kde.discover</default>
+ <default>preferred://browser,org.kde.kontact.desktop,writer.desktop,libreoffice-writer.desktop,org.kde.digikam.desktop,org.kde.dolphin.desktop,org.kde.kate.desktop,systemsettings.desktop,org.kde.Help.desktop,org.kde.konsole.desktop</default>
+ <default>preferred://browser,org.kde.kontact.desktop,writer.desktop,libreoffice-writer.desktop,org.kde.digikam.desktop,org.kde.dolphin.desktop,org.kde.kate.desktop,systemsettings.desktop,org.kde.Help.desktop,org.kde.khelpcenter.desktop,org.kde.konsole.desktop</default>
</entry>
<entry name="favoriteSystemActions" type="StringList">
<label>List of system action favorites.</label>
diff --git a/applets/kickoff/package/contents/config/main.xml b/applets/kickoff/package/contents/config/main.xml
index a96d86fe1..24c46ee4c 100644
index a96d86fe1..139f51838 100644
--- a/applets/kickoff/package/contents/config/main.xml
+++ b/applets/kickoff/package/contents/config/main.xml
@@ -11,7 +11,7 @@
@@ -37,7 +40,7 @@ index a96d86fe1..24c46ee4c 100644
<entry name="favorites" type="StringList">
<label>List of general favorites. Supported values are menu id's (usually .desktop file names), special URLs that expand into default applications (e.g. preferred://browser), document URLs and KPeople contact URIs.</label>
- <default>preferred://browser,org.kde.kontact.desktop,systemsettings.desktop,org.kde.dolphin.desktop,ktp-contactlist.desktop,org.kde.discover.desktop</default>
+ <default>preferred://browser,org.kde.kontact.desktop,writer.desktop,libreoffice-writer.desktop,org.kde.digikam.desktop,org.kde.dolphin.desktop,org.kde.kate.desktop,systemsettings.desktop,org.kde.Help.desktop,org.kde.konsole.desktop</default>
+ <default>preferred://browser,org.kde.kontact.desktop,writer.desktop,libreoffice-writer.desktop,org.kde.digikam.desktop,org.kde.dolphin.desktop,org.kde.kate.desktop,systemsettings.desktop,org.kde.Help.desktop,org.kde.khelpcenter.desktop,org.kde.konsole.desktop</default>
</entry>
<entry name="systemFavorites" type="StringList">
<label>List of system action favorites.</label>

33
0001-kcms-touchpad-Remove-weird-Q_EMIT-changed-false-in-r.patch Normal file
View File

@@ -0,0 +1,33 @@
From 5cf2788fdd18cb8604fd172535b044c6cfd370fc Mon Sep 17 00:00:00 2001
From: Fabian Vogt <fabian@ritter-vogt.de>
Date: Thu, 24 Feb 2022 21:25:07 +0100
Subject: [PATCH] kcms/touchpad: Remove weird Q_EMIT changed(false) in
resizeEvent
That looks rather out of place there and does actually disable the apply button
when resizing the window. I don't understand what it's supposed to be doing
there, but if it has an actual purpose it needs to be addressed differently.
CCBUG: 449843
(cherry picked from commit 369eab6457965de99119f9966a009f98a60745bc)
---
kcms/touchpad/kcm/touchpadconfigcontainer.cpp | 1 -
1 file changed, 1 deletion(-)
diff --git a/kcms/touchpad/kcm/touchpadconfigcontainer.cpp b/kcms/touchpad/kcm/touchpadconfigcontainer.cpp
index 804e3f4d9..b51bdcf48 100644
--- a/kcms/touchpad/kcm/touchpadconfigcontainer.cpp
+++ b/kcms/touchpad/kcm/touchpadconfigcontainer.cpp
@@ -62,7 +62,6 @@ QSize TouchpadConfigContainer::sizeHint() const
}
void TouchpadConfigContainer::resizeEvent(QResizeEvent * /*event*/)
{
- Q_EMIT changed(false);
m_plugin->resize(this->size());
}
--
2.33.1

12
plasma5-desktop.changes
View File

@@ -1,3 +1,15 @@
-------------------------------------------------------------------
Fri Feb 25 16:02:31 UTC 2022 - Fabian Vogt <fabian@ritter-vogt.de>
- Add patch to fix the apply button in the touchpad KCM (kde#449843):
* 0001-kcms-touchpad-Remove-weird-Q_EMIT-changed-false-in-r.patch
-------------------------------------------------------------------
Thu Feb 24 19:33:30 UTC 2022 - Fabian Vogt <fabian@ritter-vogt.de>
- Adjust patch for khelpcenter desktop file rename:
* 0001-Apply-branding-to-default-favorites.patch
-------------------------------------------------------------------
Tue Feb 22 16:21:03 UTC 2022 - Fabian Vogt <fabian@ritter-vogt.de>

2
plasma5-desktop.spec
View File

@@ -43,6 +43,8 @@ Source: https://download.kde.org/stable/plasma/%{version}/plasma-desktop
Source1: https://download.kde.org/stable/plasma/%{version}/plasma-desktop-%{version}.tar.xz.sig
Source2: plasma.keyring
%endif
# PATCH-FIX-UPSTREAM
Patch1: 0001-kcms-touchpad-Remove-weird-Q_EMIT-changed-false-in-r.patch
# PATCH-FIX-OPENSUSE
Patch100: 0001-Apply-branding-to-default-favorites.patch
Patch101: 0002-No-usr-bin-env-in-shebangs.patch