7 files changed, 168 insertions, 7 deletions
diff --git a/kde-plasma/kscreen/Manifest b/kde-plasma/kscreen/Manifest
index 5535ba3f0a82..5a46cc1471cb 100644
--- a/kde-plasma/kscreen/Manifest
+++ b/kde-plasma/kscreen/Manifest
@@ -1,5 +1,9 @@
-DIST kscreen-5.24.4.tar.xz 137288 BLAKE2B 9cb6efcb1ac2d8fffbee75c5f486f0f19bcd793bd4b9ada2020fe3b835ba92f797eea59fbe94e891136e67de2f6d1bc9024dce68a326fe243eb3a81427018482 SHA512 d3a395a92a4569aed3dc69b8a5b90be5fca30d7348f148161a6eed71ab882c2ca3066cadf8edb41111e8ad4cea97ca39563e34acca760fe24012b2036e6ad63b
+AUX kscreen-5.24.5-fix-connect-ext-monitors-when-a-monitor-is-rotated.patch 1083 BLAKE2B bf328a411422ac4b0e1dad704c0faadcf867710595c9e29fc09ea7a336fc453d38e55eb3e24803cc1ffe9432b59985e87737eb5756565e3358a03a14ac7c02ca SHA512 c0290233ceb525f4c8d4c2698577c224c7a9196407673d119d6d3529fd308c3159ebec5e6067109133c6cac54ca1bf0bb6e3023e72757e05ec6704d76247ad17
+AUX kscreen-5.24.5-fix-kded-xcb-resources-leak.patch 1907 BLAKE2B 3d35c3f3b0bf5d2d3ded94ab09b7e0083677b20d1c627f29392dd4aec7cda8f39d2673fbe3f426689c2091e989e9cd4173c08020cf08a0dccbb910d5135d3010 SHA512 5290909d402845c51b3b5556fece12c769f8e2353014001c6f7ac411a05e044bea8fc3f8d4f15780890e620547080835177a206031e69f41598d92bda8bf6a2f
+AUX kscreen-5.24.5-kcm-fix-choosing-refresh-rate.patch 903 BLAKE2B 73e08bf9843f51be102eb4f3057641fde12df955aab01c9997a34a66e6bb673277f1fe0fcdd21fa6d7b3a83faa6e2c12288c06e659f82482190c8552ec3f761f SHA512 67aeb93bafb4a13bd7d19356338c86fd5e1df07cb1ac030d6b1f81d9d683f52ff036c5c4eba0c9ce1599c9273c0ea769b2add3516ced4b2128dbdd4b7c07fb7b
+AUX kscreen-5.24.5-kcm-fix-refresh-rate-list-not-updated.patch 1080 BLAKE2B 7ff3fc46e9644635f59541ebf063cdc153010f09c1fa7b90ca92140fba1e0805e9991042c788454662d7ae9917ecf3f10a25e6c2dcdc704945f91071d24adf66 SHA512 61aee0523a65f2ef448c7998df0fce82f1dd91d241c4c922c86468873ff69873852b31682cd2c531285312316cb25ad21da318c0cfe78ab07e7bc60cf9b4be08
 DIST kscreen-5.24.5.tar.xz 137332 BLAKE2B ef48b057356ed1df376cd5a64384ea1f184b78e8da1d0712287342cba41eb9bad99216bc8e9f8d52d5e080798436124bd39f2bff71c4a25ba28c8d8e10fd0a59 SHA512 770dfb968f8f8bf96b6ad3bf71f18f5baca35b2a4daa72b8806957ad1e050003158319edba84ebf999134e106ef916d829d391c33d79c58edb1000f503f67c97
