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

["Andreas Sturmlechner" <asturm@gentoo.org>]

commit:     5aadcfe427e0f491d060ab3eb2de6e965ea87a44
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 12 17:57:06 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Dec 12 18:06:34 2023 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=5aadcfe4

kde-plasma/plasma-workspace: Update dependencies, add blocker

Upstream commits:
d69d6325cef0c6c095f40f7f74ecef02456ebb89
6c0f23c6c9aef1bb89c03644434990c13a68ec0f
e4784ac761f5a5d34b26888b161c964161f6ebd0
a8006e8b0b449e16fa627e8f795a20509bf5f5e8
9dba4e8f5810248053d673017dc3fa099e42e1d6
ea8fa4dea696c63488459a799024060c8d2e92c5
264be2701351ced37d529dac2bee0bc1629b2ac2
0abcf49afb069885b57a96c2724dd0a111ad7dd1
a44a666dd12a863ebfecd720c9b020dcd33674b8
d9f46ec7657b70bf206dcc8c229c398350fc018e
e54bd896ce1e8daaeb29b67d6e40c95ec83c5db5
3426a44c2a46625fc2d8b963e95e180c378e7c93
2ecc2073bc70c1f32239fc6997283ad5043a0bd2
65e3986a0893888f14c092b93c0cd7f8d8f5b9a9
3f97fa5f3f7ff0818aad2539cf082109860d4db3

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../plasma-workspace/plasma-workspace-9999.ebuild  | 24 +++++++++++++++++-----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
index f31585e793..28376d27d4 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
@@ -16,7 +16,7 @@ LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
 KEYWORDS=""
 IUSE="appstream +calendar +fontconfig geolocation gps +policykit
-screencast +semantic-desktop telemetry +wallpaper-metadata"
+screencast +semantic-desktop systemd telemetry +wallpaper-metadata"
 
 REQUIRED_USE="gps? ( geolocation )"
 RESTRICT="test"
@@ -26,8 +26,10 @@ RESTRICT="test"
 COMMON_DEPEND="
 	dev-libs/icu:=
 	>=dev-libs/wayland-1.15
+	>=dev-qt/qt5compat-${QTMIN}:6[qml]
 	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,libinput,network,sql,widgets,xml]
 	>=dev-qt/qtdeclarative-${QTMIN}:6[widgets]
+	>=dev-qt/qtshadertools-${QTMIN}:6
 	>=dev-qt/qtsvg-${QTMIN}:6
 	>=dev-qt/qtwayland-${QTMIN}:6=
 	>=kde-frameworks/karchive-${KFMIN}:6
@@ -56,9 +58,10 @@ COMMON_DEPEND="
 	>=kde-frameworks/knotifyconfig-${KFMIN}:6
 	>=kde-frameworks/kpackage-${KFMIN}:6
 	>=kde-frameworks/kparts-${KFMIN}:6
-	>=kde-frameworks/kpeople-${KFMIN}:6
 	>=kde-frameworks/krunner-${KFMIN}:6
 	>=kde-frameworks/kservice-${KFMIN}:6
+	>=kde-frameworks/kstatusnotifieritem-${KFMIN}:6
+	>=kde-frameworks/ksvg-${KFMIN}:6
 	>=kde-frameworks/ktexteditor-${KFMIN}:6
 	>=kde-frameworks/ktextwidgets-${KFMIN}:6
 	>=kde-frameworks/kunitconversion-${KFMIN}:6
@@ -78,9 +81,12 @@ COMMON_DEPEND="
 	>=kde-plasma/libplasma-${PVCUT}:6
 	>=kde-plasma/plasma-activities-${PVCUT}:6
 	>=kde-plasma/plasma-activities-stats-${PVCUT}:6
+	>=kde-plasma/plasma5support-${PVCUT}:6
+	media-libs/libcanberra
 	>=media-libs/phonon-4.12.0[qt6]
 	sci-libs/libqalculate:=
 	sys-libs/zlib
+	virtual/libudev:=
 	x11-libs/libICE
 	x11-libs/libSM
 	x11-libs/libX11
@@ -112,23 +118,24 @@ COMMON_DEPEND="
 		x11-libs/libdrm
 	)
 	semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:6 )
+	systemd? ( sys-apps/systemd:= )
 	telemetry? ( >=kde-frameworks/kuserfeedback-${KFMIN}:6 )
 	wallpaper-metadata? ( kde-apps/libkexiv2:5 )
 "
 DEPEND="${COMMON_DEPEND}
 	>=dev-libs/plasma-wayland-protocols-1.6.0
-	>=dev-libs/wayland-protocols-1.31
 	>=dev-qt/qtbase-${QTMIN}:6[concurrent]
 	x11-base/xorg-proto
 	fontconfig? ( x11-libs/libXrender )
 "
 RDEPEND="${COMMON_DEPEND}
+	!kde-plasma/libkworkspace:5
 	!<kde-plasma/breeze-5.22.90:5
 	!<kde-plasma/plasma-desktop-5.27.0:5
 	app-text/iso-codes
+	dev-libs/kirigami-addons:6
 	>=dev-qt/qttools-${QTMIN}:*[qdbus]
-	>=dev-qt/qt5compat-${QTMIN}:6[qml]
-	kde-apps/kio-extras:5
+	kde-apps/kio-extras:6
 	>=kde-frameworks/kirigami-${KFMIN}:6
 	>=kde-frameworks/kquickcharts-${KFMIN}:6
 	>=kde-plasma/milou-${PVCUT}:6
@@ -145,6 +152,7 @@ BDEPEND="
 	>=dev-util/wayland-scanner-1.19.0
 	>=kde-frameworks/kcmutils-${KFMIN}:6
 	virtual/pkgconfig
+	test? ( >=dev-qt/qtwayland-${QTMIN}:6[compositor] )
 "
 PDEPEND=">=kde-plasma/kde-cli-tools-${PVCUT}:*"
 
@@ -178,11 +186,17 @@ src_prepare() {
 		ecm_punt_bogus_dep XCB IMAGE
 		sed -e "s/check_X11_lib(Xft)/#&/" -i CMakeLists.txt || die
 	fi
+
+	# TODO: try to get a build switch upstreamed
+	if use systemd; then
+		sed -e "s/^pkg_check_modules.*SYSTEMD/#&/" -i CMakeLists.txt || die
+	fi
 }
 
 src_configure() {
 	local mycmakeargs=(
 		-DBUILD_xembed-sni-proxy=OFF
+		-DWITH_X11=ON # TODO: broken upstream, fix it if you can
 		-DGLIBC_LOCALE_GEN=$(usex policykit)
 		$(cmake_use_find_package appstream AppStreamQt)
 		$(cmake_use_find_package calendar KF6Holidays)