gentoo auto-resync : 10:10:2022 - 13:34:00

3 files changed, 3 insertions, 45 deletions

diff --git a/kde-frameworks/kwayland/Manifest b/kde-frameworks/kwayland/Manifest
index 8a93c5613a8c..7a7213bac505 100644
--- a/kde-frameworks/kwayland/Manifest
+++ b/kde-frameworks/kwayland/Manifest
@@ -1,6 +1,5 @@
-AUX kwayland-5.98.0-plasmashell-fallback-for-applet-popups.patch 1377 BLAKE2B ddfe0dea2bec4ae428049ca67e25bcc7fdd99de21905f304233bb41e5daa0c87b3d1dbbf2d900540523562e9fcff76a341eae431b3bbd689099eab98d218c5a9 SHA512 23c2705831d8116c8902bde652c981f7496cd244d1a1ce15bf8cb59d48f58f1bb861882cc4bee9dfed84a0c693a4e3b0b37ddd4bb5368d94f4da6c0a91c105cc
 DIST kwayland-5.96.0.tar.xz 335724 BLAKE2B 5bf792ebf1c97651cd9d578ca9e2be7b54cfa85d211447bc1055c8c0731a1ee1d4f1deeb93e693d6630b58777ac8da57725fd60ccdc53551d4fecad0d9e27060 SHA512 f81ff1cb141039c0148949860f0d9bd57c9afdf938b838dfc91aa92d67f2aa5da6b4c19875637eaa050174b94008f56f593c18b23422e97856b301e9d515c670
-DIST kwayland-5.98.0.tar.xz 336144 BLAKE2B 1dbe235138933f49502da42ee46a192e0f0a4c469ed31a51921d05454c892b7e87e7861d38db67dfd70097ea93f9e3feeda5e95fa8e77fe0e1a860ffd0c63538 SHA512 e714e4a23cda911819d56cf949c0d1f3e83dcac3f59abad01d25424fa615620e381390a2716a9a318ed205e2cc8f83ba0e4fa9322bcbb4522703534384c3b8e9
+DIST kwayland-5.99.0.tar.xz 336592 BLAKE2B db9cc7315fb5a4cfea301739651925582eb31321c2b44b4831484c878157af4e49078057c9ffe71fd5275ab64f96f325af5e99f058c2ef6bf5b415899338fa6a SHA512 d921eedef35ffa536595660d21c406288e1056000587701efacb02f3265f6b1fd5935626c32c191f3d870a61253d25f79b1b9d370e4e5a6056278d13ea76ccf2
 EBUILD kwayland-5.96.0.ebuild 902 BLAKE2B 09455206b6aba96c9936e41bee61a9cb947bba3cd157f95afad8f4fd43be4728dee7fd36691234f4570b9ac5c09b11a72f061fc29706918c36de5a57f08fbc44 SHA512 3e1704fcfaf3230c4cb4c8b3c6b2016af2be2e189766f057907079c1c5621872c56d22fa497f064eb18d87a711550371d4f9dcb40896e5a079ae198ac35859fe
-EBUILD kwayland-5.98.0-r1.ebuild 998 BLAKE2B d36b7acb495acb6e01ad1162289a8fa0197ef92c8956a79e2abe0a35406d66db6e22bc7d36aad66ad478c7ef97186de715306f76d26d77bcf776a5471b3e7789 SHA512 4d2b51d12a0906d0f5566debacbe21b3b60f6ac59609777d9a93fb5a21ac1304b7e07446a3f84e2d3effd04638bb263b49629c12a4c716b96df90863b6fdc594
+EBUILD kwayland-5.99.0.ebuild 920 BLAKE2B 44270d3445298ce6ae1dd966fda2e42280be8986bb49c3fae40e04ae63ec303ca4feb5e72e73710fafed04b4e972a2c164ac410ea2365249b2b877a27444d672 SHA512 5ded88e114fba531cfd600b749c1494a8c86463469251c178b3d728c1b0c34daf1d31766a5058eaed6d2b303cfaf6f1bff00c21b2ddede3ef5202b5bbbc6bac7
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/kwayland/files/kwayland-5.98.0-plasmashell-fallback-for-applet-popups.patch b/kde-frameworks/kwayland/files/kwayland-5.98.0-plasmashell-fallback-for-applet-popups.patch
deleted file mode 100644
index 7cc45ad8e2e6..000000000000
--- a/kde-frameworks/kwayland/files/kwayland-5.98.0-plasmashell-fallback-for-applet-popups.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From d02188ad1f6222215adcf842f4c9806ba9e62ccb Mon Sep 17 00:00:00 2001
-From: Xaver Hugl <xaver.hugl@gmail.com>
-Date: Sat, 17 Sep 2022 01:18:28 +0200
-Subject: [PATCH] client/plasmashell: add fallback for applet popups
-
-When the compositor doesn't support applet popups, the current code sends an
-invalid surface role. This causes KWin to fall back to the "normal" surface role
-and do normal window placement on it.
-
-CCBUG: 459188
----
- src/client/plasmashell.cpp | 9 ++++++++-
- 1 file changed, 8 insertions(+), 1 deletion(-)
-
-diff --git a/src/client/plasmashell.cpp b/src/client/plasmashell.cpp
-index dc613cb..93bc31c 100644
---- a/src/client/plasmashell.cpp
-+++ b/src/client/plasmashell.cpp
-@@ -276,7 +276,14 @@ void PlasmaShellSurface::setRole(PlasmaShellSurface::Role role)
-         }
-         break;
-     case Role::AppletPopup:
--        wlRole = ORG_KDE_PLASMA_SURFACE_ROLE_APPLETPOPUP;
-+        // ORG_KDE_PLASMA_SURFACE_ROLE_APPLETPOPUP_SINCE_VERSION is not used for this check
-+        // because it wrongly is 7 with old plasma wayland protocols
-+        if (wl_proxy_get_version(d->surface) < 8) {
-+            // dock is what applet popups were before
-+            wlRole = ORG_KDE_PLASMA_SURFACE_ROLE_PANEL;
-+        } else {
-+            wlRole = ORG_KDE_PLASMA_SURFACE_ROLE_APPLETPOPUP;
-+        }
-         break;
-     default:
-         Q_UNREACHABLE();
--- 
-GitLab
-
diff --git a/kde-frameworks/kwayland/kwayland-5.98.0-r1.ebuild b/kde-frameworks/kwayland/kwayland-5.99.0.ebuild
index 59884e1adf75..5da61c769d8d 100644
--- a/kde-frameworks/kwayland/kwayland-5.98.0-r1.ebuild
+++ b/kde-frameworks/kwayland/kwayland-5.99.0.ebuild
@@ -27,7 +27,7 @@ RDEPEND="
 	media-libs/libglvnd
 "
 DEPEND="${RDEPEND}
-	>=dev-libs/plasma-wayland-protocols-1.7.0
+	>=dev-libs/plasma-wayland-protocols-1.9.0
 	>=dev-libs/wayland-protocols-1.15
 	sys-kernel/linux-headers
 "
@@ -35,7 +35,3 @@ BDEPEND="
 	>=dev-qt/qtwaylandscanner-${QTMIN}:5
 	>=dev-util/wayland-scanner-1.19.0
 "
-
-PATCHES=(
-	"${FILESDIR}/${P}-plasmashell-fallback-for-applet-popups.patch"
-)