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 E749C15802F for ; Wed, 29 Mar 2023 13:32:36 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1CA402BC005; Wed, 29 Mar 2023 13:32:36 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 E4C882BC005 for ; Wed, 29 Mar 2023 13:32:35 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1E5653412FB for ; Wed, 29 Mar 2023 13:32:35 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8B3768E5 for ; Wed, 29 Mar 2023 13:32:32 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1680096745.4452c53936e4eb6df13f7b28961b4b4857420c85.sam@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: dev-util/kdevelop/files/, dev-util/kdevelop/ X-VCS-Repository: proj/kde X-VCS-Files: dev-util/kdevelop/files/kdevelop-22.12.3-clang16.patch dev-util/kdevelop/kdevelop-23.03.80.ebuild dev-util/kdevelop/kdevelop-23.04.49.9999.ebuild dev-util/kdevelop/kdevelop-9999.ebuild X-VCS-Directories: dev-util/kdevelop/files/ dev-util/kdevelop/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 4452c53936e4eb6df13f7b28961b4b4857420c85 X-VCS-Branch: master Date: Wed, 29 Mar 2023 13:32:32 +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: fc7d87d4-5efd-44ef-b232-b807cb99a145 X-Archives-Hash: d7597387bbebde1ffc1790ab8093ee61 commit: 4452c53936e4eb6df13f7b28961b4b4857420c85 Author: Sam James gentoo org> AuthorDate: Wed Mar 29 13:31:48 2023 +0000 Commit: Sam James gentoo org> CommitDate: Wed Mar 29 13:32:25 2023 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=4452c539 dev-util/kdevelop: drop obsolete clang 16 patch Fixed upstream in 1a92bed73ae31e6f90c3bffe455f8e3c46ac4905 by using the proper FindClang module. Fixed on both the 23.03 branch & master. Bug: https://bugs.gentoo.org/902101 Signed-off-by: Sam James gentoo.org> .../kdevelop/files/kdevelop-22.12.3-clang16.patch | 24 ---------------------- dev-util/kdevelop/kdevelop-23.03.80.ebuild | 4 ---- dev-util/kdevelop/kdevelop-23.04.49.9999.ebuild | 4 ---- dev-util/kdevelop/kdevelop-9999.ebuild | 4 ---- 4 files changed, 36 deletions(-) diff --git a/dev-util/kdevelop/files/kdevelop-22.12.3-clang16.patch b/dev-util/kdevelop/files/kdevelop-22.12.3-clang16.patch deleted file mode 100644 index 38676cc164..0000000000 --- a/dev-util/kdevelop/files/kdevelop-22.12.3-clang16.patch +++ /dev/null @@ -1,24 +0,0 @@ -https://bugs.gentoo.org/902101 ---- a/cmake/modules/FindClang.cmake -+++ b/cmake/modules/FindClang.cmake -@@ -97,6 +97,8 @@ - # dito for git - string(REPLACE "git" "" CLANG_VERSION_CLEAN "${CLANG_VERSION}") - -+ string(REGEX REPLACE "([.]0)+$" "" CLANG_VERSION_STRIPPED "${CLANG_VERSION}") -+ string(REGEX REPLACE "([.]0)+$" "" CLANG_VERSION_CLEAN_STRIPPED "${CLANG_VERSION_CLEAN}") - find_path(CLANG_BUILTIN_DIR - # cpuid.h because it is defined in ClangSupport constructor as valid clang builtin dir indicator - NAMES "cpuid.h" -@@ -106,6 +108,10 @@ - "../../../clang/${CLANG_VERSION}/include" - "clang/${CLANG_VERSION_CLEAN}/include" - "../../../clang/${CLANG_VERSION_CLEAN}/include" -+ "clang/${CLANG_VERSION_STRIPPED}/include" -+ "../../../clang/${CLANG_VERSION_STRIPPED}/include" -+ "clang/${CLANG_VERSION_CLEAN_STRIPPED}/include" -+ "../../../clang/${CLANG_VERSION_CLEAN_STRIPPED}/include" - NO_DEFAULT_PATH - ) - - diff --git a/dev-util/kdevelop/kdevelop-23.03.80.ebuild b/dev-util/kdevelop/kdevelop-23.03.80.ebuild index 59cd6f2f22..d2848b6c73 100644 --- a/dev-util/kdevelop/kdevelop-23.03.80.ebuild +++ b/dev-util/kdevelop/kdevelop-23.03.80.ebuild @@ -96,10 +96,6 @@ RDEPEND="${COMMON_DEPEND} reviewboard? ( kde-apps/ktp-accounts-kcm:5 ) " -PATCHES=( - "${FILESDIR}"/${PN}-22.12.3-clang16.patch -) - llvm_check_deps() { has_version -d "sys-devel/clang:${LLVM_SLOT}" } diff --git a/dev-util/kdevelop/kdevelop-23.04.49.9999.ebuild b/dev-util/kdevelop/kdevelop-23.04.49.9999.ebuild index 9b93334c07..912f2c6e53 100644 --- a/dev-util/kdevelop/kdevelop-23.04.49.9999.ebuild +++ b/dev-util/kdevelop/kdevelop-23.04.49.9999.ebuild @@ -96,10 +96,6 @@ RDEPEND="${COMMON_DEPEND} reviewboard? ( kde-apps/ktp-accounts-kcm:5 ) " -PATCHES=( - "${FILESDIR}"/${PN}-22.12.3-clang16.patch -) - llvm_check_deps() { has_version -d "sys-devel/clang:${LLVM_SLOT}" } diff --git a/dev-util/kdevelop/kdevelop-9999.ebuild b/dev-util/kdevelop/kdevelop-9999.ebuild index 9b93334c07..912f2c6e53 100644 --- a/dev-util/kdevelop/kdevelop-9999.ebuild +++ b/dev-util/kdevelop/kdevelop-9999.ebuild @@ -96,10 +96,6 @@ RDEPEND="${COMMON_DEPEND} reviewboard? ( kde-apps/ktp-accounts-kcm:5 ) " -PATCHES=( - "${FILESDIR}"/${PN}-22.12.3-clang16.patch -) - llvm_check_deps() { has_version -d "sys-devel/clang:${LLVM_SLOT}" }