gentoo auto-resync : 26:07:2022 - 14:59:07

15 files changed, 707 insertions, 0 deletions

diff --git a/kde-plasma/Manifest.gz b/kde-plasma/Manifest.gz
index 8c622304dc7c..8c412c6dad67 100644
--- a/kde-plasma/Manifest.gz
+++ b/kde-plasma/Manifest.gz
diff --git a/kde-plasma/breeze/Manifest b/kde-plasma/breeze/Manifest
index 456a5a06cdd8..7767b4df47cc 100644
--- a/kde-plasma/breeze/Manifest
+++ b/kde-plasma/breeze/Manifest
@@ -1,7 +1,10 @@
+AUX breeze-5.24.6-fix-qqc2-progressbar-style-in-rtl.patch 2441 BLAKE2B 4b3c954753510f1be049cd83d7d26c7b685bc0d6c33fb5c6a719e30598fc2e0590b205531c0532dc8af5ea28fbb83ed93f73005fcd0928bc0f71cc3cc820c274 SHA512 f0693d76adb0dd64970cb77ccf8b2c938c133a1c303f4ed603a6b56921d20a9015600826d2e4158fd7d4511508fa79c3d240996c62fb509206452be3907f47e3
+AUX breeze-5.24.6-fix-qqc2-sliders-in-rtl.patch 3583 BLAKE2B 7c70af921e37a8c82774345bfa1ed132a602713936ecc4eb763d6dbe2f33586723ea2d69ddbff09612151bc2de643aa78adc921989aa35cf72f7858fa40edea8 SHA512 ea6280190669b75fff169515cb5870b4eff91bb42ef4b5e37d399a788410609352e401cf540db0237ad3e89ebf4bacd40ddf02279f41ab5371f747f46b2285b5
 DIST breeze-5.24.5.tar.xz 43037308 BLAKE2B 68fce5bac9abc097a1c91db68fa97a2215ea4e43d91e5ac9e86f803c64229f2d9e96c318417450acea0ef79316c0f2596d6bc9c0cd5513aa3249a616bc3f8007 SHA512 25e5744589130f7d339c727e17e662a28bdecc3f0598b9683735ccdfd2dcdeada46a49baa5564a7cf7d59a3f6ac34802ae2172857e704941d64cf879b3583df0
 DIST breeze-5.24.6.tar.xz 43037288 BLAKE2B 69245aa03eb5d8e8f26a45a7bbba246a19b07d96e0c193cdac7a4bf4e538810269a4fa575f68ee9f0c6a362a50dead58de484f06f4258f1fa773e654fb6b870c SHA512 976744eeeaddd2d165315f17491ee67cc63d03f935a29eda99afefed51e642daf60aa4d6a71621f15e1a87138d8d91a0e36f081ae30e80ef31796067e858ca93
 DIST breeze-5.25.3.tar.xz 31155548 BLAKE2B 3472496fa507469835015348dcdb805c72cccbc298606f83a3db27890f041573cfd68c52a35ebfd6c697da808b96c50be0433e28ac4bb3f3706535b70896463d SHA512 c5b51d871436c2334a5088292cca39ea055703d7945800b6aba2bd0b392e60862d9fdbbe705331f140d59f6842663608226c1e99dfd40dc8060645413a1e0abc
 EBUILD breeze-5.24.5.ebuild 1233 BLAKE2B b78a0cbfd6149999b9defd19e5730d5d3350e17ec5517f9bbd8feff0781003c3b353cd676fa847bc84a4542a083a2e1108201ee691d34a7044d630259f78a70c SHA512 d369d733f9cfc2b4b3ef0ef52920f3094dae7bb428a12bef4634f5e606debbda9b5356b70b927a63b3d083a8dc45edb9332282965a2c2aa9ddbc80f4aed2d7c8
