summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2019-03-04 11:33:51 +0100
committerAndreas Sturmlechner <asturm@gentoo.org>2019-03-04 11:35:44 +0100
commit9b044400b13f99364e1e5526699dde2d46f23baa (patch)
treef8edba71d35b7e589c4a3e5cee6fd76ac6fc2fe9
parentapp-arch/cabextract: Removed old. (diff)
downloadgentoo-9b044400.tar.gz
gentoo-9b044400.tar.bz2
gentoo-9b044400.zip
kde-misc/kdiff3: Disable clang-tidy for standard build
Package-Manager: Portage-2.3.62, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
-rw-r--r--kde-misc/kdiff3/files/kdiff3-0.9.98_p20190224-clangtidy-optional.patch34
-rw-r--r--kde-misc/kdiff3/kdiff3-0.9.98_p20190224.ebuild2
2 files changed, 36 insertions, 0 deletions
diff --git a/kde-misc/kdiff3/files/kdiff3-0.9.98_p20190224-clangtidy-optional.patch b/kde-misc/kdiff3/files/kdiff3-0.9.98_p20190224-clangtidy-optional.patch
new file mode 100644
index 00000000000..a2a5f54f7d1
--- /dev/null
+++ b/kde-misc/kdiff3/files/kdiff3-0.9.98_p20190224-clangtidy-optional.patch
@@ -0,0 +1,34 @@
+From 26657d8bf425415c97801fe976939329f11c3979 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Mon, 4 Mar 2019 11:21:31 +0100
+Subject: [PATCH] Optionalise clang-tidy
+
+It should not be run as part of a standard build.
+---
+ CMakeLists.txt | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b1d72a7..2e8bad4 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -50,6 +50,7 @@ find_package(
+ IconThemes
+ )
+
++option(ENABLE_CLANG_TIDY "Run clang-tidy if available and cmake version >=3.6" OFF)
+
+ set(KDiff3_LIBRARIES ${Qt5PrintSupport_LIBRARIES} KF5::I18n KF5::CoreAddons KF5::Crash KF5::IconThemes )
+
+@@ -68,7 +69,7 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
+ endif()
+
+ #new in cmake 3.6+ integrate clang-tidy
+-if(NOT ${CMAKE_VERSION} VERSION_LESS "3.6.0")
++if(ENABLE_CLANG_TIDY AND NOT ${CMAKE_VERSION} VERSION_LESS "3.6.0")
+ find_program(CLANG_TIDY_EXE NAMES "clang-tidy" "clang-tidy-7" "clang-tidy-6.0" "clang-tidy-6" DOC "Path to clang-tidy executable")
+ if(NOT CLANG_TIDY_EXE)
+ message(STATUS "clang-tidy not found disabling integration.")
+--
+2.21.0
+
diff --git a/kde-misc/kdiff3/kdiff3-0.9.98_p20190224.ebuild b/kde-misc/kdiff3/kdiff3-0.9.98_p20190224.ebuild
index 13049219f43..43713fc03ec 100644
--- a/kde-misc/kdiff3/kdiff3-0.9.98_p20190224.ebuild
+++ b/kde-misc/kdiff3/kdiff3-0.9.98_p20190224.ebuild
@@ -36,4 +36,6 @@ RDEPEND="${DEPEND}
!kde-misc/kdiff3:4
"
+PATCHES=( "${FILESDIR}/${P}-clangtidy-optional.patch" )
+
S="${WORKDIR}/${PN}-${COMMIT}"