commit: a0fcd23aed9e9d52ee4be17374d931dce8294f4e 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: Sun Jan 11 19:00:05 2026 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0fcd23a
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> .../files/kdevelop-25.12.1-file-collision.patch | 40 ++++++ dev-util/kdevelop/kdevelop-25.12.1-r1.ebuild | 141 +++++++++++++++++++++ 2 files changed, 181 insertions(+) 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 new file mode 100644 index 000000000000..e79109f49a99 --- /dev/null +++ b/dev-util/kdevelop/files/kdevelop-25.12.1-file-collision.patch @@ -0,0 +1,40 @@ +From db8009842bd13233ff1324c393469a6ce6af1528 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 + icon names + +At least with thunar-vcs-plugin a known collision exists. + +Signed-off-by: Andreas Sturmlechner <[email protected]> +--- + plugins/subversion/icons/CMakeLists.txt | 2 +- + plugins/subversion/kdevsubversion.json | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/plugins/subversion/icons/CMakeLists.txt b/plugins/subversion/icons/CMakeLists.txt +index 92d6b6bdff..ac57bd0633 100644 +--- a/plugins/subversion/icons/CMakeLists.txt ++++ b/plugins/subversion/icons/CMakeLists.txt +@@ -1,4 +1,4 @@ + +-ecm_install_icons(ICONS 16-apps-subversion.png 32-apps-subversion.png 64-apps-subversion.png sc-apps-subversion.svg ++ecm_install_icons(ICONS 16-apps-kdevsubversion.png 32-apps-kdevsubversion.png 64-apps-kdevsubversion.png sc-apps-kdevsubversion.svg + DESTINATION ${KDE_INSTALL_ICONDIR} + THEME hicolor) +diff --git a/plugins/subversion/kdevsubversion.json b/plugins/subversion/kdevsubversion.json +index 9a8650b93f..3c5d9df512 100644 +--- a/plugins/subversion/kdevsubversion.json ++++ b/plugins/subversion/kdevsubversion.json +@@ -71,7 +71,7 @@ + "Description[uk]": "Цей додаток інтегрує Subversion із KDevelop.", + "Description[zh_CN]": "此插件将 Subversion 整合到 KDevelop。", + "Description[zh_TW]": "此外掛程式將 Subversion 整合進 KDevelop 內", +- "Icon": "subversion", ++ "Icon": "kdevsubversion", + "License": "GPL", + "Name": "Subversion Support", + "Name[ar]": "دعم Subversion", +-- +2.52.0 + diff --git a/dev-util/kdevelop/kdevelop-25.12.1-r1.ebuild b/dev-util/kdevelop/kdevelop-25.12.1-r1.ebuild new file mode 100644 index 000000000000..13ccbb944576 --- /dev/null +++ b/dev-util/kdevelop/kdevelop-25.12.1-r1.ebuild @@ -0,0 +1,141 @@ +# Copyright 1999-2026 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +CMAKE_QA_COMPAT_SKIP=1 # bug 964762 +ECM_HANDBOOK="optional" +ECM_TEST="true" +KDE_ORG_CATEGORY="kdevelop" +KFMIN=6.19.0 +LLVM_COMPAT=( 15 16 17 18 19 20 21 ) +QTMIN=6.9.1 +inherit ecm gear.kde.org llvm-r2 optfeature xdg + +DESCRIPTION="Integrated Development Environment, supporting KF6/Qt, C/C++ and much more" +HOMEPAGE="https://kdevelop.org/"; + +LICENSE="GPL-2 LGPL-2" +SLOT="6/$(ver_cut 1-2)" +KEYWORDS="~amd64 ~arm64" +IUSE="gdbui plasma +qmake +share subversion" + +# UPSTREAM: not ported yet, check plugins/CMakeLists.txt +# IUSE="hex" +# hex? ( app-editors/okteta:6 ) +COMMON_DEPEND=" + >=dev-qt/qt5compat-${QTMIN}:6 + >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,widgets,xml] + >=dev-qt/qtdeclarative-${QTMIN}:6[widgets] + >=dev-qt/qttools-${QTMIN}:6[assistant] + >=dev-qt/qtwebengine-${QTMIN}:6[widgets] + >=dev-util/astyle-3.1:= + kde-apps/libkomparediff2:6 + >=kde-frameworks/karchive-${KFMIN}:6 + >=kde-frameworks/kbookmarks-${KFMIN}:6 + >=kde-frameworks/kcmutils-${KFMIN}:6 + >=kde-frameworks/kcodecs-${KFMIN}:6 + >=kde-frameworks/kcompletion-${KFMIN}:6 + >=kde-frameworks/kconfig-${KFMIN}:6 + >=kde-frameworks/kconfigwidgets-${KFMIN}:6 + >=kde-frameworks/kcoreaddons-${KFMIN}:6 + >=kde-frameworks/kcrash-${KFMIN}:6 + >=kde-frameworks/kguiaddons-${KFMIN}:6 + >=kde-frameworks/ki18n-${KFMIN}:6 + >=kde-frameworks/kiconthemes-${KFMIN}:6 + >=kde-frameworks/kio-${KFMIN}:6 + >=kde-frameworks/kitemmodels-${KFMIN}:6 + >=kde-frameworks/kitemviews-${KFMIN}:6 + >=kde-frameworks/kjobwidgets-${KFMIN}:6 + >=kde-frameworks/knewstuff-${KFMIN}:6 + >=kde-frameworks/knotifications-${KFMIN}:6 + >=kde-frameworks/knotifyconfig-${KFMIN}:6 + >=kde-frameworks/kparts-${KFMIN}:6 + >=kde-frameworks/kservice-${KFMIN}:6 + >=kde-frameworks/ktexteditor-${KFMIN}:6 + >=kde-frameworks/ktexttemplate-${KFMIN}:6 + >=kde-frameworks/ktextwidgets-${KFMIN}:6 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:6 + >=kde-frameworks/kwindowsystem-${KFMIN}:6 + >=kde-frameworks/kxmlgui-${KFMIN}:6 + >=kde-frameworks/sonnet-${KFMIN}:6 + >=kde-frameworks/threadweaver-${KFMIN}:6 + $(llvm_gen_dep 'llvm-core/clang:${LLVM_SLOT}') + gdbui? ( kde-plasma/libksysguard:6= ) + plasma? ( + >=kde-frameworks/krunner-${KFMIN}:6 + kde-plasma/libplasma:6 + ) + qmake? ( >=dev-util/kdevelop-pg-qt-2.4.0:0 ) + share? ( >=kde-frameworks/purpose-${KFMIN}:6 ) + subversion? ( + dev-libs/apr:1 + dev-libs/apr-util:1 + dev-vcs/subversion + ) +" +DEPEND="${COMMON_DEPEND} + dev-libs/boost + >=dev-qt/qtbase-${QTMIN}:6[concurrent] +" +RDEPEND="${COMMON_DEPEND} + app-alternatives/ninja + >=dev-debug/gdb-7.0[python] + >=dev-qt/qttools-${QTMIN}:6[qdbus] + kde-apps/kapptemplate:* + kde-apps/kio-extras:6 +" + +CMAKE_SKIP_TESTS=( + # D-Bus required + test_{{project,session}controller,midbus,definesandincludes,kdevgit} + test_{compilerprovider,cmakemanager,ctestfindsuites,cmakefileapi} + test_{custombuildsystemplugin,qmakeproject,projectload,craftruntime} + bench_codecompletion # segfaults + test_gdb # FIXME: fails to launch xterm (if found) + test_{path,generationtest} # FIXME: whatever that does, does not work +) + +PATCHES=( "${FILESDIR}/${P}-file-collision.patch" ) # bug #963324 pt.1 + +src_prepare() { + rm -r plugins/qmljs || die # bug 960669, unused upstream + ecm_src_prepare + + # bug #963324 pt.2 + pushd plugins/subversion/icons > /dev/null || die + local icon + for icon in 16 32 64; do + mv ${icon}-apps-{,kdev}subversion.png || die + done + mv sc-apps-{,kdev}subversion.svg || die + popd > /dev/null || die +} + +src_configure() { + local mycmakeargs=( + -DLLVM_ROOT="$(get_llvm_prefix)" + $(cmake_use_find_package gdbui KSysGuard) + -DBUILD_executeplasmoid=$(usex plasma) + $(cmake_use_find_package plasma Plasma) + $(cmake_use_find_package qmake KDevelopPGQt) + $(cmake_use_find_package share KF6Purpose) + $(cmake_use_find_package subversion SubversionLibrary) + ) +# $(cmake_use_find_package hex OktetaKastenControllers) + + ecm_src_configure +} + +pkg_postinst() { + if [[ -z "${REPLACING_VERSIONS}" ]]; then + optfeature "konsole view" "kde-apps/konsole:6" + optfeature "static C++ Qt code analysis" dev-util/clazy + optfeature "static C/C++ code analysis" dev-util/cppcheck + optfeature "heap memory profiling" "dev-util/heaptrack[gui]" + optfeature "meson project manager plugin" dev-build/meson + optfeature "formatting configurations via customscript plugin" dev-util/indent + optfeature "formatting configurations via customscript plugin" dev-util/uncrustify + fi + xdg_pkg_postinst +}
