summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2020-03-24 00:56:09 +0100
committerAndreas Sturmlechner <asturm@gentoo.org>2020-03-24 00:56:09 +0100
commit6d0bc899f71f6c139a9020dd3ab75a0b41e54621 (patch)
treee52bb9b18332f735c90bac1678da5f699ebccdb7
parentapp-pda/usbmuxd: Bump to pre-1.1.1 snapshot, EAPI 7 (diff)
downloadgentoo-6d0bc899f71f6c139a9020dd3ab75a0b41e54621.tar.gz
gentoo-6d0bc899f71f6c139a9020dd3ab75a0b41e54621.tar.bz2
gentoo-6d0bc899f71f6c139a9020dd3ab75a0b41e54621.zip
kde-apps/konsole: Revert upstream ccache auto-detection
Package-Manager: Portage-2.3.93, Repoman-2.3.20 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
-rw-r--r--kde-apps/konsole/files/konsole-19.12.3-no-ccache.patch45
-rw-r--r--kde-apps/konsole/konsole-19.12.3.ebuild5
2 files changed, 49 insertions, 1 deletions
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 <asturm@gentoo.org>
+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=(