From 96ad25ea4112f008ce294d0ab9c2ebabb15026e1 Mon Sep 17 00:00:00 2001 From: Sughosha Date: Wed, 1 Oct 2025 21:51:51 +0530 Subject: [PATCH] gnu: kdevelop: Move to kde-sdk.scm. * gnu/packages/kde.scm (kdevelop): Remove variable. * gnu/packages/kde-sdk.scm (kdevelop): New variable. Change-Id: Ic0130f66cc566082e4508eb74c95c4c04247f6fc --- gnu/packages/kde-sdk.scm | 96 +++++++++++++++++++++++++++++++++++++++- gnu/packages/kde.scm | 93 +------------------------------------- 2 files changed, 97 insertions(+), 92 deletions(-) diff --git a/gnu/packages/kde-sdk.scm b/gnu/packages/kde-sdk.scm index 65cb8ec8b970e19d2d90cf39ea4e70b492b8ae99..643fd1840d7313bdec858ffbf40acef19f420563 100644 --- a/gnu/packages/kde-sdk.scm +++ b/gnu/packages/kde-sdk.scm @@ -26,9 +26,16 @@ #:use-module (gnu packages) #:use-module (gnu packages bison) #:use-module (gnu packages flex) + #:use-module (gnu packages apr) + #:use-module (gnu packages boost) + #:use-module (gnu packages code) + #:use-module (gnu packages freedesktop) #:use-module (gnu packages kde) #:use-module (gnu packages kde-frameworks) - #:use-module (gnu packages qt)) + #:use-module (gnu packages llvm) + #:use-module (gnu packages pkg-config) + #:use-module (gnu packages qt) + #:use-module (gnu packages version-control)) (define-public kapptemplate (package @@ -93,3 +100,90 @@ structure. It features: (description "KDevelop-PG-Qt is the parser generator used in KDevplatform for some KDevelop language plugins (Ruby, PHP, CSS...).") (license license:lgpl2.0+))) + +(define-public kdevelop + (package + (name "kdevelop") + (version "24.12.1") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://kde/stable/release-service/" version + "/src/kdevelop-" version ".tar.xz")) + (sha256 + (base32 "17g170cacdqgvxb8csd4ifv4jc0dcam7xki690hm8jw55rfpa2z9")))) + (build-system qt-build-system) + (native-inputs + (list extra-cmake-modules pkg-config shared-mime-info qttools)) + (inputs (list boost + clang + grantlee + karchive + kcmutils + kcrash + kdeclarative + kguiaddons + ki18n + kiconthemes + kio ;; not checked as requirement + kitemmodels + kitemviews + kjobwidgets + knotifications + knotifyconfig + kparts + kservice + ksyntaxhighlighting + ktexteditor + ktexttemplate + ktextwidgets + kwindowsystem + kxmlgui + libkomparediff2 + breeze-icons + qt5compat + qtdeclarative + qtwebengine + threadweaver + ;; recommendes + astyle + kdevelop-pg-qt + + ;; optional + apr ; required for subversion support + apr-util ; required for subversion support + attica + kconfigwidgets + knewstuff + krunner + ;; TODO: OktetaGui, OktetaKastenControllers + libplasma + ;; TODO: purpose + sonnet + subversion)) + ;; run-time packages - TODO + ;; ClazyStandalone + ;; Cppcheck + ;; heaptrack + ;; heaptrack_gui + ;; meson + (arguments + (list #:qtbase qtbase + #:tests? #f ;; there are some issues with the test suite + #:phases + #~(modify-phases %standard-phases + (add-before 'configure 'add-include-path + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "plugins/clang/Locate_CLANG_BUILTIN_DIR.cmake" + (("\"\\$[{]CLANG_INCLUDE_DIRS[}]\"" line) + (string-append + line " \"" + (assoc-ref inputs "clang") "/lib\"")))))))) + (home-page "https://kdevelop.org") + (synopsis "IDE for C, C++, Python, Javascript and PHP") + (description "The KDevelop IDE provides semantic syntax highlighting, as +well as code navigation and completion for C, C++ (using Clang/LLVM), QML, +JavaScript, Python and PHP. It also integrates with a debugger, different +build systems (CMake, QMake, custom Makefiles) and version control +software (Git, Subversion, Mercurial, CVS and Bazaar).") + (license license:lgpl2.1+))) diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index c084cfba5b588801efb168afbd7d0f3d88f9a189..e0ce84d0262c93401783a701d6f57a17e82cab28 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -48,7 +48,6 @@ #:use-module (guix packages) #:use-module (gnu packages) #:use-module (gnu packages algebra) - #:use-module (gnu packages apr) #:use-module (gnu packages astronomy) #:use-module (gnu packages audio) #:use-module (gnu packages autotools) @@ -57,7 +56,7 @@ #:use-module (gnu packages bison) #:use-module (gnu packages boost) #:use-module (gnu packages check) - #:use-module (gnu packages code) + #:use-module (gnu packages cpp) #:use-module (gnu packages compression) #:use-module (gnu packages cpp) #:use-module (gnu packages curl) @@ -83,10 +82,9 @@ #:use-module (gnu packages kde-frameworks) #:use-module (gnu packages kde-pim) #:use-module (gnu packages kde-plasma) - #:use-module (gnu packages kde-sdk) ;; Including this module breaks the build. ;#:use-module ((gnu packages kde-systemtools) #:select (dolphin)) - #:use-module (gnu packages llvm) + #:use-module (gnu packages libusb) #:use-module (gnu packages markup) #:use-module (gnu packages maths) #:use-module (gnu packages ncurses) @@ -395,93 +393,6 @@ of 2D and 3D functions and to calculate easy (and not so easy) calculations, such as addition, trigonometric functions or derivatives.") (license license:gpl2+))) -(define-public kdevelop - (package - (name "kdevelop") - (version "24.12.1") - (source - (origin - (method url-fetch) - (uri (string-append "mirror://kde/stable/release-service/" version - "/src/kdevelop-" version ".tar.xz")) - (sha256 - (base32 "17g170cacdqgvxb8csd4ifv4jc0dcam7xki690hm8jw55rfpa2z9")))) - (build-system qt-build-system) - (native-inputs - (list extra-cmake-modules pkg-config shared-mime-info qttools)) - (inputs (list boost - clang - grantlee - karchive - kcmutils - kcrash - kdeclarative - kguiaddons - ki18n - kiconthemes - kio ;; not checked as requirement - kitemmodels - kitemviews - kjobwidgets - knotifications - knotifyconfig - kparts - kservice - ksyntaxhighlighting - ktexteditor - ktexttemplate - ktextwidgets - kwindowsystem - kxmlgui - libkomparediff2 - breeze-icons - qt5compat - qtdeclarative - qtwebengine - threadweaver - ;; recommendes - astyle - kdevelop-pg-qt - - ;; optional - apr ; required for subversion support - apr-util ; required for subversion support - attica - kconfigwidgets - knewstuff - krunner - ;; TODO: OktetaGui, OktetaKastenControllers - libplasma - ;; TODO: purpose - sonnet - subversion)) - ;; run-time packages - TODO - ;; ClazyStandalone - ;; Cppcheck - ;; heaptrack - ;; heaptrack_gui - ;; meson - (arguments - (list #:qtbase qtbase - #:tests? #f ;; there are some issues with the test suite - #:phases - #~(modify-phases %standard-phases - (add-before 'configure 'add-include-path - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "plugins/clang/Locate_CLANG_BUILTIN_DIR.cmake" - (("\"\\$[{]CLANG_INCLUDE_DIRS[}]\"" line) - (string-append - line " \"" - (assoc-ref inputs "clang") "/lib\"")))))))) - (home-page "https://kdevelop.org") - (synopsis "IDE for C, C++, Python, Javascript and PHP") - (description "The KDevelop IDE provides semantic syntax highlighting, as -well as code navigation and completion for C, C++ (using Clang/LLVM), QML, -JavaScript, Python and PHP. It also integrates with a debugger, different -build systems (CMake, QMake, custom Makefiles) and version control -software (Git, Subversion, Mercurial, CVS and Bazaar).") - (license license:lgpl2.1+))) - (define-public kdiagram (package (name "kdiagram")