commit: 7a08fcaba82716b8f52ea00d32299a3eac7cfe36 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Fri Mar 25 06:11:03 2022 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Fri Mar 25 06:11:19 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a08fcab
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 <AT> gentoo.org> .../krfb/files/krfb-21.12.3-optional-wayland.patch | 35 ++++++++++++++++++++++ ...{krfb-21.12.3.ebuild => krfb-21.12.3-r1.ebuild} | 6 +++- 2 files changed, 40 insertions(+), 1 deletion(-) diff --git a/kde-apps/krfb/files/krfb-21.12.3-optional-wayland.patch b/kde-apps/krfb/files/krfb-21.12.3-optional-wayland.patch new file mode 100644 index 000000000000..3c074ad82b1a --- /dev/null +++ b/kde-apps/krfb/files/krfb-21.12.3-optional-wayland.patch @@ -0,0 +1,35 @@ +From 4b7985db1b7ba0ef4fa0c5e2a664f0531026d0be Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <[email protected]> +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 <[email protected]> +--- + 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 + diff --git a/kde-apps/krfb/krfb-21.12.3.ebuild b/kde-apps/krfb/krfb-21.12.3-r1.ebuild similarity index 93% rename from kde-apps/krfb/krfb-21.12.3.ebuild rename to kde-apps/krfb/krfb-21.12.3-r1.ebuild index 503b92e52a4f..4b13224a1e90 100644 --- a/kde-apps/krfb/krfb-21.12.3.ebuild +++ b/kde-apps/krfb/krfb-21.12.3-r1.ebuild @@ -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=(
