gentoo resync : 12.05.2022

4 files changed, 87 insertions, 18 deletions

diff --git a/kde-plasma/kwayland-server/Manifest b/kde-plasma/kwayland-server/Manifest
index c057d07477f6..44bf0d75ebb4 100644
--- a/kde-plasma/kwayland-server/Manifest
+++ b/kde-plasma/kwayland-server/Manifest
@@ -1,8 +1,9 @@
 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.23.5.tar.xz 217524 BLAKE2B 0bc2f6b3137ba9620e7c37fa381fea3037d06cfabb8921ad5417589e6408ebfc603c6a7d73e550b40d7c00f0d8a97f1d946df730358fd6b1758a29183d3779c3 SHA512 bb5305e823d60612f79863de02337855c96de1ba908bf19ad14d0d67c8a199e9f4215faaf5251974cf1f012337a71c444d831a307d112bf5e7fd5b7156c384cd
 DIST kwayland-server-5.24.4.tar.xz 221412 BLAKE2B efc970b7f7d99e5195e74a71480039b6a6de15d23f4af9ea776a5b4f45494d8323fee8729e8b2633ed0e25167c99c2a73b63f08ce4e1cdd75d0870258e8d65ea SHA512 9281261b96ceccfb59b1d4eef247572424a196951cf927ae2d65eb6153cb0a9409059e789c7479ef04d8df750c109abfe202395a0a1f49010c40b1190cc2e640
-EBUILD kwayland-server-5.23.5.ebuild 902 BLAKE2B 230c8c66a5483186af6e0ae4051b2304080dfdcfb206717f1d189ce2f2ef41b6b615c9ad9d88331b1df763bdb974d0db3eea2c3469f9f89e4ca33d0d0c47eca1 SHA512 5436b3b036a23f002852f407aa2cf412f843da2febd9b9af15deb9f76d3ffb6af05f29f9aa33d783c4e0e730ad808417ef62f356e98c943574bf778920f693cf
-EBUILD kwayland-server-5.24.4-r1.ebuild 1108 BLAKE2B 12fd2d62d2e1e553c55634853c7c08ad0c75f83deeb51fa33e95d065c03478f33dbc27ac159f63641b999264dc8d85398a82302d51e4fcef55219a0b7210e700 SHA512 d1de0f06b1c4b58c69bbcb41b80df1a63e0a74ff66e83bbd3e97d79b2e0436c174b4b1189043a668424a8f0ff84575eae37601021e87b0dc43cbe9feec51242d
+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
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
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
new file mode 100644
index 000000000000..1799a711b472
--- /dev/null
+++ b/kde-plasma/kwayland-server/files/kwayland-server-5.24.4-fix-race-in-wp_drm_lease_v1.patch
@@ -0,0 +1,73 @@
+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/kwayland-server-5.24.4-r1.ebuild b/kde-plasma/kwayland-server/kwayland-server-5.24.4-r2.ebuild
index 033b2c03dc1c..466f2ec10616 100644
--- a/kde-plasma/kwayland-server/kwayland-server-5.24.4-r1.ebuild
+++ b/kde-plasma/kwayland-server/kwayland-server-5.24.4-r2.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
@@ -34,15 +34,13 @@ DEPEND="${RDEPEND}
 	>=dev-libs/wayland-protocols-1.24
 "
 BDEPEND="
-	|| (
-		>=dev-qt/qtwaylandscanner-${QTMIN}:5
-		<dev-qt/qtwayland-5.15.3:5
-	)
+	>=dev-qt/qtwaylandscanner-${QTMIN}:5
 	dev-util/wayland-scanner
 "
 
 PATCHES=(
 	"${FILESDIR}"/${P}-fix-layer-shell-reset.patch
-	"${FILESDIR}"/${P}-guard-subsurface-parent-access.patch # bug 452044
-	"${FILESDIR}"/${P}-fix-crash-on-screen-setup-change.patch # bug 452318
+	"${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.23.5.ebuild b/kde-plasma/kwayland-server/kwayland-server-5.24.5.ebuild
index 749ea067790f..4a4b298c08ae 100644
--- a/kde-plasma/kwayland-server/kwayland-server-5.23.5.ebuild
+++ b/kde-plasma/kwayland-server/kwayland-server-5.24.5.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 ECM_QTHELP="true"
 ECM_TEST="true"
-KFMIN=5.86.0
+KFMIN=5.90.0
 PVCUT=$(ver_cut 1-2)
 QTMIN=5.15.2
 inherit ecm kde.org
@@ -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
@@ -30,13 +30,10 @@ RDEPEND="
 	media-libs/libglvnd
 "
 DEPEND="${RDEPEND}
-	>=dev-libs/plasma-wayland-protocols-1.3.0
-	>=dev-libs/wayland-protocols-1.21
+	>=dev-libs/plasma-wayland-protocols-1.6.0
+	>=dev-libs/wayland-protocols-1.24
 "
 BDEPEND="
-	|| (
-		>=dev-qt/qtwaylandscanner-${QTMIN}:5
-		<dev-qt/qtwayland-5.15.3:5
-	)
+	>=dev-qt/qtwaylandscanner-${QTMIN}:5
 	dev-util/wayland-scanner
 "