kde-apps/krfb: Fix IUSE="-wayland", add missing DEPEND

Closes: https://bugs.gentoo.org/835928
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
This commit is contained in:
Andreas Sturmlechner
2022-03-25 07:11:03 +01:00
parent b2d09c4081
commit 7a08fcaba8
2 changed files with 40 additions and 1 deletions

View File

@@ -0,0 +1,35 @@
From 4b7985db1b7ba0ef4fa0c5e2a664f0531026d0be Mon Sep 17 00:00:00 2001
From: Andreas Sturmlechner <asturm@gentoo.org>
Date: Thu, 24 Mar 2022 17:12:39 +0100
Subject: [PATCH] Make KF5Wayland optional behind existing DISABLE_PIPEWIRE
We have an option so let's be consistent.
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
---
CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 29218ff..82b02f1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -38,7 +38,6 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
DocTools
Notifications
Wallet
- Wayland
WidgetsAddons
WindowSystem
XmlGui
@@ -90,6 +89,7 @@ add_feature_info(PipeWire PipeWire_FOUND "Required for pipewire screencast plugi
find_package(PlasmaWaylandProtocols 1.5.0)
if(PipeWire_FOUND AND PlasmaWaylandProtocols_FOUND)
+ find_package(KF5Wayland ${KF5_MIN_VERSION})
find_package(QtWaylandScanner REQUIRED)
find_package(Qt5WaylandClient)
find_package(Qt5XkbCommonSupport)
--
2.35.1

View File

@@ -46,6 +46,7 @@ COMMON_DEPEND="
>=dev-qt/qtgui-${QTMIN}:5[X]
)
>=dev-qt/qtwayland-${QTMIN}:5
>=kde-frameworks/kwayland-${KFMIN}:5
media-libs/libepoxy
media-libs/mesa[gbm(+)]
>=media-video/pipewire-0.3:=
@@ -67,7 +68,10 @@ BDEPEND="
) )
"
PATCHES=( "${FILESDIR}/${PN}-21.12.2-optional-pipewire.patch" )
PATCHES=(
"${FILESDIR}/${PN}-21.12.2-optional-pipewire.patch"
"${FILESDIR}/${P}-optional-wayland.patch"
)
src_configure() {
local mycmakeargs=(