From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1B469158091 for ; Tue, 17 May 2022 19:02:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C611BE0954; Tue, 17 May 2022 19:02:12 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6D91EE0961 for ; Tue, 17 May 2022 19:02:12 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 942C334191A for ; Tue, 17 May 2022 19:02:11 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 83F9147B for ; Tue, 17 May 2022 19:02:08 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1652814110.742c530bfd9690468d841364bc48e5e2d5b0e36f.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: kde-plasma/systemsettings/, kde-plasma/systemsettings/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: kde-plasma/systemsettings/files/systemsettings-5.24.5-fix-activating-running-instance-on-wayland.patch kde-plasma/systemsettings/files/systemsettings-5.24.5-fix-kcm-highlighting.patch kde-plasma/systemsettings/systemsettings-5.24.5-r1.ebuild X-VCS-Directories: kde-plasma/systemsettings/files/ kde-plasma/systemsettings/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 742c530bfd9690468d841364bc48e5e2d5b0e36f X-VCS-Branch: master Date: Tue, 17 May 2022 19:02:08 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 1b83ad0a-2428-4b6e-9522-3c0691273010 X-Archives-Hash: 25f85933cc149c0bdb28cd31d255fff1 commit: 742c530bfd9690468d841364bc48e5e2d5b0e36f Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue May 17 19:00:30 2022 +0000 Commit: Andreas Sturmlechner gentoo 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 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 +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 +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 +}