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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 9B1A213835A for ; Fri, 14 May 2021 12:09:06 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0215AE08A0; Fri, 14 May 2021 12:09:06 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id DC495E089A for ; Fri, 14 May 2021 12:09:05 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0B0B033BE4D for ; Fri, 14 May 2021 12:09:05 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6804B795 for ; Fri, 14 May 2021 12:09:01 +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: <1620994003.a5913ce0134d42c4a3aed704270be8cdb3854e71.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-desktop/ X-VCS-Repository: proj/kde X-VCS-Files: kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild X-VCS-Directories: kde-plasma/plasma-desktop/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: a5913ce0134d42c4a3aed704270be8cdb3854e71 X-VCS-Branch: master Date: Fri, 14 May 2021 12:09:01 +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: 39e9ecad-3d89-46fc-b288-3c5dbdc8f369 X-Archives-Hash: 8498950a2aed5e203d0706e3eaaddbf2 commit: a5913ce0134d42c4a3aed704270be8cdb3854e71 Author: Andreas Sturmlechner gentoo org> AuthorDate: Fri May 14 11:16:40 2021 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Fri May 14 12:06:43 2021 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=a5913ce0 kde-plasma/plasma-desktop: Fix cmake config after upstream reshuffle Upstream commit dabfc009d89dfcecae58e1adfb2362cc54adec8a Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner gentoo.org> kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild index 1b319c3632..3a424efdc6 100644 --- a/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild +++ b/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild @@ -138,6 +138,11 @@ src_prepare() { use emoji || cmake_run_in applets/kimpanel/backend/ibus \ cmake_comment_add_subdirectory emojier + + # TODO: try to get a build switch upstreamed + if ! use scim; then + sed -e "s/^pkg_check_modules.*SCIM/#&/" -i CMakeLists.txt || die + fi } src_configure() { @@ -149,11 +154,10 @@ src_configure() { -DSYNAPTICS_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include $(cmake_use_find_package kaccounts AccountsQt5) $(cmake_use_find_package kaccounts KAccounts) - $(cmake_use_find_package scim SCIM) $(cmake_use_find_package semantic-desktop KF5Baloo) ) if ! use emoji && ! use ibus; then - mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_IBus=ON ) + mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_GLIB2=ON ) fi ecm_src_configure