From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 7714F158020 for ; Sun, 25 Dec 2022 20:50:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A1680E07E1; Sun, 25 Dec 2022 20:50:55 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8D469E07E1 for ; Sun, 25 Dec 2022 20:50:55 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BE66E340BF1 for ; Sun, 25 Dec 2022 20:50:54 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DE8EF6F2 for ; Sun, 25 Dec 2022 20:50:52 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1672001357.8cb16fc21887680034acd62cd5347b1d8b2945c9.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-workspace/ X-VCS-Repository: proj/kde X-VCS-Files: kde-plasma/plasma-workspace/plasma-workspace-5.26.49.9999.ebuild kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild X-VCS-Directories: kde-plasma/plasma-workspace/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 8cb16fc21887680034acd62cd5347b1d8b2945c9 X-VCS-Branch: master Date: Sun, 25 Dec 2022 20:50:52 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: a2139111-74d2-45ad-916b-6a15244675af X-Archives-Hash: 577a2225ec59c1aa565ee1ba4f7f0c3f commit: 8cb16fc21887680034acd62cd5347b1d8b2945c9 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Dec 25 20:49:17 2022 +0000 Commit: Andreas Sturmlechner gentoo 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 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() {