From 2645de4c8715acba4a74f658454842483e7404a8 Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Tue, 2 Aug 2022 22:00:49 +0200 Subject: kde-plasma/kwayland-server: drop 5.24.5-r1 Signed-off-by: Andreas Sturmlechner --- kde-plasma/kwayland-server/Manifest | 1 - ...d-server-5.24.5-fix-supported-action-init.patch | 44 ---------------------- .../kwayland-server-5.24.5-r1.ebuild | 43 --------------------- 3 files changed, 88 deletions(-) delete mode 100644 kde-plasma/kwayland-server/files/kwayland-server-5.24.5-fix-supported-action-init.patch delete mode 100644 kde-plasma/kwayland-server/kwayland-server-5.24.5-r1.ebuild (limited to 'kde-plasma') diff --git a/kde-plasma/kwayland-server/Manifest b/kde-plasma/kwayland-server/Manifest index b8c3ff5bd17a..1388b347ae4a 100644 --- a/kde-plasma/kwayland-server/Manifest +++ b/kde-plasma/kwayland-server/Manifest @@ -1,2 +1 @@ -DIST kwayland-server-5.24.5.tar.xz 221388 BLAKE2B 38a1e66c1290c32db10a6818b10e57097fef70ac376797e272c329e9a49556bf423da4a731e46718bf39a30131def4adf90f1742589425ad040bc125c84fcffa SHA512 72159618a22233b9b49cab8ee1a804f629763e903a2e711c8c23f990544d79b5d27e768c33f8d844c916e41a6d3a2af5ddcab69d0448569adc247e0f737975f5 DIST kwayland-server-5.24.6.tar.xz 221432 BLAKE2B 6ee92ba3800b04b06bc5543e99dfdf3690ff163423868e025da08f600d8624a20b080d1d24cde977780c88b7b8d4953cfec074d7423569e072ab0305c9342d04 SHA512 7030e74f866b170ca8badceab18a74fbc412cad4745386d8731ac3bef0e002e7997454d802cefab57f597c093454a92a8c25601ccbdca3fac3f674b0c65f1775 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 deleted file mode 100644 index 6e03d215ed43..000000000000 --- a/kde-plasma/kwayland-server/files/kwayland-server-5.24.5-fix-supported-action-init.patch +++ /dev/null @@ -1,44 +0,0 @@ -From f669d7002b3966f53f8e17275123b24ec41e8e21 Mon Sep 17 00:00:00 2001 -From: Vlad Zahorodnii -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 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.5-r1.ebuild b/kde-plasma/kwayland-server/kwayland-server-5.24.5-r1.ebuild deleted file mode 100644 index 8950843499dd..000000000000 --- a/kde-plasma/kwayland-server/kwayland-server-5.24.5-r1.ebuild +++ /dev/null @@ -1,43 +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-supported-action-init.patch -) -- cgit v1.2.3-65-gdbad