+EBUILD breeze-5.24.6-r1.ebuild 1409 BLAKE2B 9e497744decb007538ef0aa61a8b44eecc2d52e37567b88c03c11a6ed6bedd8f637d0cee3057ee049d1c216349c4e7ba94fee3e740fd90146d756f2d1a82eeee SHA512 53287bba2cf3ec0fd27c66634565eeb28d9eddb7955db3901b5212d99d2b5773a18531ba291f9a2c7ce464069dd10bb4b08890729da8b2dcd620e310ad7262a0
 EBUILD breeze-5.24.6.ebuild 1250 BLAKE2B 8048dfca3e6f7d531f79728c36802eebfa55d2e3eaa523f90f09746a84c0685ca42dc6da2bc9997ec88b3ba286551bfbbffc76a2e4f419cbfcbb99229b46739a SHA512 c6db95195270ce7e00fdd9ca8753e49247b7386e95646dc8c4ddd61153eb8e69161b3b75ab77f3ef3d2f1e57b60f09f25741aba6519ba0dee7c7a6dc16b169c3
 EBUILD breeze-5.25.3.ebuild 1250 BLAKE2B 7a6176ed2111cabf383b13ed39b2c5c2e35197b03470dc7f99a247ec32442a7785d1087ca373d69a341f74eded566efc2ea969b7e6a583581260db17da4623bb SHA512 4857679c73d11c2895dadf74462bcc1e26d7cd9db877d53e1b951bacd85bd70fdb44cc74b69f68c7fca89a610e8b74ec4ce22bc70d17fc1c10f2c1b6cf8a0049
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/breeze/breeze-5.24.6-r1.ebuild b/kde-plasma/breeze/breeze-5.24.6-r1.ebuild
new file mode 100644
index 000000000000..503fdca4df41
--- /dev/null
+++ b/kde-plasma/breeze/breeze-5.24.6-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KFMIN=5.92.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.4
+inherit ecm plasma.kde.org
+
+DESCRIPTION="Breeze visual style for the Plasma desktop"
+HOMEPAGE="https://invent.kde.org/plasma/breeze"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="X"
+
+RDEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtx11extras-${QTMIN}:5
+	>=kde-frameworks/frameworkintegration-${KFMIN}:5
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kguiaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-plasma/kdecoration-${PVCUT}:5
+	X? ( x11-libs/libxcb )
+"
+DEPEND="${RDEPEND}"
+PDEPEND="
+	>=kde-frameworks/breeze-icons-${KFMIN}:5
+	>=kde-plasma/kde-cli-tools-${PVCUT}:5
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-fix-qqc2-sliders-in-rtl.patch" # KDE-bug #430101
+	"${FILESDIR}/${P}-fix-qqc2-progressbar-style-in-rtl.patch" # KDE-bug #430101
+)
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package X XCB)
+	)
+	ecm_src_configure
+}
diff --git a/kde-plasma/breeze/files/breeze-5.24.6-fix-qqc2-progressbar-style-in-rtl.patch b/kde-plasma/breeze/files/breeze-5.24.6-fix-qqc2-progressbar-style-in-rtl.patch
new file mode 100644
index 000000000000..36e4f952d980
--- /dev/null
+++ b/kde-plasma/breeze/files/breeze-5.24.6-fix-qqc2-progressbar-style-in-rtl.patch
@@ -0,0 +1,58 @@
+From d7c0ab28df83eb4a4c39495a25e609047c735d59 Mon Sep 17 00:00:00 2001
+From: ivan tkachenko <me@ratijas.tk>
+Date: Sat, 4 Jun 2022 05:00:53 +0300
+Subject: [PATCH] KStyle: Fix QQC2 ProgressBar desktop style in RTL layout
+ direction
+
+BUG: 430101
+
+(cherry picked from commit 2bf9fc4c7be280e2b77f7c150855e0fca0b80d9a)
+
+* asturm 2022-07-26: Merged with clang-format changes in commit
+  32149dc002ae574ed41f111bf52712b1765b906b
+
+---
+ kstyle/breezestyle.cpp | 16 ++++++++++------
+ 1 file changed, 10 insertions(+), 6 deletions(-)
+
+diff --git a/kstyle/breezestyle.cpp b/kstyle/breezestyle.cpp
+index c9fba292..0d7a8432 100644
+--- a/kstyle/breezestyle.cpp
++++ b/kstyle/breezestyle.cpp
+@@ -1749,23 +1749,27 @@ namespace Breeze
+         const bool horizontal( BreezePrivate::isProgressBarHorizontal( progressBarOption ) );
+ 
+         // check inverted appearance
+-        const bool inverted( progressBarOption->invertedAppearance );
++        bool inverted(progressBarOption->invertedAppearance);
++        if (horizontal) {
++            // un-invert in RTL layout
++            inverted ^= option->direction == Qt::RightToLeft;
++        }
+ 
+         // get progress and steps
+-        const qreal progress( progressBarOption->progress - progressBarOption->minimum );
++        const int progress(progressBarOption->progress - progressBarOption->minimum);
+         const int steps( qMax( progressBarOption->maximum  - progressBarOption->minimum, 1 ) );
+ 
+         //Calculate width fraction
+-        const qreal widthFrac = qMin( qreal(1), progress/steps );
++        const qreal position = qreal(progress) / qreal(steps);
++        const qreal visualPosition = inverted ? 1 - position : position;
+ 
+         // convert the pixel width
+-        const int indicatorSize( widthFrac*( horizontal ? rect.width():rect.height() ) );
++        const int indicatorSize(visualPosition * (horizontal ? rect.width() : rect.height()));
+ 
+         QRect indicatorRect;
+         if( horizontal )
+         {
+-
+-            indicatorRect = QRect( inverted ? ( rect.right() - indicatorSize + 1):rect.left(), rect.y(), indicatorSize, rect.height() );
++            indicatorRect = QRect(rect.left(), rect.y(), indicatorSize, rect.height());
+             indicatorRect = visualRect( option->direction, rect, indicatorRect );
+ 
+         } else indicatorRect = QRect( rect.x(), inverted ? rect.top() : (rect.bottom() - indicatorSize + 1), rect.width(), indicatorSize );
+-- 
+2.35.1
+
diff --git a/kde-plasma/breeze/files/breeze-5.24.6-fix-qqc2-sliders-in-rtl.patch b/kde-plasma/breeze/files/breeze-5.24.6-fix-qqc2-sliders-in-rtl.patch
new file mode 100644
index 000000000000..b8b3504a0a0e
--- /dev/null
+++ b/kde-plasma/breeze/files/breeze-5.24.6-fix-qqc2-sliders-in-rtl.patch
@@ -0,0 +1,76 @@
+From 53f24305536850b244b730f9a04024daf02e753b Mon Sep 17 00:00:00 2001
+From: Jan Blackquill <uhhadd@gmail.com>
+Date: Fri, 3 Jun 2022 17:34:02 -0400
+Subject: [PATCH] kstyle: fix qqc2 desktop style sliders in RtL
+
+We don't do any mirroring of the slider groove rects or tickmarks based on layout direction,
+and this causes qqc2-desktop-style sliders to render in the wrong direction.
+Swapping the leftRect and the rightRect when option->direction == Qt::RightToLeft
+fixes this.
+
+This wasn't broken with QWidgets because QSlider relies on (ab)using the upsideDown option
+in order to achieve mirroring of the groove instead of option->direction, and consequently,
+this change doesn't affect Qt widgets apps at all.
+
+BUG: 430101
+(cherry picked from commit e8b1d4aa47daf99041332f43c29fabdf70f25004)
+
+* asturm 2022-07-26: Merged with clang-format changes in commit
+  32149dc002ae574ed41f111bf52712b1765b906b
+
+---
+ kstyle/breezestyle.cpp | 14 ++++++++++----
+ 1 file changed, 10 insertions(+), 4 deletions(-)
+
+diff --git a/kstyle/breezestyle.cpp b/kstyle/breezestyle.cpp
+index 2ef2ea98..c9fba292 100644
+--- a/kstyle/breezestyle.cpp
++++ b/kstyle/breezestyle.cpp
+@@ -51,6 +51,7 @@
+ #include <QDialogButtonBox>
+ #include <QGraphicsItem>
+ #include <QGraphicsProxyWidget>
++#include <qnamespace.h>
+ 
+ #if BREEZE_HAVE_QTQUICK
+ #include <QQuickWindow>
+@@ -6679,6 +6680,7 @@ namespace Breeze
+                 }
+ 
+                 // colors
++                const auto reverseTicks = option->direction == Qt::LeftToRight ? upsideDown : !upsideDown;
+                 const auto base( _helper->separatorColor( palette ) );
+                 const auto &highlight = hasHighlightNeutral( widget, option, mouseOver, hasFocus ) ? _helper->neutralText( palette ) : palette.color( QPalette::Highlight );
+ 
+@@ -6693,8 +6695,8 @@ namespace Breeze
+                     int position( sliderPositionFromValue( sliderOption->minimum, sliderOption->maximum, current, available ) + fudge );
+                     foreach( const QLine& tickLine, tickLines )
+                     {
+-                        if( horizontal ) painter->drawLine( tickLine.translated( upsideDown ? (rect.width() - position) : position, 0 ) );
+-                        else painter->drawLine( tickLine.translated( 0, upsideDown ? (rect.height() - position):position ) );
++                        if( horizontal ) painter->drawLine(tickLine.translated(reverseTicks ? (rect.width() - position) : position, 0));
++                        else painter->drawLine(tickLine.translated(0, reverseTicks ? (rect.height() - position) : position));
+                     }
+ 
+                     // go to next position
+@@ -6729,11 +6731,15 @@ namespace Breeze
+ 
+                     auto leftRect( grooveRect );
+                     leftRect.setRight( handleRect.right() - Metrics::Slider_ControlThickness/2 );
+-                    _helper->renderSliderGroove( painter, leftRect, upsideDown ? grooveColor:highlight );
+ 
+                     auto rightRect( grooveRect );
+                     rightRect.setLeft( handleRect.left() + Metrics::Slider_ControlThickness/2 );
+-                    _helper->renderSliderGroove( painter, rightRect, upsideDown ? highlight:grooveColor );
++
++                    if (option->direction == Qt::RightToLeft)
++                        std::swap(leftRect, rightRect);
++
++                    _helper->renderSliderGroove(painter, leftRect, upsideDown ? grooveColor : highlight);
++                    _helper->renderSliderGroove(painter, rightRect, upsideDown ? highlight : grooveColor);
+ 
+                 } else {
+ 
+-- 
+2.35.1
+
diff --git a/kde-plasma/discover/Manifest b/kde-plasma/discover/Manifest
index 23c77e00b5d1..1ad636d09b0f 100644
--- a/kde-plasma/discover/Manifest
+++ b/kde-plasma/discover/Manifest
@@ -1,9 +1,11 @@
 AUX discover-5.21.90-tests-optional.patch 3372 BLAKE2B 9c1ee887d31b48b730350cb599f3f8e7ca4b802ba2d68dce72cede96b7a6d0e83451697b9e9e3da67c611514a3d808affb9616a515b80cc3788365fc3ca01997 SHA512 43a7152fb04224f52e417f2684fda6561cfd26888ff6493899e70b313f725066be1aefe9a0350c1aa260d799c44bdd5643a79e4a84dd6cfa34511dbc098ff93d
+AUX discover-5.24.6-fix-submitting-usefulness.patch 2041 BLAKE2B 865c8719c047a2c23147c198c15ff638be82745c4082f3f91bf9912653426a02c3e433d555915c1edcd8ae6de0a4712bba750449c0a228607234607807c0fdd8 SHA512 4d6fd5079dc35a36471d626e99430a83de25d71eaca91de526a8485be7cf62effbcec80058b6ccbaf9a3e0f083430a5cfb9f9fc418adc5818158039130502d40
 AUX discover-5.25.1-tests-optional.patch 3012 BLAKE2B a13aa4927a0ebc6c4c021400a8de15c248adf3a26558e3a4809f75d104b23bdbcf8b87670f1f28ab3683a1c852d43fc890692e86580512e6c3b9a3d275d901a7 SHA512 96c3c48786bc66d1d777a0b43a1b80dff717dcbd395277e1c7fe6cba9e12f15bb55ee9aadfee65b2c2896b35e0b6567c62322852b94baf3698150a147b600e39
 DIST discover-5.24.5.tar.xz 8261960 BLAKE2B 0123ef536559ec9a739f1ffd1d04174f7e845eccdc481caac822294ebc39bc299bc831e741e8355d444df9e018bc457e0de7f591ca095da1c7b55f4d6976f8d1 SHA512 bfef0e3b0f3911d5ad2247abb0dcec6dc284bdfaa69472d35af1a28ddb6f14fedf1697269e35c1c29bd8b7017317b1ec69fb67cf55a32320d30e22445e354518
 DIST discover-5.24.6.tar.xz 8262256 BLAKE2B e01fe3da64f976c576f52c9882d76479b01aee45c008856c0dceca4dd243b5af0ee020912511ea57b15ebf2bee8a3a653896d83f663bea0c8ed79eee3f4e3b73 SHA512 3be308dcb302ee87d3a2983b822c0f7233837c80646c5387085714864c057cabd0c492013167f81b8b869947400ea2a30e4e1f3f3e73e2e03bc58953ea0080cd
 DIST discover-5.25.3.tar.xz 8306324 BLAKE2B b51c1884846f9af9f85a8e0120d9aa363fba6e0d86108d5acbae1d85d9c76631497f573859e40f7fa8c49b80288a5e3359003fdd3dcc20a7866834d46c90e807 SHA512 7d500a691fe7446445db59a8d8bed58e16db7e3a7e81635d746399efe243c4ab0cd5a47a5780ddd65f1ffe67dc783204f5d28e87108ba44dea62b236f07c4487
 EBUILD discover-5.24.5.ebuild 2441 BLAKE2B e574eb16382569c5104c9ce2ef40cd1a38272433a9f217216f1d18224a8faec2d129952e95d220de0b18a2aaf76ba95bd8791ce0ba056c9c24da3006ea0e5d09 SHA512 97da5345edd4c4725bd2918e2b399491c79f7ba2194eebb9585c077547023b78dbf661548a4a007147ffbc96dd616fb8c609110aa74533555902fe050a05ed28
+EBUILD discover-5.24.6-r1.ebuild 2504 BLAKE2B c06546598f09e494ff944e86d43b6519c491a552b4032d979a0a5f3a45eea32e98a620a486b1b4ad8846c24b496335e2615105c48abed89911ac7169e51bcb5a SHA512 436ecc19c117face47cc8f5889c94c76f1fbf32cc6201d33b054e7cef6285314e3a1715d22dd2fdc3671b56b730a6999d044e6abbd30fbe3449cdc1de15b3b09
 EBUILD discover-5.24.6.ebuild 2451 BLAKE2B 195332c15d49d77f3a98bf583fb2088df4b90c77cdba19785236ef0fee22c314af26a165f6344f96ee657547441429c225a2ac18d9572db8957edcd77216f749 SHA512 1f119cb28e9a4cee023b6016f65e4ae0c78f6dd815f68a07382edc3f32e81615b4c3ec8c4960bdb9e54d63e24ef3a1ae23bd688c6a0a582ba9e1827871629741
 EBUILD discover-5.25.3.ebuild 2376 BLAKE2B def86b52fa259baacda8d098495e2c9e53bdeb3c8b6c7e511b6104643a6eb6056c1d966447b54b3aebffc0051d01812141cea725a3ac66362d35bba329dde1c0 SHA512 de1b3d34892b86ecc19ab9236461c7011d86b2b5159a6680121ef52adef3708e5dc99457b24875ecd714b901d31c5342cab3ebab140dd124c025447c09f7f578
 MISC metadata.xml 537 BLAKE2B 3f8ef5cff5aba41680b677214f13254460b589b01380bb7c569f0f4cd011d046f76efaab48eb3f36bd0f13ace05845e670223e34b12519c3add4f0412443c792 SHA512 68b34b02c8f1b9a4c41f4aa5b2c2ced838bf65854b7cf15286ee426290f80fff4065ed8fe86db1aec62329778f425b0f9dc0e69c08db029910cd43136aca1d9b
diff --git a/kde-plasma/discover/discover-5.24.6-r1.ebuild b/kde-plasma/discover/discover-5.24.6-r1.ebuild
new file mode 100644
index 000000000000..bc8dec03387d
--- /dev/null
+++ b/kde-plasma/discover/discover-5.24.6-r1.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_TEST="true"
+KFMIN=5.92.0
+QTMIN=5.15.4
+VIRTUALX_REQUIRED="test"
+inherit ecm plasma.kde.org
+
+DESCRIPTION="KDE Plasma resources management GUI"
+HOMEPAGE="https://userbase.kde.org/Discover"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="+firmware flatpak telemetry"
+
+# libmarkdown (app-text/discount) only used in PackageKitBackend
+DEPEND="
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtx11extras-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=kde-frameworks/attica-${KFMIN}:5
+	>=kde-frameworks/kcmutils-${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/ki18n-${KFMIN}:5
+	>=kde-frameworks/kidletime-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kirigami-${KFMIN}:5
+	>=kde-frameworks/kitemmodels-${KFMIN}:5
+	>=kde-frameworks/knewstuff-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	firmware? ( >=sys-apps/fwupd-1.5.0 )
+	flatpak? (
+		>=dev-libs/appstream-0.14.4:=
+		sys-apps/flatpak
+	)
+	telemetry? ( dev-libs/kuserfeedback:5 )
+"
+RDEPEND="${DEPEND}
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+	>=kde-frameworks/kirigami-${KFMIN}:5
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-5.21.90-tests-optional.patch"
+	"${FILESDIR}/${P}-fix-submitting-usefulness.patch"
+)
+
+src_prepare() {
+	ecm_src_prepare
+	# we don't need it with PackageKitBackend off
+	ecm_punt_kf_module Archive
+	# we don't do anything with this
+	sed -e "s/^pkg_check_modules.*RpmOstree/#&/" \
+		-e "s/^pkg_check_modules.*Ostree/#&/" \
+		-i CMakeLists.txt || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_packagekitqt5=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_Snapd=ON
+		-DWITH_KCM=OFF
+		-DBUILD_FlatpakBackend=$(usex flatpak)
+		$(cmake_use_find_package flatpak AppStreamQt)
+		-DBUILD_FwupdBackend=$(usex firmware)
+		$(cmake_use_find_package telemetry KUserFeedback)
+	)
+
+	ecm_src_configure
+}
+
+src_test() {
+	# bug 686392: needs network connection
+	local myctestargs=(
+		-E "(knsbackendtest)"
+	)
+
+	ecm_src_test
+}
diff --git a/kde-plasma/discover/files/discover-5.24.6-fix-submitting-usefulness.patch b/kde-plasma/discover/files/discover-5.24.6-fix-submitting-usefulness.patch
new file mode 100644
index 000000000000..b51df586c540
--- /dev/null
+++ b/kde-plasma/discover/files/discover-5.24.6-fix-submitting-usefulness.patch
@@ -0,0 +1,62 @@
+From e74e0745bf233e02450469632e49a3cb1f416643 Mon Sep 17 00:00:00 2001
+From: Aleix Pol <aleixpol@kde.org>
+Date: Wed, 20 Jul 2022 18:12:08 +0200
+Subject: [PATCH] Fix submitting usefulness
+
+QML was getting the names mixed up somehow
+
+
+(cherry picked from commit 7ab3bfe4ec6a6767aa1410aa448faed77c934069)
+
+(cherry picked from commit 9f06c84d9ecd035c730c8720ad01d2fa8d39848b)
+---
+ discover/qml/ReviewDelegate.qml | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/discover/qml/ReviewDelegate.qml b/discover/qml/ReviewDelegate.qml
+index 15eccda2c..0e04f1882 100644
+--- a/discover/qml/ReviewDelegate.qml
++++ b/discover/qml/ReviewDelegate.qml
+@@ -11,7 +11,7 @@ import org.kde.discover 2.0
+ import org.kde.kirigami 2.14 as Kirigami
+ 
+ Kirigami.AbstractCard {
+-    id: item
++    id: reviewDelegateItem
+     visible: model.shouldShow
+     property bool compact: false
+     property bool separator: true
+@@ -85,10 +85,10 @@ Kirigami.AbstractCard {
+     }
+ 
+     footer: Loader {
+-        active: !item.compact
++        active: !reviewDelegateItem.compact
+         sourceComponent: RowLayout {
+             id: rateTheReviewLayout
+-            visible: !item.compact
++            visible: !reviewDelegateItem.compact
+             Label {
+                 Layout.leftMargin: Kirigami.Units.largeSpacing
+                 visible: usefulnessTotal !== 0
+@@ -117,7 +117,7 @@ Kirigami.AbstractCard {
+                 checked: usefulChoice === ReviewsModel.Yes
+                 onClicked: {
+                     noButton.checked = false
+-                    item.markUseful(true)
++                    reviewDelegateItem.markUseful(true)
+                 }
+             }
+             Button {
+@@ -134,7 +134,7 @@ Kirigami.AbstractCard {
+                 checked: usefulChoice === ReviewsModel.No
+                 onClicked: {
+                     yesButton.checked = false
+-                    item.markUseful(false)
++                    reviewDelegateItem.markUseful(false)
+                 }
+             }
+         }
+-- 
+GitLab
+
diff --git a/kde-plasma/kdeplasma-addons/Manifest b/kde-plasma/kdeplasma-addons/Manifest
index 91488eab6a32..5346e73267f2 100644
--- a/kde-plasma/kdeplasma-addons/Manifest
+++ b/kde-plasma/kdeplasma-addons/Manifest
@@ -1,9 +1,11 @@
 AUX kdeplasma-addons-5.24.5-fix-potd-wallpapers-change-freq-1.patch 1452 BLAKE2B 99ac3c730ce06f5aceca01440c8b6afc5bf5bacd51bca500c424b95aebd74be2d21ec64b2d182815daa58310ebf62eb18686b792d630627250b374ff0174486e SHA512 0f95e4a4849e4c42407fa4400aaf52c64ddc39b66d77565727d50b37416a571ce0e2ce70844bda820a20e45e7c20a6c791255df00bb78ac06bd747d96d83b2a9
 AUX kdeplasma-addons-5.24.5-fix-potd-wallpapers-change-freq-2.patch 1511 BLAKE2B 6d7cb8b130028aaf32a961bb442e9fd9c2a215904f3a801a16283b35afc84b2ca9f9eb87a04193f5d511f687c6a8117409dac9c496875eb0e85dec25e46be4d9 SHA512 3ea620b46fe851ff055b6847c8e91881a7c5fb88a0c013bdd72b7f4649e005e4871fee9a3855e9f00be8b003ddbc6c8479ee49111970b5272ed9984a8fdb8d7d
+AUX kdeplasma-addons-5.24.6-disable-actions-when-comic-is-not-ready.patch 2217 BLAKE2B 54c6a65843d336be4ae73972b5481981ae02b9ccc94ea5625f883e6f0f449036a1b3ca5c75080e6bfdda10c5fdebbe6a90d954795df36398d89f77d340a26e15 SHA512 cdeb7becc61aaa89704cdcf8f94f1792dd8c2fd2f53d3b87113de894786a82bdeb4c49ffa953a516ce5e08a0657ecab043013dd2a3eb06d6487374785d54b428
 DIST kdeplasma-addons-5.24.5.tar.xz 635292 BLAKE2B baadba07cc223ae0dd87718202177c284a8db4efd8538297c456a2623df2b28449bcb0e55aec346a7aa76fe148c72bdf6ba354f1ccd897b8639153e5c31ceaa7 SHA512 de69d14ef6ffb23824bc646c1582cddfcac7334e7543a1414075f3debd8aab46d51d01983617ffec371ad1df703756b5f8d6c38eebb80ad10b6fe4d320747669
 DIST kdeplasma-addons-5.24.6.tar.xz 636712 BLAKE2B 903c829eb1066bdd3cc96f2eb116997eb52c947d821ebd4da57c8e9bf382b844d66af7e86889ccaa9097ab6d0ce77c2daf48dc676dfabb40b0b348047a579cf0 SHA512 61214b8dc316f5dc14940695f45059ae044ff7206c6a37df4211cdc528f1fef9997fc6b256ef7e05b263089d05a9375547b330ee6ba6a623d34847e501bda691
 DIST kdeplasma-addons-5.25.3.tar.xz 665336 BLAKE2B b123816ceb432ab9a7a7e869c0a35f9061d4f53316b8e4f5bcf8c06faea994769555aa504d9b515532f8c1b62503a39d170a3525348bcbdfe4f7ccf28c83f12d SHA512 0f7dc8ce8438995ac58ed4f1953bc91432ebc18540839ffb75e4115c079a22a586789b6a678612ab6abcfc4f299a411a883c34e769bd500b04372e573da9f7db
 EBUILD kdeplasma-addons-5.24.5-r1.ebuild 2003 BLAKE2B b6d3e843ddcea8bfb1164056f5ccb8e687c188ece4f4b103687ec683f9b69935cca482ed3eb98269b3223788b4e87a5e55322e8ad98687dfe76a7cec8395310d SHA512 3cb6cac24611101a47a0dab6d7d3f35700142b261fb67f4584375d2fd423ab35121d836f1973af4121e3a574eb780ff316b6822ea71fc1fcaa48c31c783f8c0b
+EBUILD kdeplasma-addons-5.24.6-r1.ebuild 2021 BLAKE2B acbd57979b58823306466c43f394e8aeaf7a77ae19652e38dbee30a4f2ebc6cee8f50438f696cc3b3ef90bcd008acc541418d554614d769d14138b6c1aa4f47e SHA512 d247af56d7674df1bb9dc385813fc3fc73bd684635f4a4137d48604209e45283191c0745900a639423606a3fdfd8b7ce7e4523ba68f8e35d5e3d38a9b3867874
 EBUILD kdeplasma-addons-5.24.6.ebuild 1926 BLAKE2B 707f8d61b2f6f9cd3a84e015aa63ded7c038cfc2f1a880b197647742b0c8ee40b23c7e6981cc95ac1dd18a787e6639cae876b972e94b3a032b6edee6f3edf5d8 SHA512 17e0eaac2e3339ebcef90aef59c084b0878d2ec194605e9dbc98558a8690c3d0a9d713781c021aaa9dfd905584f168154f33ba53fb3e281fb64bfe25ddc86790
 EBUILD kdeplasma-addons-5.25.3.ebuild 1883 BLAKE2B 31e95e8ad5ef62b7ddbe2569bd334f0e6b0a71496a3ef78063ae8dac65cd724acf3dfedce7acb47a88e69f757e717afa9eddfab12acd72432617b24f13ca8ab2 SHA512 72150e4c17be48d1f76333bc63d024a2456cf0a8bbbad40e8563936fdc217158992093168a02f93dda32231fa77652444885c70cf74486b81fb274a9a5e88c2e
 MISC metadata.xml 534 BLAKE2B 333ea162901ad4e28de1fd55b40d5080a4d3383fa9af09a46363835e312a8ead0fde01ab762b9ab6930263e61ffb56dad2d53ee6167568cf683da48eaf3ad0a2 SHA512 9eb20a5a87713c865d782c8a1e009098e6db4dddf2ac8cdafbce407da995ee258274645445901f1a5c883202faf46dfca0f1dde5edbe45bd89e7509b22bfa0f5
diff --git a/kde-plasma/kdeplasma-addons/files/kdeplasma-addons-5.24.6-disable-actions-when-comic-is-not-ready.patch b/kde-plasma/kdeplasma-addons/files/kdeplasma-addons-5.24.6-disable-actions-when-comic-is-not-ready.patch
new file mode 100644
index 000000000000..0ce0db252c6a
--- /dev/null
+++ b/kde-plasma/kdeplasma-addons/files/kdeplasma-addons-5.24.6-disable-actions-when-comic-is-not-ready.patch
@@ -0,0 +1,71 @@
+From 352ecf9aa151e842f5304b8f4dc1fa7c7689b32f Mon Sep 17 00:00:00 2001
+From: Nicolas Fella <nicolas.fella@gmx.de>
+Date: Wed, 20 Jul 2022 15:00:02 +0200
+Subject: [PATCH] [applets/comic] Disable most context menu actions when comic
+ is not ready
+
+This can be either because the loading failed or is not done yet
+
+In those cases the actions don't make sense and can lead to crashes
+
+BUG: 406991
+(cherry picked from commit 6a0aec81074135c210a2ed11127ef9cfb138dbca)
+---
+ applets/comic/comic.cpp     | 3 +++
+ applets/comic/comicdata.cpp | 1 +
+ applets/comic/comicdata.h   | 6 ++++++
+ 3 files changed, 10 insertions(+)
+
+diff --git a/applets/comic/comic.cpp b/applets/comic/comic.cpp
+index 1ad3e83a4..b4f8154fa 100644
+--- a/applets/comic/comic.cpp
++++ b/applets/comic/comic.cpp
+@@ -495,6 +495,9 @@ void ComicApplet::updateContextMenu()
+ {
+     if (mCurrent.id().isEmpty()) {
+         mActiveComicModel->clear();
++    }
++
++    if (mCurrent.id().isEmpty() || !mCurrent.ready()) {
+         mActionNextNewStripTab->setEnabled(false);
+         mActionGoFirst->setEnabled(false);
+         mActionGoLast->setEnabled(false);
+diff --git a/applets/comic/comicdata.cpp b/applets/comic/comicdata.cpp
+index 52cc57e91..60eb475c9 100644
+--- a/applets/comic/comicdata.cpp
++++ b/applets/comic/comicdata.cpp
+@@ -62,6 +62,7 @@ void ComicData::setData(const Plasma::DataEngine::Data &data)
+         mPrev = data[QStringLiteral("Previous identifier suffix")].toString();
+         mNext = data[QStringLiteral("Next identifier suffix")].toString();
+         mAdditionalText = data[QStringLiteral("Additional text")].toString();
++        mReady = true;
+     }
+ 
+     mWebsiteUrl = data[QStringLiteral("Website Url")].toUrl();
+diff --git a/applets/comic/comicdata.h b/applets/comic/comicdata.h
+index 9c884a291..b5f5ee3a7 100644
+--- a/applets/comic/comicdata.h
++++ b/applets/comic/comicdata.h
+@@ -190,6 +190,11 @@ public:
+         return mMaxStripNum;
+     }
+ 
++    bool ready() const
++    {
++        return mReady;
++    }
++
+     void save();
+ 
+ private:
+@@ -226,6 +231,7 @@ private:
+     bool mScaleComic = false;
+     bool mIsLeftToRight = false;
+     bool mIsTopToBottom = false;
++    bool mReady = false;
+ 
+     KConfigGroup mCfg;
+ };
+-- 
+GitLab
+
diff --git a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.24.6-r1.ebuild b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.24.6-r1.ebuild
new file mode 100644
index 000000000000..0a29de07ad2b
--- /dev/null
+++ b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.24.6-r1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.92.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.4
+VIRTUALX_REQUIRED="test"
+inherit ecm plasma.kde.org optfeature
+
+DESCRIPTION="Extra Plasma applets and engines"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="share webengine"
+
+RESTRICT="test" # bug 727846
+
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/karchive-${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/kdeclarative-${KFMIN}:5
+	>=kde-frameworks/kholidays-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/knewstuff-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/kpackage-${KFMIN}:5
+	>=kde-frameworks/krunner-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/kunitconversion-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/plasma-${KFMIN}:5
+	>=kde-frameworks/sonnet-${KFMIN}:5
+	share? ( >=kde-frameworks/purpose-${KFMIN}:5 )
+	webengine? ( >=dev-qt/qtwebengine-${QTMIN}:5 )
+"
+RDEPEND="${DEPEND}
+	>=dev-qt/qtquickcontrols-${QTMIN}:5
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+	>=kde-plasma/plasma-workspace-${PVCUT}:5
+"
+
+PATCHES=( "${FILESDIR}/${P}-disable-actions-when-comic-is-not-ready.patch" ) # KDE-bug 406991
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package share KF5Purpose)
+		$(cmake_use_find_package webengine Qt5WebEngine)
+	)
+
+	ecm_src_configure
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		optfeature "Disk quota applet" sys-fs/quota
+	fi
+	ecm_pkg_postinst
+}
diff --git a/kde-plasma/kwin/Manifest b/kde-plasma/kwin/Manifest
index 49f0d2a22315..b7bf2d5cc50f 100644
--- a/kde-plasma/kwin/Manifest
+++ b/kde-plasma/kwin/Manifest
@@ -6,10 +6,13 @@ AUX kwin-5.24.5-fix-plasmashell-crash-1.patch 11170 BLAKE2B 0e7877953d8a9c35c4d6
 AUX kwin-5.24.5-fix-plasmashell-crash-2.patch 982 BLAKE2B dbb3bc31d65384ec14164f7af58254482e0c0bcbb31b06386ea1981bb886a220cf0b727aa7b2b963eaa3c44454344801b0c7fcdce7929c2ffddc6bee6e30cdca SHA512 604ccaab296defceb37ed0bffb5ba6e2c40563bbcf8b4fb2d899c0669de5d180a59ca73fb16f8a2e7939f00ba54c2f4daa96d33b99a4543b88957926d574a3fd
 AUX kwin-5.24.5-tabbox-dont-dismiss-popups.patch 1111 BLAKE2B 017199e01456961ece0335f54d42e18162c703868e7a7f95e84ea1440014ceaaed798e7668dbba4e7392492d82171e29d5453a554f669a789eb8b52a15f47c88 SHA512 538b79201b70eaf162ec75a37dcc40c264b5f1021c6a940ab67274c9e33566962053867f11b45f309d1dfe35d30573139419f666333e06bfd4a5d1c08ca97e6a
 AUX kwin-5.24.5-update-device-outputName.patch 959 BLAKE2B c39d0a94210ea82fa4c7292cb29d5fd93aa793d74e3743f23b3a86462a898594e17798a7beb272cd8462e557875560a05ae642463cee78d7d2a35ee0cd11e576 SHA512 fc4ec093ea882b9d73ef11024d4279d566faeee1979a7fb0f8f29c5e89c658f32b89a3f40faee286c428ac95297dde684ceefcc5e0d3276cdd8d512084f02a19
+AUX kwin-5.24.6-emit-rowsChanged.patch 999 BLAKE2B ed3519679b81e56a4c52e7d20b91516cefeaa4c4cdb432795edeb9fb8f98aba0ec720662966a2b9ff764ec3bf5126ab2aafe08a209dac826b30dc0139737cc6b SHA512 f6b865aededd119fed69b19d994604179de0ac69efbbefc300872a396125bb3acd635b2784dd54ab961d517b5752e2520c7e2c701263abbc47c3ca3335d44bb3
+AUX kwin-5.24.6-fix-color-picker.patch 1952 BLAKE2B 36409ce88f6a0ec2a9b561ed33134db8d10c9a1e3f2e936d7a4375d9eef2f6f41c64a3c584187ef8b0e7cbd2b91f0f3248f462bf5093a17108f27722bbdf7afd SHA512 77cc88b24baaadbcd0737a8bd2a8b14f5f2b4f5bd7348553c67d406032ba886720b448691ba9c99c12e1da41f5af31752955caaa43f2f75064816ca4f739b105
 DIST kwin-5.24.5.tar.xz 6453932 BLAKE2B cd042dd8c9168e11bc39d15969c57a97fd5c47b1af3e3a6235cabad166c4925c51541d52f7bf96f3132b3ecfeb91547845d6af3893ab5f31b41df4a926e83993 SHA512 4fad8b39a588a44f89e2640358d8e563047fa889a9bdaf246c1c87d320aa5f5b9d3d6bef702314fb06d2bfe16d0445efe736de60d94b4409f9b5efcdac48d089
 DIST kwin-5.24.6.tar.xz 6464412 BLAKE2B e3dabbac99cb1ad4eab9995987b6070d2ae0c7d24b8745edad51d573f955783ef4dfafa91ef686a9325659b7ff32282f8448c4beca90b8ad357d83d210964008 SHA512 582464134046c672f9dd798a5485eb2ea93c71676ad20aebda60d978d459104e74fe1283cb0e16968216faf53827dc3e47d669d4c977e0fb7a5a4bb408f77eeb
 DIST kwin-5.25.3.tar.xz 6637732 BLAKE2B cf55beeac86ea10b9d422323f34a1a17e3bc2912318b94fbfb8737e444f09ebd736664ff52c814c34149e09f09c5f2cde53d8f5b9c9a0eaa984e8c74b8c033ce SHA512 7f98ec229df26f2beed6f74c17668f15e119642d1922f783ce15ad0a8d3063431bf61f4eac30d779c3e32d740a73f1ec3a57175bb42dbbf8925c28ba2d1c576b
 EBUILD kwin-5.24.5-r2.ebuild 4421 BLAKE2B f9a50bba822c9da8867b4a5cb3fab9c9bab2ab75d93f20f3cfd467672c425fcb6cc9da401f49c444726f7bb3fed7de636c3bc696fffa949c02c133125a4f4311 SHA512 32eec4d57c7525e27ef2c1cd5b0aed37a6eafaf459146ed6170763773f31805a89b9b7d7d8cc9e22230236c9936a21624cf089a0b0f9923c148a73f16cc8359f
+EBUILD kwin-5.24.6-r1.ebuild 4129 BLAKE2B ffa3ab4e3d9d1ec79fb944ffd4767922017a3dd7b45dc4d1be4c94c4f365d725603caec90ea012df75121edb37b2b2d49cb49cd24d164bb8fab69560ed0fe063 SHA512 87ae3718cb7a6dc1f4ac06ed3732ab5b9d29d48f0527c4d1fe2ecf9ec034f514bbd43944435a13cc0913de228137e0457a4e3bb339484685f13c54eb42d99765
 EBUILD kwin-5.24.6.ebuild 4013 BLAKE2B a850a37e5eb679b37ee34edb89e37dee88b602a999a1a2b73ded9ef960b4be6857b94e5315e7b831612eebf7fdeccc7c2cfca2ed25acd681daa223120f20794f SHA512 a899fca29d7d9fcc31b75fe46cc949c0d2dbff1978e3a2062fdcc716181afc89e13450bc2d968212de1216e3d0a5e64e6fb0431398ccd9a6baf45df34e5bb4a1
 EBUILD kwin-5.25.3.ebuild 4181 BLAKE2B eef592139d6af524533aa989206225cd5cfe0c8c82d99188b4af762630e9b0557923fbf114f10fe944ac35d657a35d7bb1103689f55ec747dfefe14a18f9f58c SHA512 1ac7e4dc4227204bc5a3fe082dcf4487712c0d97a669f8dc14856d493681f54e16fb33a652cebf70fe9abed9d0449002cc478896dd6ada5e03c94bd25ead25df
 MISC metadata.xml 505 BLAKE2B 41f9200ff14d77161bb0863065be67315f5459fa8232da5f0cf18aacd8abb15f7e858277a59a219e59f777fbd2d2d1f035c941d1a06e459b01935b70921e678d SHA512 19c2af1c8b56be6989b617adc24fc0a8bc33d4913eecf22a4ecef3c1a2cf2994e814655f3a885a75ad17613af1dc41b6babb5e4375a3e217f0cc5842ba969a29
diff --git a/kde-plasma/kwin/files/kwin-5.24.6-emit-rowsChanged.patch b/kde-plasma/kwin/files/kwin-5.24.6-emit-rowsChanged.patch
new file mode 100644
index 000000000000..79ee3cc547ce
--- /dev/null
+++ b/kde-plasma/kwin/files/kwin-5.24.6-emit-rowsChanged.patch
@@ -0,0 +1,30 @@
+From 4f419afe307f808ab648a6d6c473ff3cd0b9d836 Mon Sep 17 00:00:00 2001
+From: ivan tkachenko <me@ratijas.tk>
+Date: Sun, 10 Jul 2022 15:17:26 +0300
+Subject: [PATCH] [kcm/kwindesktop] Emit rowsChanged signal to fix default
+ state highlighting
+
+Without this, the rowsChanged signal wasn't emitting at startup, so the
+binding `highlight: kcm.desktopsModel.rows !== 2` didn't work correctly.
+
+FIXED-IN: 5.24.7 5.25.3 5.26
+---
+ src/kcmkwin/kwindesktop/desktopsmodel.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/kcmkwin/kwindesktop/desktopsmodel.cpp b/src/kcmkwin/kwindesktop/desktopsmodel.cpp
+index cf147a7981..f8dd8d6260 100644
+--- a/src/kcmkwin/kwindesktop/desktopsmodel.cpp
++++ b/src/kcmkwin/kwindesktop/desktopsmodel.cpp
+@@ -457,6 +457,8 @@ void DesktopsModel::getAllAndConnect(const QDBusMessage &msg)
+         m_names = m_serverSideNames;
+         m_rows = m_serverSideRows;
+         endResetModel();
++
++        Q_EMIT rowsChanged();
+     }
+ 
+     Q_EMIT readyChanged();
+-- 
+GitLab
+
diff --git a/kde-plasma/kwin/files/kwin-5.24.6-fix-color-picker.patch b/kde-plasma/kwin/files/kwin-5.24.6-fix-color-picker.patch
new file mode 100644
index 000000000000..545bc96d0230
--- /dev/null
+++ b/kde-plasma/kwin/files/kwin-5.24.6-fix-color-picker.patch
@@ -0,0 +1,40 @@
+From aa5fc42349052d040f45aca40749edce80ff8f1f Mon Sep 17 00:00:00 2001
+From: ivan tkachenko <me@ratijas.tk>
+Date: Fri, 22 Jul 2022 18:43:45 +0300
+Subject: [PATCH] effects/colorpicker: Fix picking colors
+
+Due to the wrong buffer format, the function failed with
+GL_INVALID_OPERATION error, which was silently ignored by the effect.
+It resulted in the constant phantom color being returned over and over
+again.
+
+Co-Authored-By: David Edmundson <kde@davidedmundson.co.uk>
+BUG: 454974
+FIXED-IN: 5.24.7, 5.25.4, 5.26
+(cherry picked from commit df6331b60aa03e65f146e93d0229cdc6dc956bbd)
+---
+ src/effects/colorpicker/colorpicker.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/effects/colorpicker/colorpicker.cpp b/src/effects/colorpicker/colorpicker.cpp
+index bc60225838..0625b3de47 100644
+--- a/src/effects/colorpicker/colorpicker.cpp
++++ b/src/effects/colorpicker/colorpicker.cpp
+@@ -61,12 +61,12 @@ void ColorPickerEffect::postPaintScreen()
+     effects->postPaintScreen();
+ 
+     if (m_scheduledPosition != QPoint(-1, -1) && (!m_paintedScreen || m_paintedScreen->geometry().contains(m_scheduledPosition))) {
+-        uint8_t data[3];
++        uint8_t data[4];
+         const QRect geo = GLRenderTarget::virtualScreenGeometry();
+         const QPoint screenPosition(m_scheduledPosition.x() - geo.x(), m_scheduledPosition.y() - geo.y());
+         const QPoint texturePosition(screenPosition.x() * GLRenderTarget::virtualScreenScale(), (geo.height() - screenPosition.y()) * GLRenderTarget::virtualScreenScale());
+ 
+-        glReadnPixels(texturePosition.x(), texturePosition.y(), 1, 1, GL_RGB, GL_UNSIGNED_BYTE, 3, data);
++        glReadnPixels(texturePosition.x(), texturePosition.y(), 1, 1, GL_RGBA, GL_UNSIGNED_BYTE, 4, data);
+         QDBusConnection::sessionBus().send(m_replyMessage.createReply(QColor(data[0], data[1], data[2])));
+         m_picking = false;
+         m_scheduledPosition = QPoint(-1, -1);
+-- 
+GitLab
+
diff --git a/kde-plasma/kwin/kwin-5.24.6-r1.ebuild b/kde-plasma/kwin/kwin-5.24.6-r1.ebuild
new file mode 100644
index 000000000000..7c9960a24375
--- /dev/null
+++ b/kde-plasma/kwin/kwin-5.24.6-r1.ebuild
@@ -0,0 +1,138 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="optional"
+ECM_TEST="optional"
+KFMIN=5.92.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.4
+VIRTUALX_REQUIRED="test"
+inherit ecm plasma.kde.org optfeature
+
+DESCRIPTION="Flexible, composited Window Manager for windowing systems on Linux"
+
+LICENSE="GPL-2+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="accessibility caps gles2-only multimedia plasma screencast"
+
+RESTRICT="test"
+
+COMMON_DEPEND="
+	>=dev-libs/libinput-1.19
+	>=dev-libs/wayland-1.2
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5=[gles2-only=,libinput]
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtx11extras-${QTMIN}:5
+	>=kde-frameworks/kactivities-${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/kglobalaccel-${KFMIN}:5=
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kidletime-${KFMIN}:5=
+	>=kde-frameworks/knewstuff-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/kpackage-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+	>=kde-frameworks/kwayland-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5=[X]
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/plasma-${KFMIN}:5
+	>=kde-plasma/breeze-${PVCUT}:5
+	>=kde-plasma/kdecoration-${PVCUT}:5
+	>=kde-plasma/kscreenlocker-${PVCUT}:5
+	>=kde-plasma/kwayland-server-${PVCUT}:5
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/lcms:2
+	media-libs/libepoxy
+	>=media-libs/mesa-21.1[egl(+),gbm(+),wayland,X]
+	virtual/libudev:=
+	x11-libs/libX11
+	x11-libs/libXi
+	x11-libs/libdrm
+	>=x11-libs/libxcb-1.10
+	>=x11-libs/libxkbcommon-0.7.0
+	x11-libs/xcb-util-cursor
+	x11-libs/xcb-util-image
+	x11-libs/xcb-util-keysyms
+	x11-libs/xcb-util-wm
+	accessibility? ( media-libs/libqaccessibilityclient:5 )
+	caps? ( sys-libs/libcap )
+	gles2-only? ( media-libs/mesa[gles2] )
+	plasma? ( >=kde-frameworks/krunner-${KFMIN}:5 )
+	screencast? ( >=media-video/pipewire-0.3:= )
+"
+RDEPEND="${COMMON_DEPEND}
+	>=dev-qt/qtquickcontrols-${QTMIN}:5
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+	>=dev-qt/qtvirtualkeyboard-${QTMIN}:5
+	>=kde-frameworks/kirigami-${KFMIN}:5
+	>=kde-frameworks/kitemmodels-${KFMIN}:5[qml]
+	sys-apps/hwdata
+	x11-base/xwayland
+	multimedia? ( >=dev-qt/qtmultimedia-${QTMIN}:5[gstreamer,qml] )
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-qt/designer-${QTMIN}:5
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+	x11-base/xorg-proto
+	test? (
+		dev-libs/plasma-wayland-protocols
+		>=dev-libs/wayland-protocols-1.19
+	)
+"
+BDEPEND="test? ( >=dev-qt/qtwaylandscanner-${QTMIN}:5 )"
+PDEPEND=">=kde-plasma/kde-cli-tools-${PVCUT}:5"
+
+PATCHES=(
+	"${FILESDIR}/${P}-emit-rowsChanged.patch"
+	"${FILESDIR}/${P}-fix-color-picker.patch" # KDE-bug 454974
+)
+
+src_prepare() {
+	ecm_src_prepare
+	use multimedia || eapply "${FILESDIR}/${PN}-5.21.80-gstreamer-optional.patch"
+
+	# TODO: try to get a build switch upstreamed
+	if ! use screencast; then
+		sed -e "s/^pkg_check_modules.*PipeWire/#&/" -i CMakeLists.txt || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package accessibility QAccessibilityClient)
+		$(cmake_use_find_package caps Libcap)
+		$(cmake_use_find_package plasma KF5Runner)
+	)
+
+	ecm_src_configure
+}
+
+pkg_postinst() {
+	ecm_pkg_postinst
+	optfeature "color management support" x11-misc/colord
+	elog
+	elog "In Plasma 5.20, default behavior of the Task Switcher to move minimised"
+	elog "windows to the end of the list was changed so that it remains in the"
+	elog "original order. To revert to the well established behavior:"
+	elog
+	elog " - Edit ~/.config/kwinrc"
+	elog " - Find [TabBox] section"
+	elog " - Add \"MoveMinimizedWindowsToEndOfTabBoxFocusChain=true\""
+}