-EBUILD kscreen-5.24.4.ebuild 1230 BLAKE2B 4c8021d9f5cbbe8dbdf1f433b19753d2e2dc5ee383e69eb65c45ef3ae0b7110232aa607a62110a1e58ff1bdc71b38e9b214b06dbe7d970e2f39c5d039d1b009f SHA512 5f1c3737fb0e7675a60410b464839552fdf829d8a3f1491460e5c828a1bb7cbcd3320354b11de079221391030bb7d069de735f63340145c7830505435130198f
-EBUILD kscreen-5.24.5.ebuild 1233 BLAKE2B f8ba4006e16978b21a90845edc7599e7535b0d2f8f55aad9f88cdd068efa63a08272dbf221f776cb2eedfda5cf1e148414343ef3f28cab3a97ab4e56122c3396 SHA512 4d705ca2881183b69089716cb9cb9c4589bc35b72daaaaaed03fc6bc4139823c9a216d9cc64c2d0f429ca899ce49656eb0e64d81b16cde82b5eb3ad55ab38408
+DIST kscreen-5.25.2.tar.xz 142956 BLAKE2B b1c14a95eb8780549baa3134c34e3519a482ec1c83fee265bf3847a5eda681c20ea6c6dc38da0af0a7bae499c4013903b8d0cee3e75621d8c117de6316d06561 SHA512 377580c04a1f6765c921dfc421b569434c976daf043bfcbaafad6006336e8de45d6340872f1bf8de9f55e40077f6eda50cd913b37f470d2568a278766086891f
+EBUILD kscreen-5.24.5-r2.ebuild 1528 BLAKE2B ace7d67710871e63c9d083479390739a3876ddeaafacda2c63ba3ba6858e9274e52c72ed572e00070b3c17107e15f47bc693be02dffd808831843f78c2396db3 SHA512 9cfc8ef539b65894036df188c969c15dd1ab26fc50fa59951c79b0ee4b2d62a386b067192d5a3b367e3cecf4384acfe2deaa83d52a6b771af2a9a6dd20bc72cb
+EBUILD kscreen-5.25.2.ebuild 1257 BLAKE2B b081f78ac079439be7e4f3f8048aab607fea04d9c21a670b6cbd25d16fed0129d3ed3d52bdd35dc4f34299522eb60ec2e92cde24931cf42e1022e9eb24aef2c1 SHA512 221c0df8783fd0ecfd7780e63865eba4ac7549980440b1cbbc030bf5fbf5142e0eab541f58dd5386247f94b1962cc60181ce7893a7932932906e6df654d76927
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/kscreen/files/kscreen-5.24.5-fix-connect-ext-monitors-when-a-monitor-is-rotated.patch b/kde-plasma/kscreen/files/kscreen-5.24.5-fix-connect-ext-monitors-when-a-monitor-is-rotated.patch
new file mode 100644
index 000000000000..d2efce69b9e5
--- /dev/null
+++ b/kde-plasma/kscreen/files/kscreen-5.24.5-fix-connect-ext-monitors-when-a-monitor-is-rotated.patch
@@ -0,0 +1,31 @@
+From ff8dc215e8d2691fcf41d0bb305f820531d95150 Mon Sep 17 00:00:00 2001
+From: Aleix Pol <aleixpol@kde.org>
+Date: Sat, 14 May 2022 01:29:01 +0200
+Subject: [PATCH] Fix connecting external monitors when a monitor is rotated
+
+It would be placed right by the unrotated geometry and after rotating it
+the new output would end up floating in the logical space.
+This happened because the explicitLogicalSize is cached and needs
+updating after changing its settings.
+
+
+(cherry picked from commit cc832fd4296440fcd9298cb03b0cc736a99ed8bb)
+---
+ kded/generator.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/kded/generator.cpp b/kded/generator.cpp
+index e5117a9..e311b04 100644
+--- a/kded/generator.cpp
++++ b/kded/generator.cpp
+@@ -85,6 +85,7 @@ KScreen::ConfigPtr Generator::idealConfig(const KScreen::ConfigPtr &currentConfi
+ 
+     for (const auto &output : connectedOutputs) {
+         initializeOutput(output, config->supportedFeatures());
++        output->setExplicitLogicalSize(config->logicalSizeForOutput(*output));
+     }
+ 
+     if (connectedOutputs.count() == 1) {
+-- 
+GitLab
+
diff --git a/kde-plasma/kscreen/files/kscreen-5.24.5-fix-kded-xcb-resources-leak.patch b/kde-plasma/kscreen/files/kscreen-5.24.5-fix-kded-xcb-resources-leak.patch
new file mode 100644
index 000000000000..ecba1664c51c
--- /dev/null
+++ b/kde-plasma/kscreen/files/kscreen-5.24.5-fix-kded-xcb-resources-leak.patch
@@ -0,0 +1,61 @@
+From 93cfd297506e4106a7b6e7bcc649442c5bf0f7d1 Mon Sep 17 00:00:00 2001
+From: Stefan Becker <chemobejk@gmail.com>
+Date: Sun, 29 May 2022 23:33:55 +0300
+Subject: [PATCH] X11: fix kded xcb resource leak
+
+This fixes commit 579358f501ae978aa527a25eb3ef9dd42557db46
+
+XOpenDisplay() internally calls xcb_connect(), creating a new XCB client
+connection. This means that on every KScreen configuration change event
+the kded5 process creates a new connection until XCB runs into the hard
+limit of 256 of clients, leading to the dreaded "Maximum number of
+clients reached" error.
+
+Re-use the display from QX11Info instead of calling XOpenDisplay().
+
+BUG: 453280
+
+
+(cherry picked from commit 0270a49328aa70b14dd08e2ed5a425ca3f8e4fd5)
+---
+ kded/daemon.cpp | 17 ++++++++---------
+ 1 file changed, 8 insertions(+), 9 deletions(-)
+
+diff --git a/kded/daemon.cpp b/kded/daemon.cpp
+index e8ed4ac..443d98d 100644
+--- a/kded/daemon.cpp
++++ b/kded/daemon.cpp
+@@ -361,6 +361,14 @@ void KScreenDaemon::alignX11TouchScreen()
+     if (qGuiApp->platformName() != QStringLiteral("xcb")) {
+         return;
+     }
++    auto *display = QX11Info::display();
++    if (!display) {
++        return;
++    }
++    auto *connection = QX11Info::connection();
++    if (!connection) {
++        return;
++    }
+ 
+     const QRect totalRect(QPoint(0, 0), m_monitoredConfig->data()->screen()->currentSize());
+     QRect internalOutputRect;
+@@ -411,15 +419,6 @@ void KScreenDaemon::alignX11TouchScreen()
+         break;
+     }
+ 
+-    auto *display = XOpenDisplay(nullptr);
+-    if (!display) {
+-        return;
+-    }
+-    auto *connection = QX11Info::connection();
+-    if (!connection) {
+-        return;
+-    }
+-
+     auto getAtom = [](xcb_connection_t *connection, const char *name) {
+         auto cookie = xcb_intern_atom(connection, true, strlen(name), name);
+         auto reply = xcb_intern_atom_reply(connection, cookie, nullptr);
+-- 
+GitLab
+
diff --git a/kde-plasma/kscreen/files/kscreen-5.24.5-kcm-fix-choosing-refresh-rate.patch b/kde-plasma/kscreen/files/kscreen-5.24.5-kcm-fix-choosing-refresh-rate.patch
new file mode 100644
index 000000000000..2d0d3ba1e851
--- /dev/null
+++ b/kde-plasma/kscreen/files/kscreen-5.24.5-kcm-fix-choosing-refresh-rate.patch
@@ -0,0 +1,28 @@
+From 6ecb832923612820c721f58d1d12dd176e10528a Mon Sep 17 00:00:00 2001
+From: Xaver Hugl <xaver.hugl@gmail.com>
+Date: Thu, 5 May 2022 18:27:38 +0200
+Subject: [PATCH] kcm: fix choosing the refresh rate
+
+It always chose the last one, and not the highest one
+
+
+(cherry picked from commit 5e1be88dbe6e5160dcc232631df81d9bdc9d179e)
+---
+ kcm/output_model.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/kcm/output_model.cpp b/kcm/output_model.cpp
+index 92e4ea3..3672b49 100644
+--- a/kcm/output_model.cpp
++++ b/kcm/output_model.cpp
+@@ -394,6 +394,7 @@ bool OutputModel::setResolution(int outputIndex, int resIndex)
+         auto it = modes.begin();
+         while (it != modes.end()) {
+             if ((*it)->size() == size && (*it)->refreshRate() > bestRefreshRate) {
++                bestRefreshRate = (*it)->refreshRate();
+                 modeIt = it;
+             }
+             it++;
+-- 
+GitLab
+
diff --git a/kde-plasma/kscreen/files/kscreen-5.24.5-kcm-fix-refresh-rate-list-not-updated.patch b/kde-plasma/kscreen/files/kscreen-5.24.5-kcm-fix-refresh-rate-list-not-updated.patch
new file mode 100644
index 000000000000..e7d85fd87013
--- /dev/null
+++ b/kde-plasma/kscreen/files/kscreen-5.24.5-kcm-fix-refresh-rate-list-not-updated.patch
@@ -0,0 +1,29 @@
+From 584ed8a067a7c0329e1572dd9970b6e3dae6a56f Mon Sep 17 00:00:00 2001
+From: Xaver Hugl <xaver.hugl@gmail.com>
+Date: Thu, 5 May 2022 18:22:46 +0200
+Subject: [PATCH] kcm: fix refresh rate list not being updated
+
+BUG: 453392
+
+
+(cherry picked from commit 8c1e2cffda762fef83ea48658a08847382c71486)
+---
+ kcm/output_model.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/kcm/output_model.cpp b/kcm/output_model.cpp
+index fcdb738..92e4ea3 100644
+--- a/kcm/output_model.cpp
++++ b/kcm/output_model.cpp
+@@ -417,7 +417,7 @@ bool OutputModel::setResolution(int outputIndex, int resIndex)
+     QModelIndex index = createIndex(outputIndex, 0);
+     // Calling this directly ignores possible optimization when the
+     // refresh rate hasn't changed in fact. But that's ok.
+-    Q_EMIT dataChanged(index, index, {ResolutionIndexRole, ResolutionRole, SizeRole, RefreshRateIndexRole});
++    Q_EMIT dataChanged(index, index, {ResolutionIndexRole, ResolutionRole, SizeRole, RefreshRatesRole, RefreshRateIndexRole});
+     Q_EMIT sizeChanged();
+     return true;
+ }
+-- 
+GitLab
+
diff --git a/kde-plasma/kscreen/kscreen-5.24.5.ebuild b/kde-plasma/kscreen/kscreen-5.24.5-r2.ebuild
index c92a7debe6b5..f4e86614ad8d 100644
--- a/kde-plasma/kscreen/kscreen-5.24.5.ebuild
+++ b/kde-plasma/kscreen/kscreen-5.24.5-r2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://invent.kde.org/plasma/kscreen"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE=""
 
 # bug #580440, last checked 5.6.3
@@ -44,3 +44,10 @@ RDEPEND="${DEPEND}
 	>=dev-qt/qtgraphicaleffects-${QTMIN}:5
 	>=kde-plasma/kde-cli-tools-${PVCUT}:5
 "
+
+PATCHES=(
+	"${FILESDIR}/${P}-kcm-fix-refresh-rate-list-not-updated.patch" # KDE-bug 453392
+	"${FILESDIR}/${P}-kcm-fix-choosing-refresh-rate.patch"
+	"${FILESDIR}/${P}-fix-connect-ext-monitors-when-a-monitor-is-rotated.patch"
+	"${FILESDIR}/${P}-fix-kded-xcb-resources-leak.patch" # KDE-bug 453280
+)
diff --git a/kde-plasma/kscreen/kscreen-5.24.4.ebuild b/kde-plasma/kscreen/kscreen-5.25.2.ebuild
index 631a5b4e57a0..4bfa5020633f 100644
--- a/kde-plasma/kscreen/kscreen-5.24.4.ebuild
+++ b/kde-plasma/kscreen/kscreen-5.25.2.ebuild
@@ -4,9 +4,9 @@
 EAPI=8
 
 ECM_TEST="forceoptional"
-KFMIN=5.90.0
+KFMIN=5.94.0
 PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
+QTMIN=5.15.4
 inherit ecm kde.org
 
 DESCRIPTION="KDE Plasma screen management"
@@ -14,7 +14,7 @@ HOMEPAGE="https://invent.kde.org/plasma/kscreen"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE=""
 
 # bug #580440, last checked 5.6.3
@@ -39,6 +39,7 @@ DEPEND="
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
 	>=kde-frameworks/plasma-${KFMIN}:5
 	>=kde-plasma/libkscreen-${PVCUT}:5
+	x11-libs/libX11
 "
 RDEPEND="${DEPEND}
 	>=dev-qt/qtgraphicaleffects-${QTMIN}:5