commit: a3d6ea65f29e45886a91ba6aac849a1176c123f6 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:38:20 2026 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=a3d6ea65
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.49.9999.ebuild | 14 ++++++++ 2 files changed, 54 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 0000000000..73a8898c8c --- /dev/null +++ b/dev-util/kdevelop/files/kdevelop-25.12.1-file-collision.patch @@ -0,0 +1,40 @@ +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 + 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.49.9999.ebuild b/dev-util/kdevelop/kdevelop-25.12.49.9999.ebuild index 412d773d89..7adda19160 100644 --- a/dev-util/kdevelop/kdevelop-25.12.49.9999.ebuild +++ b/dev-util/kdevelop/kdevelop-25.12.49.9999.ebuild @@ -96,9 +96,23 @@ CMAKE_SKIP_TESTS=( test_{path,generationtest} # FIXME: whatever that does, does not work ) +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 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() {
