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 946A315A7D9 for ; Thu, 23 Mar 2023 08:39:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C9E74E0825; Thu, 23 Mar 2023 08:39:32 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 AA719E0825 for ; Thu, 23 Mar 2023 08:39:32 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id AE876340B27 for ; Thu, 23 Mar 2023 08:39:31 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 42B5B4A2 for ; Thu, 23 Mar 2023 08:39:30 +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: <1679560757.6c1679c37a015b3aff52c786d2cff6adb3e82e92.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: kde-plasma/plasma-workspace/, kde-plasma/plasma-workspace/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: kde-plasma/plasma-workspace/files/plasma-workspace-5.27.3-cmake.patch kde-plasma/plasma-workspace/plasma-workspace-5.27.3-r1.ebuild X-VCS-Directories: kde-plasma/plasma-workspace/files/ kde-plasma/plasma-workspace/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 6c1679c37a015b3aff52c786d2cff6adb3e82e92 X-VCS-Branch: master Date: Thu, 23 Mar 2023 08:39:30 +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: 82038b84-ec66-4f23-854d-727d432ce21c X-Archives-Hash: ffd613a8c7b5440c6171137fa7251e8e commit: 6c1679c37a015b3aff52c786d2cff6adb3e82e92 Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Mar 23 08:38:18 2023 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Mar 23 08:39:17 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c1679c3 kde-plasma/plasma-workspace: Fix cmake Closes: https://bugs.gentoo.org/902797 Signed-off-by: Andreas Sturmlechner gentoo.org> .../files/plasma-workspace-5.27.3-cmake.patch | 37 ++++++++++++++++++++++ .../plasma-workspace-5.27.3-r1.ebuild | 1 + 2 files changed, 38 insertions(+) diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.27.3-cmake.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.27.3-cmake.patch new file mode 100644 index 000000000000..e151a214dc4e --- /dev/null +++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.27.3-cmake.patch @@ -0,0 +1,37 @@ +From 3f81a6559cd48d8735a7b0e7ca7cedac92db8cc8 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner +Date: Thu, 23 Mar 2023 09:32:09 +0100 +Subject: [PATCH] Find PkgConfig before first call to pkg_check_modules + +Follow-up to a0d707014150786ba2e508c144b2bc6b8ad8f316 + +For some reason this would fail only when disabling Fontconfig. + +Signed-off-by: Andreas Sturmlechner +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 556e017d8..c05e7275e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -76,6 +76,7 @@ set_package_properties(KF5Baloo PROPERTIES DESCRIPTION "File Searching" + PURPOSE "Needed for the File Search runner." + ) + ++find_package(PkgConfig REQUIRED) + pkg_check_modules(QALCULATE libqalculate>2.0 REQUIRED IMPORTED_TARGET) + + find_package(KWinDBusInterface CONFIG REQUIRED) +@@ -151,7 +152,6 @@ else() + set(HAVE_XFIXES 0) + endif() + +-find_package(PkgConfig REQUIRED) + pkg_check_modules(PipeWire IMPORTED_TARGET libpipewire-0.3) + add_feature_info(PipeWire PipeWire_FOUND "Required for Wayland screencasting") + +-- +2.40.0 + diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.27.3-r1.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.27.3-r1.ebuild index b62e1cf969f0..f228665007ac 100644 --- a/kde-plasma/plasma-workspace/plasma-workspace-5.27.3-r1.ebuild +++ b/kde-plasma/plasma-workspace/plasma-workspace-5.27.3-r1.ebuild @@ -164,6 +164,7 @@ PATCHES=( "${FILESDIR}/${PN}-5.22.5-krunner-cwd-at-home.patch" # TODO upstream: KDE-bug 432975, bug 767478 "${FILESDIR}/${P}-dashboard-skip-task-switcher.patch" # KDE-bug 465303 "${FILESDIR}/${P}-nightcolor-fix-timing-strings.patch" + "${FILESDIR}/${P}-cmake.patch" # bug 902797 ) src_prepare() {