diff options
| author | Andreas Sturmlechner <asturm@gentoo.org> | 2022-12-25 21:49:17 +0100 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2022-12-25 21:49:17 +0100 |
| commit | 8cb16fc21887680034acd62cd5347b1d8b2945c9 (patch) | |
| tree | 8d1b7a40d01eca83d78c83d1ce2720341ff42a09 | |
| parent | d8b79725f6da7605bb12c02ac55df17a63041e2d (diff) | |
| download | kde-8cb16fc21887680034acd62cd5347b1d8b2945c9.tar.gz kde-8cb16fc21887680034acd62cd5347b1d8b2945c9.tar.bz2 kde-8cb16fc21887680034acd62cd5347b1d8b2945c9.zip | |
kde-plasma/plasma-workspace: Fix build with USE=-fontconfig, adjust deps
Bug: https://bugs.gentoo.org/881141
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
| -rw-r--r-- | kde-plasma/plasma-workspace/plasma-workspace-5.26.49.9999.ebuild | 6 | ||||
| -rw-r--r-- | 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 05ea8e506dc..f4d0df656f1 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 ea638bd7af5..9ad17f191c8 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() { |
