commit: 8cb16fc21887680034acd62cd5347b1d8b2945c9 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sun Dec 25 20:49:17 2022 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sun Dec 25 20:49:17 2022 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=8cb16fc2
kde-plasma/plasma-workspace: Fix build with USE=-fontconfig, adjust deps Bug: https://bugs.gentoo.org/881141 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> kde-plasma/plasma-workspace/plasma-workspace-5.26.49.9999.ebuild | 6 +++++- kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.26.49.9999.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.26.49.9999.ebuild index 05ea8e506d..f4d0df656f 100644 --- a/kde-plasma/plasma-workspace/plasma-workspace-5.26.49.9999.ebuild +++ b/kde-plasma/plasma-workspace/plasma-workspace-5.26.49.9999.ebuild @@ -97,7 +97,6 @@ COMMON_DEPEND=" x11-libs/libXrender x11-libs/libXtst x11-libs/xcb-util - x11-libs/xcb-util-image appstream? ( dev-libs/appstream[qt5] ) calendar? ( >=kde-frameworks/kholidays-${KFMIN}:5 ) fontconfig? ( @@ -188,6 +187,11 @@ src_prepare() { if ! use policykit; then cmake_run_in kcms cmake_comment_add_subdirectory users fi + + if ! use fontconfig; then + ecm_punt_bogus_dep XCB IMAGE + sed -e "s/check_X11_lib(Xft)/#&/" -i CMakeLists.txt || die + fi } src_configure() { diff --git a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild index ea638bd7af..9ad17f191c 100644 --- a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild +++ b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild @@ -97,7 +97,6 @@ COMMON_DEPEND=" x11-libs/libXrender x11-libs/libXtst x11-libs/xcb-util - x11-libs/xcb-util-image appstream? ( dev-libs/appstream[qt5] ) calendar? ( >=kde-frameworks/kholidays-${KFMIN}:5 ) fontconfig? ( @@ -186,6 +185,11 @@ src_prepare() { if ! use policykit; then cmake_run_in kcms cmake_comment_add_subdirectory users fi + + if ! use fontconfig; then + ecm_punt_bogus_dep XCB IMAGE + sed -e "s/check_X11_lib(Xft)/#&/" -i CMakeLists.txt || die + fi } src_configure() {
