commit: 1f64ddbe2798e0512796242a0d7870876f2b9bf8 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sun Jan 11 18:12:01 2026 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Mon Jan 12 19:43:24 2026 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f64ddbe
dev-util/kdevelop: Avoid file collision from too general icon name Bug: https://bugs.gentoo.org/963324 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> dev-util/kdevelop/files/kdevelop-25.12.1-file-collision.patch | 2 +- ...{kdevelop-25.12.1-r1.ebuild => kdevelop-25.08.3-r1.ebuild} | 11 +++++++---- dev-util/kdevelop/kdevelop-25.12.1-r1.ebuild | 4 +++- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/dev-util/kdevelop/files/kdevelop-25.12.1-file-collision.patch b/dev-util/kdevelop/files/kdevelop-25.12.1-file-collision.patch index e79109f49a99..73a8898c8ced 100644 --- a/dev-util/kdevelop/files/kdevelop-25.12.1-file-collision.patch +++ b/dev-util/kdevelop/files/kdevelop-25.12.1-file-collision.patch @@ -1,4 +1,4 @@ -From db8009842bd13233ff1324c393469a6ce6af1528 Mon Sep 17 00:00:00 2001 +From e6ddd0d04ed7ae94224f2345ee5e49e7b9b5f93f Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner <[email protected]> Date: Fri, 9 Jan 2026 22:29:06 +0100 Subject: [PATCH] Avoid file collision with other applications by too general diff --git a/dev-util/kdevelop/kdevelop-25.12.1-r1.ebuild b/dev-util/kdevelop/kdevelop-25.08.3-r1.ebuild similarity index 96% copy from dev-util/kdevelop/kdevelop-25.12.1-r1.ebuild copy to dev-util/kdevelop/kdevelop-25.08.3-r1.ebuild index 13ccbb944576..7bbe686412c3 100644 --- a/dev-util/kdevelop/kdevelop-25.12.1-r1.ebuild +++ b/dev-util/kdevelop/kdevelop-25.08.3-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2026 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -7,7 +7,7 @@ CMAKE_QA_COMPAT_SKIP=1 # bug 964762 ECM_HANDBOOK="optional" ECM_TEST="true" KDE_ORG_CATEGORY="kdevelop" -KFMIN=6.19.0 +KFMIN=6.16.0 LLVM_COMPAT=( 15 16 17 18 19 20 21 ) QTMIN=6.9.1 inherit ecm gear.kde.org llvm-r2 optfeature xdg @@ -17,7 +17,7 @@ HOMEPAGE="https://kdevelop.org/"; LICENSE="GPL-2 LGPL-2" SLOT="6/$(ver_cut 1-2)" -KEYWORDS="~amd64 ~arm64" +KEYWORDS="amd64 arm64" IUSE="gdbui plasma +qmake +share subversion" # UPSTREAM: not ported yet, check plugins/CMakeLists.txt @@ -96,7 +96,10 @@ CMAKE_SKIP_TESTS=( test_{path,generationtest} # FIXME: whatever that does, does not work ) -PATCHES=( "${FILESDIR}/${P}-file-collision.patch" ) # bug #963324 pt.1 +PATCHES=( + # bug #963324 pt.1, git master + "${FILESDIR}/${PN}-25.12.1-file-collision.patch" +) src_prepare() { rm -r plugins/qmljs || die # bug 960669, unused upstream diff --git a/dev-util/kdevelop/kdevelop-25.12.1-r1.ebuild b/dev-util/kdevelop/kdevelop-25.12.1-r1.ebuild index 13ccbb944576..4761c033d7d7 100644 --- a/dev-util/kdevelop/kdevelop-25.12.1-r1.ebuild +++ b/dev-util/kdevelop/kdevelop-25.12.1-r1.ebuild @@ -96,7 +96,9 @@ CMAKE_SKIP_TESTS=( test_{path,generationtest} # FIXME: whatever that does, does not work ) -PATCHES=( "${FILESDIR}/${P}-file-collision.patch" ) # bug #963324 pt.1 +PATCHES=( + "${FILESDIR}/${P}-file-collision.patch" # bug #963324 pt.1, git master +) src_prepare() { rm -r plugins/qmljs || die # bug 960669, unused upstream
