1 |
commit: 742c530bfd9690468d841364bc48e5e2d5b0e36f |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue May 17 19:00:30 2022 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue May 17 19:01:50 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=742c530b |
7 |
|
8 |
kde-plasma/systemsettings: Backport several 5.24.6 fixes |
9 |
|
10 |
Package-Manager: Portage-3.0.30, Repoman-3.0.3 |
11 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
12 |
|
13 |
...ix-activating-running-instance-on-wayland.patch | 27 +++++++++ |
14 |
...ystemsettings-5.24.5-fix-kcm-highlighting.patch | 32 +++++++++++ |
15 |
.../systemsettings/systemsettings-5.24.5-r1.ebuild | 65 ++++++++++++++++++++++ |
16 |
3 files changed, 124 insertions(+) |
17 |
|
18 |
diff --git a/kde-plasma/systemsettings/files/systemsettings-5.24.5-fix-activating-running-instance-on-wayland.patch b/kde-plasma/systemsettings/files/systemsettings-5.24.5-fix-activating-running-instance-on-wayland.patch |
19 |
new file mode 100644 |
20 |
index 000000000000..c52f043133b7 |
21 |
--- /dev/null |
22 |
+++ b/kde-plasma/systemsettings/files/systemsettings-5.24.5-fix-activating-running-instance-on-wayland.patch |
23 |
@@ -0,0 +1,27 @@ |
24 |
+From c48ecf5efb941cb3056da8f2c074005cb87417aa Mon Sep 17 00:00:00 2001 |
25 |
+From: Nicolas Fella <nicolas.fella@×××.de> |
26 |
+Date: Thu, 12 May 2022 16:49:55 +0200 |
27 |
+Subject: [PATCH] Fix activating running instance on Wayland |
28 |
+ |
29 |
+(cherry picked from commit 16c1ee0c517164867d004c561d403e3aebebc7e3) |
30 |
+--- |
31 |
+ app/main.cpp | 3 ++- |
32 |
+ 1 file changed, 2 insertions(+), 1 deletion(-) |
33 |
+ |
34 |
+diff --git a/app/main.cpp b/app/main.cpp |
35 |
+index 13a803cd..e3f7b004 100644 |
36 |
+--- a/app/main.cpp |
37 |
++++ b/app/main.cpp |
38 |
+@@ -172,7 +172,8 @@ int main(int argc, char *argv[]) |
39 |
+ mainWindow->reloadStartupModule(); |
40 |
+ } |
41 |
+ |
42 |
+- KWindowSystem::forceActiveWindow(mainWindow->winId()); |
43 |
++ KWindowSystem::updateStartupId(mainWindow->windowHandle()); |
44 |
++ KWindowSystem::activateWindow(mainWindow->windowHandle()); |
45 |
+ }); |
46 |
+ |
47 |
+ if (!startupModule.isEmpty()) { |
48 |
+-- |
49 |
+GitLab |
50 |
+ |
51 |
|
52 |
diff --git a/kde-plasma/systemsettings/files/systemsettings-5.24.5-fix-kcm-highlighting.patch b/kde-plasma/systemsettings/files/systemsettings-5.24.5-fix-kcm-highlighting.patch |
53 |
new file mode 100644 |
54 |
index 000000000000..9f8d494ded69 |
55 |
--- /dev/null |
56 |
+++ b/kde-plasma/systemsettings/files/systemsettings-5.24.5-fix-kcm-highlighting.patch |
57 |
@@ -0,0 +1,32 @@ |
58 |
+From 684004217fd28ba45f7ce61df5b3600398ee1108 Mon Sep 17 00:00:00 2001 |
59 |
+From: Nicolas Fella <nicolas.fella@×××.de> |
60 |
+Date: Thu, 12 May 2022 01:22:14 +0200 |
61 |
+Subject: [PATCH] Fix current index in subcategory list |
62 |
+ |
63 |
+We bind currentIndex to activeSubCategoryRow, but when clicking on an item this binding is broken |
64 |
+ |
65 |
+Manually set the current index when the backend index changes |
66 |
+ |
67 |
+BUG: 453543 |
68 |
+ |
69 |
+Fixed-In: 5.24.6 |
70 |
+(cherry picked from commit 40b71c085f8ceddc9b3f44fa65d8bb48dad42b4a) |
71 |
+--- |
72 |
+ sidebar/package/contents/ui/SubCategoryPage.qml | 1 + |
73 |
+ 1 file changed, 1 insertion(+) |
74 |
+ |
75 |
+diff --git a/sidebar/package/contents/ui/SubCategoryPage.qml b/sidebar/package/contents/ui/SubCategoryPage.qml |
76 |
+index 756b2763..19b33142 100644 |
77 |
+--- a/sidebar/package/contents/ui/SubCategoryPage.qml |
78 |
++++ b/sidebar/package/contents/ui/SubCategoryPage.qml |
79 |
+@@ -140,6 +140,7 @@ Kirigami.ScrollablePage { |
80 |
+ Connections { |
81 |
+ target: systemsettings |
82 |
+ function onActiveSubCategoryRowChanged() { |
83 |
++ subCategoryView.currentIndex = systemsettings.activeSubCategoryRow |
84 |
+ if (systemsettings.activeSubCategoryRow >= 0) { |
85 |
+ if (subCategoryView.count > 1) { |
86 |
+ root.pageStack.push(subCategoryColumn); |
87 |
+-- |
88 |
+GitLab |
89 |
+ |
90 |
|
91 |
diff --git a/kde-plasma/systemsettings/systemsettings-5.24.5-r1.ebuild b/kde-plasma/systemsettings/systemsettings-5.24.5-r1.ebuild |
92 |
new file mode 100644 |
93 |
index 000000000000..ab73d76a6c65 |
94 |
--- /dev/null |
95 |
+++ b/kde-plasma/systemsettings/systemsettings-5.24.5-r1.ebuild |
96 |
@@ -0,0 +1,65 @@ |
97 |
+# Copyright 1999-2022 Gentoo Authors |
98 |
+# Distributed under the terms of the GNU General Public License v2 |
99 |
+ |
100 |
+EAPI=8 |
101 |
+ |
102 |
+ECM_HANDBOOK="optional" |
103 |
+KFMIN=5.90.0 |
104 |
+PVCUT=$(ver_cut 1-3) |
105 |
+QTMIN=5.15.2 |
106 |
+inherit ecm kde.org optfeature |
107 |
+ |
108 |
+DESCRIPTION="Control Center to configure KDE Plasma desktop" |
109 |
+ |
110 |
+LICENSE="GPL-2" # TODO: CHECK |
111 |
+SLOT="5" |
112 |
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" |
113 |
+IUSE="" |
114 |
+ |
115 |
+DEPEND=" |
116 |
+ >=dev-qt/qtdbus-${QTMIN}:5 |
117 |
+ >=dev-qt/qtdeclarative-${QTMIN}:5[widgets] |
118 |
+ >=dev-qt/qtgui-${QTMIN}:5 |
119 |
+ >=dev-qt/qtwidgets-${QTMIN}:5 |
120 |
+ >=kde-frameworks/kactivities-${KFMIN}:5 |
121 |
+ >=kde-frameworks/kactivities-stats-${KFMIN}:5 |
122 |
+ >=kde-frameworks/kauth-${KFMIN}:5 |
123 |
+ >=kde-frameworks/kcmutils-${KFMIN}:5 |
124 |
+ >=kde-frameworks/kcompletion-${KFMIN}:5 |
125 |
+ >=kde-frameworks/kconfig-${KFMIN}:5 |
126 |
+ >=kde-frameworks/kconfigwidgets-${KFMIN}:5 |
127 |
+ >=kde-frameworks/kcoreaddons-${KFMIN}:5 |
128 |
+ >=kde-frameworks/kcrash-${KFMIN}:5 |
129 |
+ >=kde-frameworks/kdbusaddons-${KFMIN}:5 |
130 |
+ >=kde-frameworks/kdeclarative-${KFMIN}:5 |
131 |
+ >=kde-frameworks/kguiaddons-${KFMIN}:5 |
132 |
+ >=kde-frameworks/ki18n-${KFMIN}:5 |
133 |
+ >=kde-frameworks/kiconthemes-${KFMIN}:5 |
134 |
+ >=kde-frameworks/kio-${KFMIN}:5 |
135 |
+ >=kde-frameworks/kirigami-${KFMIN}:5 |
136 |
+ >=kde-frameworks/kitemmodels-${KFMIN}:5 |
137 |
+ >=kde-frameworks/kitemviews-${KFMIN}:5 |
138 |
+ >=kde-frameworks/knotifications-${KFMIN}:5 |
139 |
+ >=kde-frameworks/kpackage-${KFMIN}:5 |
140 |
+ >=kde-frameworks/krunner-${KFMIN}:5 |
141 |
+ >=kde-frameworks/kservice-${KFMIN}:5 |
142 |
+ >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 |
143 |
+ >=kde-frameworks/kwindowsystem-${KFMIN}:5 |
144 |
+ >=kde-frameworks/kxmlgui-${KFMIN}:5 |
145 |
+ >=kde-plasma/libkworkspace-${PVCUT}:5 |
146 |
+" |
147 |
+RDEPEND="${DEPEND} |
148 |
+ >=dev-qt/qtquickcontrols2-${QTMIN}:5 |
149 |
+" |
150 |
+ |
151 |
+PATCHES=( |
152 |
+ "${FILESDIR}/${P}-fix-kcm-highlighting.patch" # KDE-bug 453543 |
153 |
+ "${FILESDIR}/${P}-fix-activating-running-instance-on-wayland.patch" |
154 |
+) |
155 |
+ |
156 |
+pkg_postinst() { |
157 |
+ if [[ -z "${REPLACING_VERSIONS}" ]]; then |
158 |
+ optfeature "Configure looks for GTK+" kde-plasma/kde-gtk-config |
159 |
+ fi |
160 |
+ ecm_pkg_postinst |
161 |
+} |