* [gentoo-commits] repo/gentoo:master commit in: kde-plasma/systemsettings/, kde-plasma/systemsettings/files/
@ 2022-05-17 19:02 Andreas Sturmlechner
0 siblings, 0 replies; 2+ messages in thread
From: Andreas Sturmlechner @ 2022-05-17 19:02 UTC (permalink / raw
To: gentoo-commits
commit: 742c530bfd9690468d841364bc48e5e2d5b0e36f
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue May 17 19:00:30 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue May 17 19:01:50 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=742c530b
kde-plasma/systemsettings: Backport several 5.24.6 fixes
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
...ix-activating-running-instance-on-wayland.patch | 27 +++++++++
...ystemsettings-5.24.5-fix-kcm-highlighting.patch | 32 +++++++++++
.../systemsettings/systemsettings-5.24.5-r1.ebuild | 65 ++++++++++++++++++++++
3 files changed, 124 insertions(+)
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
new file mode 100644
index 000000000000..c52f043133b7
--- /dev/null
+++ b/kde-plasma/systemsettings/files/systemsettings-5.24.5-fix-activating-running-instance-on-wayland.patch
@@ -0,0 +1,27 @@
+From c48ecf5efb941cb3056da8f2c074005cb87417aa Mon Sep 17 00:00:00 2001
+From: Nicolas Fella <nicolas.fella@gmx.de>
+Date: Thu, 12 May 2022 16:49:55 +0200
+Subject: [PATCH] Fix activating running instance on Wayland
+
+(cherry picked from commit 16c1ee0c517164867d004c561d403e3aebebc7e3)
+---
+ app/main.cpp | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/app/main.cpp b/app/main.cpp
+index 13a803cd..e3f7b004 100644
+--- a/app/main.cpp
++++ b/app/main.cpp
+@@ -172,7 +172,8 @@ int main(int argc, char *argv[])
+ mainWindow->reloadStartupModule();
+ }
+
+- KWindowSystem::forceActiveWindow(mainWindow->winId());
++ KWindowSystem::updateStartupId(mainWindow->windowHandle());
++ KWindowSystem::activateWindow(mainWindow->windowHandle());
+ });
+
+ if (!startupModule.isEmpty()) {
+--
+GitLab
+
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
new file mode 100644
index 000000000000..9f8d494ded69
--- /dev/null
+++ b/kde-plasma/systemsettings/files/systemsettings-5.24.5-fix-kcm-highlighting.patch
@@ -0,0 +1,32 @@
+From 684004217fd28ba45f7ce61df5b3600398ee1108 Mon Sep 17 00:00:00 2001
+From: Nicolas Fella <nicolas.fella@gmx.de>
+Date: Thu, 12 May 2022 01:22:14 +0200
+Subject: [PATCH] Fix current index in subcategory list
+
+We bind currentIndex to activeSubCategoryRow, but when clicking on an item this binding is broken
+
+Manually set the current index when the backend index changes
+
+BUG: 453543
+
+Fixed-In: 5.24.6
+(cherry picked from commit 40b71c085f8ceddc9b3f44fa65d8bb48dad42b4a)
+---
+ sidebar/package/contents/ui/SubCategoryPage.qml | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/sidebar/package/contents/ui/SubCategoryPage.qml b/sidebar/package/contents/ui/SubCategoryPage.qml
+index 756b2763..19b33142 100644
+--- a/sidebar/package/contents/ui/SubCategoryPage.qml
++++ b/sidebar/package/contents/ui/SubCategoryPage.qml
+@@ -140,6 +140,7 @@ Kirigami.ScrollablePage {
+ Connections {
+ target: systemsettings
+ function onActiveSubCategoryRowChanged() {
++ subCategoryView.currentIndex = systemsettings.activeSubCategoryRow
+ if (systemsettings.activeSubCategoryRow >= 0) {
+ if (subCategoryView.count > 1) {
+ root.pageStack.push(subCategoryColumn);
+--
+GitLab
+
diff --git a/kde-plasma/systemsettings/systemsettings-5.24.5-r1.ebuild b/kde-plasma/systemsettings/systemsettings-5.24.5-r1.ebuild
new file mode 100644
index 000000000000..ab73d76a6c65
--- /dev/null
+++ b/kde-plasma/systemsettings/systemsettings-5.24.5-r1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="optional"
+KFMIN=5.90.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.2
+inherit ecm kde.org optfeature
+
+DESCRIPTION="Control Center to configure KDE Plasma desktop"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=kde-frameworks/kactivities-${KFMIN}:5
+ >=kde-frameworks/kactivities-stats-${KFMIN}:5
+ >=kde-frameworks/kauth-${KFMIN}:5
+ >=kde-frameworks/kcmutils-${KFMIN}:5
+ >=kde-frameworks/kcompletion-${KFMIN}:5
+ >=kde-frameworks/kconfig-${KFMIN}:5
+ >=kde-frameworks/kconfigwidgets-${KFMIN}:5
+ >=kde-frameworks/kcoreaddons-${KFMIN}:5
+ >=kde-frameworks/kcrash-${KFMIN}:5
+ >=kde-frameworks/kdbusaddons-${KFMIN}:5
+ >=kde-frameworks/kdeclarative-${KFMIN}:5
+ >=kde-frameworks/kguiaddons-${KFMIN}:5
+ >=kde-frameworks/ki18n-${KFMIN}:5
+ >=kde-frameworks/kiconthemes-${KFMIN}:5
+ >=kde-frameworks/kio-${KFMIN}:5
+ >=kde-frameworks/kirigami-${KFMIN}:5
+ >=kde-frameworks/kitemmodels-${KFMIN}:5
+ >=kde-frameworks/kitemviews-${KFMIN}:5
+ >=kde-frameworks/knotifications-${KFMIN}:5
+ >=kde-frameworks/kpackage-${KFMIN}:5
+ >=kde-frameworks/krunner-${KFMIN}:5
+ >=kde-frameworks/kservice-${KFMIN}:5
+ >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+ >=kde-frameworks/kwindowsystem-${KFMIN}:5
+ >=kde-frameworks/kxmlgui-${KFMIN}:5
+ >=kde-plasma/libkworkspace-${PVCUT}:5
+"
+RDEPEND="${DEPEND}
+ >=dev-qt/qtquickcontrols2-${QTMIN}:5
+"
+
+PATCHES=(
+ "${FILESDIR}/${P}-fix-kcm-highlighting.patch" # KDE-bug 453543
+ "${FILESDIR}/${P}-fix-activating-running-instance-on-wayland.patch"
+)
+
+pkg_postinst() {
+ if [[ -z "${REPLACING_VERSIONS}" ]]; then
+ optfeature "Configure looks for GTK+" kde-plasma/kde-gtk-config
+ fi
+ ecm_pkg_postinst
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-plasma/systemsettings/, kde-plasma/systemsettings/files/
@ 2022-08-07 15:51 Andreas Sturmlechner
0 siblings, 0 replies; 2+ messages in thread
From: Andreas Sturmlechner @ 2022-08-07 15:51 UTC (permalink / raw
To: gentoo-commits
commit: 70ad8f7ee28d7b184f294aca617617e6bb22190c
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 2 20:01:48 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Aug 7 15:43:11 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70ad8f7e
kde-plasma/systemsettings: drop 5.24.5-r1
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-plasma/systemsettings/Manifest | 1 -
...ix-activating-running-instance-on-wayland.patch | 27 ---------
...ystemsettings-5.24.5-fix-kcm-highlighting.patch | 32 -----------
.../systemsettings/systemsettings-5.24.5-r1.ebuild | 65 ----------------------
4 files changed, 125 deletions(-)
diff --git a/kde-plasma/systemsettings/Manifest b/kde-plasma/systemsettings/Manifest
index b873530de4a7..d55ce1085d13 100644
--- a/kde-plasma/systemsettings/Manifest
+++ b/kde-plasma/systemsettings/Manifest
@@ -1,3 +1,2 @@
-DIST systemsettings-5.24.5.tar.xz 205532 BLAKE2B ddde588074ab761fc41e6fb0715fa1af45904d223c060234170062a25b86d58d807b8fed003543785f50e9227161b167f4889bd817fe87c8b711da9f07bf361d SHA512 7dd2aa3d2b0ad821569eaa6e17d064a2216d35a525baf82621a1fb31867a340372ec0349488cc6bf344156f9d9052b589be5d01ed82a1c18fcedaa64fb4986b1
DIST systemsettings-5.24.6.tar.xz 205740 BLAKE2B d6864e502284b0c3da4821ee34f4be05f469f91c7ef013c85adff9ff473959a878622195a6701921410958a30b02389efa14661e7e2ea3fab34c7c871259e6d8 SHA512 79f9a4b749e13cbcf46efb123e7d4a0770b73097bac1968bf1eaaea920cef958a10fad4dd08d7102fa7a22a73d5c84d528c853af2c90d5e3f02c9d9e81ffcfcf
DIST systemsettings-5.25.4.tar.xz 207840 BLAKE2B 22377802e767ad37456fbdf8882976109747118a37989aab10a9da9112b8ae276857b2a8ccc7cb8a2cb87ee75f4f3a7ab2c0b27a7418ec0e13e47dd4310286be SHA512 8969e78d0c5ce580727edf7c54f42f084bd75f28be343e16dacac87c9a84c2e72a5213b53f7f23a644b4162ff8fefa721bf256e36773eb22ce66942bd3d8989b
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
deleted file mode 100644
index c52f043133b7..000000000000
--- a/kde-plasma/systemsettings/files/systemsettings-5.24.5-fix-activating-running-instance-on-wayland.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From c48ecf5efb941cb3056da8f2c074005cb87417aa Mon Sep 17 00:00:00 2001
-From: Nicolas Fella <nicolas.fella@gmx.de>
-Date: Thu, 12 May 2022 16:49:55 +0200
-Subject: [PATCH] Fix activating running instance on Wayland
-
-(cherry picked from commit 16c1ee0c517164867d004c561d403e3aebebc7e3)
----
- app/main.cpp | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/app/main.cpp b/app/main.cpp
-index 13a803cd..e3f7b004 100644
---- a/app/main.cpp
-+++ b/app/main.cpp
-@@ -172,7 +172,8 @@ int main(int argc, char *argv[])
- mainWindow->reloadStartupModule();
- }
-
-- KWindowSystem::forceActiveWindow(mainWindow->winId());
-+ KWindowSystem::updateStartupId(mainWindow->windowHandle());
-+ KWindowSystem::activateWindow(mainWindow->windowHandle());
- });
-
- if (!startupModule.isEmpty()) {
---
-GitLab
-
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
deleted file mode 100644
index 9f8d494ded69..000000000000
--- a/kde-plasma/systemsettings/files/systemsettings-5.24.5-fix-kcm-highlighting.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 684004217fd28ba45f7ce61df5b3600398ee1108 Mon Sep 17 00:00:00 2001
-From: Nicolas Fella <nicolas.fella@gmx.de>
-Date: Thu, 12 May 2022 01:22:14 +0200
-Subject: [PATCH] Fix current index in subcategory list
-
-We bind currentIndex to activeSubCategoryRow, but when clicking on an item this binding is broken
-
-Manually set the current index when the backend index changes
-
-BUG: 453543
-
-Fixed-In: 5.24.6
-(cherry picked from commit 40b71c085f8ceddc9b3f44fa65d8bb48dad42b4a)
----
- sidebar/package/contents/ui/SubCategoryPage.qml | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/sidebar/package/contents/ui/SubCategoryPage.qml b/sidebar/package/contents/ui/SubCategoryPage.qml
-index 756b2763..19b33142 100644
---- a/sidebar/package/contents/ui/SubCategoryPage.qml
-+++ b/sidebar/package/contents/ui/SubCategoryPage.qml
-@@ -140,6 +140,7 @@ Kirigami.ScrollablePage {
- Connections {
- target: systemsettings
- function onActiveSubCategoryRowChanged() {
-+ subCategoryView.currentIndex = systemsettings.activeSubCategoryRow
- if (systemsettings.activeSubCategoryRow >= 0) {
- if (subCategoryView.count > 1) {
- root.pageStack.push(subCategoryColumn);
---
-GitLab
-
diff --git a/kde-plasma/systemsettings/systemsettings-5.24.5-r1.ebuild b/kde-plasma/systemsettings/systemsettings-5.24.5-r1.ebuild
deleted file mode 100644
index 3fd54a2ee7bc..000000000000
--- a/kde-plasma/systemsettings/systemsettings-5.24.5-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="optional"
-KFMIN=5.90.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
-inherit ecm kde.org optfeature
-
-DESCRIPTION="Control Center to configure KDE Plasma desktop"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-IUSE=""
-
-DEPEND="
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=kde-frameworks/kactivities-${KFMIN}:5
- >=kde-frameworks/kactivities-stats-${KFMIN}:5
- >=kde-frameworks/kauth-${KFMIN}:5
- >=kde-frameworks/kcmutils-${KFMIN}:5
- >=kde-frameworks/kcompletion-${KFMIN}:5
- >=kde-frameworks/kconfig-${KFMIN}:5
- >=kde-frameworks/kconfigwidgets-${KFMIN}:5
- >=kde-frameworks/kcoreaddons-${KFMIN}:5
- >=kde-frameworks/kcrash-${KFMIN}:5
- >=kde-frameworks/kdbusaddons-${KFMIN}:5
- >=kde-frameworks/kdeclarative-${KFMIN}:5
- >=kde-frameworks/kguiaddons-${KFMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-frameworks/kiconthemes-${KFMIN}:5
- >=kde-frameworks/kio-${KFMIN}:5
- >=kde-frameworks/kirigami-${KFMIN}:5
- >=kde-frameworks/kitemmodels-${KFMIN}:5
- >=kde-frameworks/kitemviews-${KFMIN}:5
- >=kde-frameworks/knotifications-${KFMIN}:5
- >=kde-frameworks/kpackage-${KFMIN}:5
- >=kde-frameworks/krunner-${KFMIN}:5
- >=kde-frameworks/kservice-${KFMIN}:5
- >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
- >=kde-frameworks/kwindowsystem-${KFMIN}:5
- >=kde-frameworks/kxmlgui-${KFMIN}:5
- >=kde-plasma/libkworkspace-${PVCUT}:5
-"
-RDEPEND="${DEPEND}
- >=dev-qt/qtquickcontrols2-${QTMIN}:5
-"
-
-PATCHES=(
- "${FILESDIR}/${P}-fix-kcm-highlighting.patch" # KDE-bug 453543
- "${FILESDIR}/${P}-fix-activating-running-instance-on-wayland.patch"
-)
-
-pkg_postinst() {
- if [[ -z "${REPLACING_VERSIONS}" ]]; then
- optfeature "Configure looks for GTK+" kde-plasma/kde-gtk-config
- fi
- ecm_pkg_postinst
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-08-07 15:52 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-05-17 19:02 [gentoo-commits] repo/gentoo:master commit in: kde-plasma/systemsettings/, kde-plasma/systemsettings/files/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2022-08-07 15:51 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox