diff options
Diffstat (limited to 'dev-util/kdevelop')
| -rw-r--r-- | dev-util/kdevelop/files/kdevelop-25.12.1-file-collision.patch | 2 | ||||
| -rw-r--r-- | dev-util/kdevelop/kdevelop-25.08.3-r1.ebuild (renamed from dev-util/kdevelop/kdevelop-25.08.3.ebuild) | 14 | ||||
| -rw-r--r-- | dev-util/kdevelop/kdevelop-25.12.1-r1.ebuild | 4 | ||||
| -rw-r--r-- | dev-util/kdevelop/kdevelop-25.12.1.ebuild | 130 |
4 files changed, 18 insertions, 132 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 <asturm@gentoo.org> 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.08.3.ebuild b/dev-util/kdevelop/kdevelop-25.08.3-r1.ebuild index 9e3831d1ed47..7bbe686412c3 100644 --- a/dev-util/kdevelop/kdevelop-25.08.3.ebuild +++ b/dev-util/kdevelop/kdevelop-25.08.3-r1.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() { 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 diff --git a/dev-util/kdevelop/kdevelop-25.12.1.ebuild b/dev-util/kdevelop/kdevelop-25.12.1.ebuild deleted file mode 100644 index 128343798ca0..000000000000 --- a/dev-util/kdevelop/kdevelop-25.12.1.ebuild +++ /dev/null @@ -1,130 +0,0 @@ -# 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 -) - -src_prepare() { - rm -r plugins/qmljs || die # bug 960669, unused upstream - ecm_src_prepare -} - -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 -} |
