Gentoo Archives: gentoo-commits

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