[gentoo-commits] proj/kde:master commit in: kde-plasma/kwin/

[Andreas Sturmlechner]

commit:     9093ab70410b26af1a57c3ae703625e67b6bfc1c
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun May  8 21:02:04 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun May  8 21:46:24 2022 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=9093ab70

kde-plasma/kwin: Update dependencies

kde-plasma/kwayland-server merged into $PN, upstream commit
b64f95b703e101d60369a15a0588fe104be646a8.

Possible implicit DEPEND-only suspects, not mentioned in CMakeLists.txt:
dev-qt/qtconcurrent
dev-qt/qtwayland

Dependency changes upstream commits:
00f2dc1d888d7d09f0767eaeedfbcf01dec62786
aef8ba8d1a127ba93e77746321e021ea03c8d38b
5db527a053a8e8bc510e2c340a0358a7c3c451f9
9f9e32e57d7b52111f4934fc7c8119e8a766cef8
719e97194d4864345439b53ce95e2bfd47f10e6f
08ad2c8ed3f14d6bb8806908c7e629a47f10c22d

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 kde-plasma/kwin/kwin-9999.ebuild | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/kde-plasma/kwin/kwin-9999.ebuild b/kde-plasma/kwin/kwin-9999.ebuild
index 640f3ee0c3..de4521ef98 100644
--- a/kde-plasma/kwin/kwin-9999.ebuild
+++ b/kde-plasma/kwin/kwin-9999.ebuild
@@ -22,17 +22,18 @@ RESTRICT="test"
 
 COMMON_DEPEND="
 	>=dev-libs/libinput-1.19
-	>=dev-libs/wayland-1.2
+	>=dev-libs/wayland-1.20.0
+	>=dev-qt/qtconcurrent-${QTMIN}:5
 	>=dev-qt/qtdbus-${QTMIN}:5
 	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5=[gles2-only=,libinput]
+	>=dev-qt/qtgui-${QTMIN}:5=[egl,gles2-only=,libinput]
+	>=dev-qt/qtwayland-${QTMIN}:5
 	>=dev-qt/qtwidgets-${QTMIN}:5
 	>=dev-qt/qtx11extras-${QTMIN}:5
 	>=kde-frameworks/kactivities-${KFMIN}:5
 	>=kde-frameworks/kauth-${KFMIN}:5
 	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5[qml]
 	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
 	>=kde-frameworks/kcoreaddons-${KFMIN}:5
 	>=kde-frameworks/kcrash-${KFMIN}:5
@@ -40,13 +41,12 @@ COMMON_DEPEND="
 	>=kde-frameworks/kdeclarative-${KFMIN}:5
 	>=kde-frameworks/kglobalaccel-${KFMIN}:5=
 	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
 	>=kde-frameworks/kidletime-${KFMIN}:5=
+	>=kde-frameworks/kitemviews-${KFMIN}:5
 	>=kde-frameworks/knewstuff-${KFMIN}:5
 	>=kde-frameworks/knotifications-${KFMIN}:5
 	>=kde-frameworks/kpackage-${KFMIN}:5
 	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
 	>=kde-frameworks/kwayland-${KFMIN}:5
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
 	>=kde-frameworks/kwindowsystem-${KFMIN}:5=[X]
@@ -55,17 +55,18 @@ COMMON_DEPEND="
 	>=kde-plasma/breeze-${PVCUT}:5
 	>=kde-plasma/kdecoration-${PVCUT}:5
 	>=kde-plasma/kscreenlocker-${PVCUT}:5
-	>=kde-plasma/kwayland-server-${PVCUT}:5
 	media-libs/fontconfig
 	media-libs/freetype
 	media-libs/lcms:2
 	media-libs/libepoxy
+	media-libs/libglvnd
 	>=media-libs/mesa-21.1[egl(+),gbm(+),wayland,X]
 	virtual/libudev:=
 	x11-libs/libX11
 	x11-libs/libXi
 	x11-libs/libdrm
 	>=x11-libs/libxcb-1.10
+	>=x11-libs/libxcvt-0.1.1
 	>=x11-libs/libxkbcommon-0.7.0
 	x11-libs/xcb-util-cursor
 	x11-libs/xcb-util-image
@@ -78,6 +79,7 @@ COMMON_DEPEND="
 	screencast? ( >=media-video/pipewire-0.3:= )
 "
 RDEPEND="${COMMON_DEPEND}
+	!kde-plasma/kwayland-server
 	>=dev-qt/qtquickcontrols-${QTMIN}:5
 	>=dev-qt/qtquickcontrols2-${QTMIN}:5
 	>=dev-qt/qtvirtualkeyboard-${QTMIN}:5
@@ -88,15 +90,16 @@ RDEPEND="${COMMON_DEPEND}
 	multimedia? ( >=dev-qt/qtmultimedia-${QTMIN}:5[gstreamer,qml] )
 "
 DEPEND="${COMMON_DEPEND}
+	dev-libs/plasma-wayland-protocols
+	>=dev-libs/wayland-protocols-1.25
 	>=dev-qt/designer-${QTMIN}:5
 	>=dev-qt/qtconcurrent-${QTMIN}:5
 	x11-base/xorg-proto
-	test? (
-		dev-libs/plasma-wayland-protocols
-		>=dev-libs/wayland-protocols-1.19
-	)
 "
-BDEPEND="test? ( >=dev-qt/qtwaylandscanner-${QTMIN}:5 )"
+BDEPEND="
+	>=dev-qt/qtwaylandscanner-${QTMIN}:5
+	dev-util/wayland-scanner
+"
 PDEPEND=">=kde-plasma/kde-cli-tools-${PVCUT}:5"
 
 src_prepare() {
@@ -111,6 +114,7 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
+		# KWIN_BUILD_NOTIFICATIONS exists, but kdeclarative still hard-depends on it
 		$(cmake_use_find_package accessibility QAccessibilityClient)
 		$(cmake_use_find_package caps Libcap)
 		$(cmake_use_find_package plasma KF5Runner)