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 B9781138334 for ; Mon, 4 Mar 2019 10:36:01 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AEF26E07D3; Mon, 4 Mar 2019 10:35:59 +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 6DAA1E07D3 for ; Mon, 4 Mar 2019 10:35:59 +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 B5143335CDE for ; Mon, 4 Mar 2019 10:35:57 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 04EDA527 for ; Mon, 4 Mar 2019 10:35:56 +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: <1551695744.9b044400b13f99364e1e5526699dde2d46f23baa.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: kde-misc/kdiff3/, kde-misc/kdiff3/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: kde-misc/kdiff3/files/kdiff3-0.9.98_p20190224-clangtidy-optional.patch kde-misc/kdiff3/kdiff3-0.9.98_p20190224.ebuild X-VCS-Directories: kde-misc/kdiff3/files/ kde-misc/kdiff3/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 9b044400b13f99364e1e5526699dde2d46f23baa X-VCS-Branch: master Date: Mon, 4 Mar 2019 10:35:56 +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: 391b127e-a1c2-4ffb-bf37-5152f222752a X-Archives-Hash: ce169a5d6c03815667d8c4bb7731c360 commit: 9b044400b13f99364e1e5526699dde2d46f23baa Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Mar 4 10:33:51 2019 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Mar 4 10:35:44 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b044400 kde-misc/kdiff3: Disable clang-tidy for standard build Package-Manager: Portage-2.3.62, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner gentoo.org> ...diff3-0.9.98_p20190224-clangtidy-optional.patch | 34 ++++++++++++++++++++++ kde-misc/kdiff3/kdiff3-0.9.98_p20190224.ebuild | 2 ++ 2 files changed, 36 insertions(+) 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 +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}"