gentoo resync : 29.12.2022

8 files changed, 51 insertions, 337 deletions

diff --git a/kde-plasma/kwayland-server/Manifest b/kde-plasma/kwayland-server/Manifest
index 44bf0d75ebb4..7c6e29f25abf 100644
--- a/kde-plasma/kwayland-server/Manifest
+++ b/kde-plasma/kwayland-server/Manifest
@@ -1,9 +1,4 @@
-AUX kwayland-server-5.24.4-fix-crash-on-screen-setup-change.patch 4276 BLAKE2B 4620ba8b9469fb04e83feb0e6c898f3015652859878e238c8e5fad6390eda2d047d56e65f62748f13cd446abe39f127496d823216a314f8185ecdd1eed0a8700 SHA512 431b3da95dcd79b38deeff2b111e60af9b5c28ebedca682804572b79835840ce967e7125367c97b85bebf7001591df3dd7cd381cfe6ad6cd7b13a279be18f4b6
-AUX kwayland-server-5.24.4-fix-layer-shell-reset.patch 1974 BLAKE2B 16041ba840f43e137ed2143c7d0abb0a2b70cee49ab6e2a8d3e077382a09837c47dd68a5285ee4400b9c21860db203ee5604f297ed567d9b3ca1237f1351435f SHA512 89f000937a3b7aaa366043948200ea8fa01e70cdcfd42e499c7dd10097486dbd36852ac702cc79a9d5f7d8d643cea8de4a23f3bf2f600a266e6edb96fd569d92
-AUX kwayland-server-5.24.4-fix-race-in-wp_drm_lease_v1.patch 2774 BLAKE2B 87e647c2404fa778967bd26ce5d6e8964f29d11417ab742694d31c35e0b9fed4f8f22f2c4353e6464231366cbc320cdb5a62d29e782526b212691b726c8f6285 SHA512 f11c0925df3a90c72a7d867129e09c2ad747d9c294f7704acdd144f97ac55ec436b9d1ce70f6fc0683baf40b6293cb203a0819cb9b86ec166e77d5124e6e288a
-AUX kwayland-server-5.24.4-guard-subsurface-parent-access.patch 1324 BLAKE2B 60d40a919cc68c340e7e67e4dc0701fddaa375fde87f4feacc03c97c1a3fb9c7b3b9f981a4363db9759af45e0bc136162cf7490035d79b82b2357a2412547872 SHA512 449f3c5f7ff7826110307f7d5938bf8bdc132d9057f39764d39fedd2487877bf1611502ba983e5723ee94e4cea18732b9162587f6567d042e74becd22de20e4c
-DIST kwayland-server-5.24.4.tar.xz 221412 BLAKE2B efc970b7f7d99e5195e74a71480039b6a6de15d23f4af9ea776a5b4f45494d8323fee8729e8b2633ed0e25167c99c2a73b63f08ce4e1cdd75d0870258e8d65ea SHA512 9281261b96ceccfb59b1d4eef247572424a196951cf927ae2d65eb6153cb0a9409059e789c7479ef04d8df750c109abfe202395a0a1f49010c40b1190cc2e640
+AUX kwayland-server-5.24.5-fix-supported-action-init.patch 2129 BLAKE2B b9e701a6dff6fd37aef7d30977af95d64de1c508aea5ce94d2c3c3c3a725c60a843945b6cc1779250f5ddfabe05d9921d1b42e17b8b220eea2bbf67e065ac408 SHA512 8369e5007c90fa714adf93c3ccbcd92955b2a8851b4fe46377faafa392e4306014b1e53400fa682aca779cd4577b403e50902e292f3d2263b4b2e94fdded3dd0
 DIST kwayland-server-5.24.5.tar.xz 221388 BLAKE2B 38a1e66c1290c32db10a6818b10e57097fef70ac376797e272c329e9a49556bf423da4a731e46718bf39a30131def4adf90f1742589425ad040bc125c84fcffa SHA512 72159618a22233b9b49cab8ee1a804f629763e903a2e711c8c23f990544d79b5d27e768c33f8d844c916e41a6d3a2af5ddcab69d0448569adc247e0f737975f5
-EBUILD kwayland-server-5.24.4-r2.ebuild 1145 BLAKE2B 4ab94886b75eeb9e36fb5d15c37679f8e3abb98cb884e550b194a6af1dabb191eddd391abbda415135b1883994c9c4fdbcd03495c8eb70378baf6c46ffbd1a93 SHA512 5717c3b13a6e7b66ab49fe8ecca55e84bb3fc36c4ef44fb8d897774d05e2cec1229e6a5154a571a1ef17ef6b12236d9122a4e6f315adbb7e0f4d0a520c629785
-EBUILD kwayland-server-5.24.5.ebuild 866 BLAKE2B 3d0f678c7c1310a6c06d53815f34c5524c4ec5b360e85538cb7ddd2c7584d2a9bc8688c50e9f012b5e0f04cd16cfe0ccd1b6672d31d2c8108ad5e339b4982b70 SHA512 792a21c04b93b649d2ca33eb4a9ece80c7b3b7ffc6d5ce183c67c32ef34889faffced3a630dac216bd414c00925437e7d000d80cfae9a437dbddc97589d136b6
+EBUILD kwayland-server-5.24.5-r1.ebuild 928 BLAKE2B 141781ecad6b2ba5f0859b54fe97a59efce2f95c345bb9c709ed342608342b0270ab605a66bb0c271decfe5c05f3e69541069ca4ddf67069c448d1794af9871a SHA512 70ee7b463b76f15d4662110e628eb04c48a7c6c8eea600e7dafa87c9721c6ece1cfc4112f68029a45650caba91f482e10b97767b5861d5426ebb752bbfb4bcaa
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/kwayland-server/files/kwayland-server-5.24.4-fix-crash-on-screen-setup-change.patch b/kde-plasma/kwayland-server/files/kwayland-server-5.24.4-fix-crash-on-screen-setup-change.patch
deleted file mode 100644
index 4ddd9737e759..000000000000
--- a/kde-plasma/kwayland-server/files/kwayland-server-5.24.4-fix-crash-on-screen-setup-change.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-From 40364d2ee670a5a74318ef96c643762293ca95f0 Mon Sep 17 00:00:00 2001
-From: Vlad Zahorodnii <vlad.zahorodnii@kde.org>
-Date: Fri, 8 Apr 2022 12:44:33 +0300
-Subject: [PATCH] Simplify code that announces available modes and current mode
-
-If no mode has the current flag set, the first mode object will be
-announced twice.
-
-There's also no benefit from sending the current mode as last. If the
-current mode changes, the compositor will send the current_mode event,
-not the mode event.
-
-BUG: 452318
-
-
-(cherry picked from commit b40c4e3f4108b9a0be9b4f5d437e72f7c2aa3fea)
----
- src/server/outputdevice_v2_interface.cpp | 35 ++++++++----------------
- 1 file changed, 11 insertions(+), 24 deletions(-)
-
-diff --git a/src/server/outputdevice_v2_interface.cpp b/src/server/outputdevice_v2_interface.cpp
-index 31ab16ca..9093bd2f 100644
---- a/src/server/outputdevice_v2_interface.cpp
-+++ b/src/server/outputdevice_v2_interface.cpp
-@@ -31,7 +31,7 @@ public:
- 
-     void sendGeometry(Resource *resource);
-     wl_resource *sendNewMode(Resource *resource, OutputDeviceModeV2Interface *mode);
--    void sendCurrentMode(Resource *resource, OutputDeviceModeV2Interface *mode);
-+    void sendCurrentMode(Resource *resource);
-     void sendDone(Resource *resource);
-     void sendUuid(Resource *resource);
-     void sendEdid(Resource *resource);
-@@ -180,7 +180,7 @@ void OutputDeviceV2Interface::setCurrentMode(OutputDeviceModeV2Interface *mode)
-     const auto clientResources = d->resourceMap();
-     for (auto it = clientResources.begin(); it != clientResources.end(); ++it) {
-         auto resource = *it;
--        d->sendCurrentMode(resource, d->currentMode);
-+        d->sendCurrentMode(resource);
-         d->sendDone(resource);
-     }
-     d->updateGeometry();
-@@ -257,22 +257,10 @@ void OutputDeviceV2InterfacePrivate::kde_output_device_v2_bind_resource(Resource
-     sendName(resource);
-     sendSerialNumber(resource);
- 
--    auto currentModeIt = modes.end();
--    for (auto it = modes.begin(); it != modes.end(); ++it) {
--        auto &mode = *it;
--        if (mode->flags().testFlag(OutputDeviceModeV2Interface::ModeFlag::Current)) {
--            // needs to be sent as last mode
--            currentModeIt = it;
--            continue;
--        }
-+    for (OutputDeviceModeV2Interface *mode : std::as_const(modes)) {
-         sendNewMode(resource, mode);
-     }
--
--    if (currentModeIt != modes.end()) {
--        auto modeResource = sendNewMode(resource, *currentModeIt);
--        send_current_mode(resource->handle, modeResource);
--    }
--
-+    sendCurrentMode(resource);
-     sendUuid(resource);
-     sendEdid(resource);
-     sendEnabled(resource);
-@@ -296,9 +284,9 @@ wl_resource *OutputDeviceV2InterfacePrivate::sendNewMode(Resource *resource, Out
-     return modeResource->handle;
- }
- 
--void OutputDeviceV2InterfacePrivate::sendCurrentMode(Resource *outputResource, OutputDeviceModeV2Interface *mode)
-+void OutputDeviceV2InterfacePrivate::sendCurrentMode(Resource *outputResource)
- {
--    const auto modeResource = OutputDeviceModeV2InterfacePrivate::get(mode)->findResource(outputResource);
-+    const auto modeResource = OutputDeviceModeV2InterfacePrivate::get(currentMode)->findResource(outputResource);
-     send_current_mode(outputResource->handle, modeResource->handle);
- }
- 
-@@ -506,12 +494,12 @@ void OutputDeviceV2Interface::setModes(const QList<OutputDeviceModeV2Interface *
-         d->modes << outputDeviceMode;
-         outputDeviceMode->setParent(this);
- 
-+        for (auto resource : clientResources) {
-+            d->sendNewMode(resource, outputDeviceMode);
-+        }
-+
-         if (outputDeviceMode->flags().testFlag(OutputDeviceModeV2Interface::ModeFlag::Current)) {
-             d->currentMode = outputDeviceMode;
--        } else {
--            for (auto resource : clientResources) {
--                d->sendNewMode(resource, outputDeviceMode);
--            }
-         }
-     }
- 
-@@ -520,8 +508,7 @@ void OutputDeviceV2Interface::setModes(const QList<OutputDeviceModeV2Interface *
-     }
- 
-     for (auto resource : clientResources) {
--        d->sendNewMode(resource, d->currentMode);
--        d->sendCurrentMode(resource, d->currentMode);
-+        d->sendCurrentMode(resource);
-     }
- 
-     qDeleteAll(oldModes.crbegin(), oldModes.crend());
--- 
-GitLab
-
diff --git a/kde-plasma/kwayland-server/files/kwayland-server-5.24.4-fix-layer-shell-reset.patch b/kde-plasma/kwayland-server/files/kwayland-server-5.24.4-fix-layer-shell-reset.patch
deleted file mode 100644
index a3a0b2067f5d..000000000000
--- a/kde-plasma/kwayland-server/files/kwayland-server-5.24.4-fix-layer-shell-reset.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 97df88c6c8af925382bb1f59b7c6ad75f28142a0 Mon Sep 17 00:00:00 2001
-From: David Edmundson <kde@davidedmundson.co.uk>
-Date: Tue, 5 Apr 2022 13:26:26 +0100
-Subject: [PATCH] Fix layer shell reset
-
-In the current form any client committing multiple times without
-attaching a buffer would unset the cached state and trigger an error.
-
-It's legal (though weird) to commit multiple times before attaching a
-buffer.
-
-We should only reset the state if we commit an empty buffer after having
-committed an existing buffer. This brings us in line with XdgShell.
-
-
-(cherry picked from commit a5c55b68589a8771cde0bf4ce552702da6fca41c)
----
- src/server/layershell_v1_interface.cpp | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/src/server/layershell_v1_interface.cpp b/src/server/layershell_v1_interface.cpp
-index 17086334..19fcd68e 100644
---- a/src/server/layershell_v1_interface.cpp
-+++ b/src/server/layershell_v1_interface.cpp
-@@ -69,6 +69,7 @@ public:
-     bool isClosed = false;
-     bool isConfigured = false;
-     bool isCommitted = false;
-+    bool firstBufferAttached = false;
- 
- protected:
-     void zwlr_layer_surface_v1_destroy_resource(Resource *resource) override;
-@@ -290,8 +291,10 @@ void LayerSurfaceV1InterfacePrivate::commit()
-         return;
-     }
- 
--    if (!surface->isMapped() && isCommitted) {
-+    // detect reset
-+    if (!surface->isMapped() && firstBufferAttached) {
-         isCommitted = false;
-+        firstBufferAttached = false;
-         isConfigured = false;
- 
-         current = LayerSurfaceV1State();
-@@ -303,6 +306,9 @@ void LayerSurfaceV1InterfacePrivate::commit()
-     const LayerSurfaceV1State previous = std::exchange(current, pending);
- 
-     isCommitted = true; // Must set the committed state before emitting any signals.
-+    if (surface->isMapped()) {
-+        firstBufferAttached = true;
-+    }
- 
-     if (previous.acceptsFocus != current.acceptsFocus) {
-         Q_EMIT q->acceptsFocusChanged();
--- 
-GitLab
-
diff --git a/kde-plasma/kwayland-server/files/kwayland-server-5.24.4-fix-race-in-wp_drm_lease_v1.patch b/kde-plasma/kwayland-server/files/kwayland-server-5.24.4-fix-race-in-wp_drm_lease_v1.patch
deleted file mode 100644
index 1799a711b472..000000000000
--- a/kde-plasma/kwayland-server/files/kwayland-server-5.24.4-fix-race-in-wp_drm_lease_v1.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From dc09ce85f00b3a790e2817888067c3826280dd8e Mon Sep 17 00:00:00 2001
-From: Weng Xuetian <wengxt@gmail.com>
-Date: Sat, 16 Apr 2022 00:01:12 -0700
-Subject: [PATCH] Fix race in wp_drm_lease_v1.
-
-Basically this is a well known issue in wayland for globals. If bind
-comes after destroyed, it will raise a invalid global error. The common
-practice is to delay the destroy of global. Similar technique is also
-applied to wl_output.
-
-CCBUG: 452435
-(cherry picked from commit cdc9dcfb0a1f0445c46ee2cefa114329a2408555)
----
- src/server/drmleasedevice_v1_interface.cpp | 14 +++++---------
- src/server/drmleasedevice_v1_interface_p.h |  2 +-
- 2 files changed, 6 insertions(+), 10 deletions(-)
-
-diff --git a/src/server/drmleasedevice_v1_interface.cpp b/src/server/drmleasedevice_v1_interface.cpp
-index bffd22cd..7e338022 100644
---- a/src/server/drmleasedevice_v1_interface.cpp
-+++ b/src/server/drmleasedevice_v1_interface.cpp
-@@ -84,10 +84,6 @@ void DrmLeaseDeviceV1InterfacePrivate::remove()
-         request->connectors.clear();
-     }
-     globalRemove();
--    removed = true;
--    if (resourceMap().isEmpty()) {
--        delete this;
--    }
- }
- 
- void DrmLeaseDeviceV1InterfacePrivate::registerConnector(DrmLeaseConnectorV1Interface *connector)
-@@ -144,6 +140,9 @@ void DrmLeaseDeviceV1InterfacePrivate::wp_drm_lease_device_v1_release(Resource *
- 
- void DrmLeaseDeviceV1InterfacePrivate::wp_drm_lease_device_v1_bind_resource(Resource *resource)
- {
-+    if (isGlobalRemoved()) {
-+        return;
-+    }
-     if (!hasDrmMaster) {
-         pendingFds << resource->handle;
-         return;
-@@ -161,12 +160,9 @@ void DrmLeaseDeviceV1InterfacePrivate::wp_drm_lease_device_v1_bind_resource(Reso
-     }
- }
- 
--void DrmLeaseDeviceV1InterfacePrivate::wp_drm_lease_device_v1_destroy_resource(Resource *resource)
-+void DrmLeaseDeviceV1InterfacePrivate::wp_drm_lease_device_v1_destroy_global()
- {
--    Q_UNUSED(resource)
--    if (removed && resourceMap().isEmpty()) {
--        delete this;
--    }
-+    delete this;
- }
- 
- 
-diff --git a/src/server/drmleasedevice_v1_interface_p.h b/src/server/drmleasedevice_v1_interface_p.h
-index 4bef36e4..085aac85 100644
---- a/src/server/drmleasedevice_v1_interface_p.h
-+++ b/src/server/drmleasedevice_v1_interface_p.h
-@@ -44,7 +44,7 @@ protected:
-     void wp_drm_lease_device_v1_create_lease_request(Resource *resource, uint32_t id) override;
-     void wp_drm_lease_device_v1_release(Resource *resource) override;
-     void wp_drm_lease_device_v1_bind_resource(Resource *resource) override;
--    void wp_drm_lease_device_v1_destroy_resource(Resource *resource) override;
-+    void wp_drm_lease_device_v1_destroy_global() override;
- };
- 
- class DrmLeaseConnectorV1InterfacePrivate : public QObject, public QtWaylandServer::wp_drm_lease_connector_v1
--- 
-GitLab
-
diff --git a/kde-plasma/kwayland-server/files/kwayland-server-5.24.4-guard-subsurface-parent-access.patch b/kde-plasma/kwayland-server/files/kwayland-server-5.24.4-guard-subsurface-parent-access.patch
deleted file mode 100644
index e40189ab2744..000000000000
--- a/kde-plasma/kwayland-server/files/kwayland-server-5.24.4-guard-subsurface-parent-access.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 6dcf73adaafeaa40c05e22df5f1c10af88df362b Mon Sep 17 00:00:00 2001
-From: David Edmundson <kde@davidedmundson.co.uk>
-Date: Wed, 30 Mar 2022 14:57:12 +0100
-Subject: [PATCH] Guard subsurface parent access.
-
-Whilst a subsurface must have a parent at the time of creation, the
-lifespan is not guaranteed afterwards.
-
-It's a weird thing for a client to do, but we need to not crash
-afterwards.
-
-If the parent surface is destroyed we should consider the surface
-unmapped.
-
-BUG: 452044
-
-
-(cherry picked from commit 1d2424a56a13dc55aeab699a38234a7cafa091d8)
----
- src/server/surface_interface.cpp | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/src/server/surface_interface.cpp b/src/server/surface_interface.cpp
-index ef2584f4..8bfac95f 100644
---- a/src/server/surface_interface.cpp
-+++ b/src/server/surface_interface.cpp
-@@ -678,7 +678,13 @@ void SurfaceInterfacePrivate::commitFromCache()
- 
- bool SurfaceInterfacePrivate::computeEffectiveMapped() const
- {
--    return bufferRef && (!subSurface || subSurface->parentSurface()->isMapped());
-+    if (!bufferRef) {
-+        return false;
-+    }
-+    if (subSurface) {
-+        return subSurface->parentSurface() && subSurface->parentSurface()->isMapped();
-+    }
-+    return true;
- }
- 
- void SurfaceInterfacePrivate::updateEffectiveMapped()
--- 
-GitLab
-
diff --git a/kde-plasma/kwayland-server/files/kwayland-server-5.24.5-fix-supported-action-init.patch b/kde-plasma/kwayland-server/files/kwayland-server-5.24.5-fix-supported-action-init.patch
new file mode 100644
index 000000000000..6e03d215ed43
--- /dev/null
+++ b/kde-plasma/kwayland-server/files/kwayland-server-5.24.5-fix-supported-action-init.patch
@@ -0,0 +1,44 @@
+From f669d7002b3966f53f8e17275123b24ec41e8e21 Mon Sep 17 00:00:00 2001
+From: Vlad Zahorodnii <vlad.zahorodnii@kde.org>
+Date: Mon, 16 May 2022 16:28:53 +0300
+Subject: [PATCH] wayland: Fix supported action initialization in data offer
+ interface
+
+Currently we guess the supported and preferred dnd actions in data offer
+for version >= 3. This can create problems because kwin may not send the
+right action events when the supported dnd actions actually change.
+---
+ src/server/dataoffer_interface.cpp | 10 +++++++---
+ 1 file changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/src/server/dataoffer_interface.cpp b/src/server/dataoffer_interface.cpp
+index ed682172..d78abeca 100644
+--- a/src/server/dataoffer_interface.cpp
++++ b/src/server/dataoffer_interface.cpp
+@@ -25,9 +25,8 @@ public:
+     DataOfferInterface *q;
+     QPointer<AbstractDataSource> source;
+ 
+-    // defaults are set to sensible values for < version 3 interfaces
+-    DataDeviceManagerInterface::DnDActions supportedDnDActions = DataDeviceManagerInterface::DnDAction::Copy | DataDeviceManagerInterface::DnDAction::Move;
+-    DataDeviceManagerInterface::DnDAction preferredDnDAction = DataDeviceManagerInterface::DnDAction::Copy;
++    DataDeviceManagerInterface::DnDActions supportedDnDActions = DataDeviceManagerInterface::DnDAction::None;
++    DataDeviceManagerInterface::DnDAction preferredDnDAction = DataDeviceManagerInterface::DnDAction::None;
+ 
+ protected:
+     void data_offer_destroy_resource(Resource *resource) override;
+@@ -43,6 +42,11 @@ DataOfferInterfacePrivate::DataOfferInterfacePrivate(AbstractDataSource *_source
+     , q(_q)
+     , source(_source)
+ {
++    // defaults are set to sensible values for < version 3 interfaces
++    if (wl_resource_get_version(resource) < WL_DATA_OFFER_ACTION_SINCE_VERSION) {
++        supportedDnDActions = DataDeviceManagerInterface::DnDAction::Copy | DataDeviceManagerInterface::DnDAction::Move;
++        preferredDnDAction = DataDeviceManagerInterface::DnDAction::Copy;
++    }
+ }
+ 
+ void DataOfferInterfacePrivate::data_offer_accept(Resource *resource, uint32_t serial, const QString &mime_type)
+-- 
+GitLab
+
diff --git a/kde-plasma/kwayland-server/kwayland-server-5.24.4-r2.ebuild b/kde-plasma/kwayland-server/kwayland-server-5.24.4-r2.ebuild
deleted file mode 100644
index 466f2ec10616..000000000000
--- a/kde-plasma/kwayland-server/kwayland-server-5.24.4-r2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_QTHELP="true"
-ECM_TEST="true"
-KFMIN=5.90.0
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Wayland Server Components built on KDE Frameworks"
-HOMEPAGE="https://invent.kde.org/plasma/kwayland-server"
-
-LICENSE="LGPL-2.1"
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-IUSE=""
-
-# All failing, I guess we need a virtual wayland server
-RESTRICT="test"
-
-RDEPEND="
-	>=dev-libs/wayland-1.19.0
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5[egl]
-	>=dev-qt/qtwayland-${QTMIN}:5
-	>=kde-frameworks/kwayland-${KFMIN}:5
-	media-libs/libglvnd
-"
-DEPEND="${RDEPEND}
-	>=dev-libs/plasma-wayland-protocols-1.6.0
-	>=dev-libs/wayland-protocols-1.24
-"
-BDEPEND="
-	>=dev-qt/qtwaylandscanner-${QTMIN}:5
-	dev-util/wayland-scanner
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-fix-layer-shell-reset.patch
-	"${FILESDIR}"/${P}-guard-subsurface-parent-access.patch # KDE-bug 452044
-	"${FILESDIR}"/${P}-fix-crash-on-screen-setup-change.patch # KDE-bug 452318
-	"${FILESDIR}"/${P}-fix-race-in-wp_drm_lease_v1.patch # KDE-bug 452435
-)
diff --git a/kde-plasma/kwayland-server/kwayland-server-5.24.5.ebuild b/kde-plasma/kwayland-server/kwayland-server-5.24.5-r1.ebuild
index 4a4b298c08ae..8950843499dd 100644
--- a/kde-plasma/kwayland-server/kwayland-server-5.24.5.ebuild
+++ b/kde-plasma/kwayland-server/kwayland-server-5.24.5-r1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://invent.kde.org/plasma/kwayland-server"
 
 LICENSE="LGPL-2.1"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE=""
 
 # All failing, I guess we need a virtual wayland server
@@ -37,3 +37,7 @@ BDEPEND="
 	>=dev-qt/qtwaylandscanner-${QTMIN}:5
 	dev-util/wayland-scanner
 "
+
+PATCHES=(
+	"${FILESDIR}"/${P}-fix-supported-action-init.patch
+)