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 0271D138350 for ; Mon, 23 Mar 2020 23:57:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 285CEE096B; Mon, 23 Mar 2020 23:57:08 +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 7ED02E096B for ; Mon, 23 Mar 2020 23:57:07 +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 E111634EFA5 for ; Mon, 23 Mar 2020 23:57:05 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 89F4EAF for ; Mon, 23 Mar 2020 23:57:03 +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: <1585007769.6d0bc899f71f6c139a9020dd3ab75a0b41e54621.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: kde-apps/konsole/, kde-apps/konsole/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: kde-apps/konsole/files/konsole-19.12.3-no-ccache.patch kde-apps/konsole/konsole-19.12.3.ebuild X-VCS-Directories: kde-apps/konsole/files/ kde-apps/konsole/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 6d0bc899f71f6c139a9020dd3ab75a0b41e54621 X-VCS-Branch: master Date: Mon, 23 Mar 2020 23:57:03 +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: 974a7156-4807-4fdb-beea-ce8819a4cdab X-Archives-Hash: b4731ebd31c9bafb2e6f35ad013ca432 commit: 6d0bc899f71f6c139a9020dd3ab75a0b41e54621 Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Mar 23 23:56:09 2020 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Mar 23 23:56:09 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d0bc899 kde-apps/konsole: Revert upstream ccache auto-detection Package-Manager: Portage-2.3.93, Repoman-2.3.20 Signed-off-by: Andreas Sturmlechner gentoo.org> .../konsole/files/konsole-19.12.3-no-ccache.patch | 45 ++++++++++++++++++++++ kde-apps/konsole/konsole-19.12.3.ebuild | 5 ++- 2 files changed, 49 insertions(+), 1 deletion(-) diff --git a/kde-apps/konsole/files/konsole-19.12.3-no-ccache.patch b/kde-apps/konsole/files/konsole-19.12.3-no-ccache.patch new file mode 100644 index 00000000000..9419ea5c612 --- /dev/null +++ b/kde-apps/konsole/files/konsole-19.12.3-no-ccache.patch @@ -0,0 +1,45 @@ +From 3529286a0a4885ad3626a4081407fb56a8a568f9 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner +Date: Tue, 24 Mar 2020 00:24:05 +0100 +Subject: [PATCH] Revert "CMakeLists.txt: use ccache if present" + +This was added for feature-parity with Meson-based projects; but an individual +package is the wrong place for that. To avoid the proliferation of auto- +detected ccache support in kde.org packages please submit such a proposal to +kde-frameworks-devel instead, where it could be added for the benefit of all +the projects using ECM. And more importantly, with a standard switch to disable +it for packaging environments. + +This reverts commit 007c2a08523887cf9c0445a288ad82994bd02a57. + +Differential Revision: https://phabricator.kde.org/D24805 +--- + CMakeLists.txt | 12 ------------ + 1 file changed, 12 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 17c82b0d..45ab9f62 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -17,18 +17,6 @@ set (KF5_MIN_VERSION "5.6.0") + # Release script will create bugzilla versions + project(konsole VERSION ${RELEASE_SERVICE_VERSION}) + +-find_program(CCACHE_FOUND "ccache") +-set(CCACHE_SUPPORT ON CACHE BOOL "Enable ccache support") +-if (CCACHE_FOUND AND CCACHE_SUPPORT) +- if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" # GNU is GNU GCC +- OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") +- # without this compiler messages in `make` backend would be uncolored +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fdiagnostics-color=auto") +- endif() +- set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "ccache") +- set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK "ccache") +-endif() +- + find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE) + set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH}) + +-- +2.25.1 + diff --git a/kde-apps/konsole/konsole-19.12.3.ebuild b/kde-apps/konsole/konsole-19.12.3.ebuild index 5b2e6ae45ff..a0cd125f570 100644 --- a/kde-apps/konsole/konsole-19.12.3.ebuild +++ b/kde-apps/konsole/konsole-19.12.3.ebuild @@ -53,7 +53,10 @@ DEPEND=" " RDEPEND="${DEPEND}" -PATCHES=( "${FILESDIR}/${PN}-19.12.2-darkbackground-detect.patch" ) +PATCHES=( + "${FILESDIR}/${PN}-19.12.2-darkbackground-detect.patch" + "${FILESDIR}/${P}-no-ccache.patch" +) src_configure() { local mycmakeargs=(