From 30a174fefaf9d669079fe191c7ea6cc2e91a0315 Mon Sep 17 00:00:00 2001 From: Sughosha Date: Fri, 3 Oct 2025 07:25:29 +0530 Subject: [PATCH] gnu: libplasma: Move to kde-plasma.scm. * gnu/packages/kde-frameworks.scm (libplasma): Remove. * gnu/packages/kde-plasma.scm (libplasma): New variable. * gnu/packages/fcix5: Use (gnu packages kde-plasma) module. * gnu/packages/kde-games: Ditto. * gnu/packages/kde-sdk.scm: Ditto. Change-Id: Id092e016458959547ef8e86797ede949a1bf79e2 --- gnu/packages/fcitx5.scm | 1 + gnu/packages/kde-frameworks.scm | 63 -------------------------------- gnu/packages/kde-games.scm | 1 + gnu/packages/kde-plasma.scm | 64 +++++++++++++++++++++++++++++++++ gnu/packages/kde-sdk.scm | 1 + 5 files changed, 67 insertions(+), 63 deletions(-) diff --git a/gnu/packages/fcitx5.scm b/gnu/packages/fcitx5.scm index 55be42634540f5a0cb49d592697c9d0b5467de01..780775598e16a7fde0dd79f07fa502c712a9475a 100644 --- a/gnu/packages/fcitx5.scm +++ b/gnu/packages/fcitx5.scm @@ -45,6 +45,7 @@ #:use-module (gnu packages ibus) #:use-module (gnu packages iso-codes) #:use-module (gnu packages kde-frameworks) + #:use-module (gnu packages kde-plasma) #:use-module (gnu packages language) #:use-module (gnu packages libevent) #:use-module (gnu packages linux) diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index b2742bc46fb8dbbfcc1440c94cd01b5fce03c2b1..e1458311d2ef373d0e3f215dff068bd8095c7cf7 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -5024,69 +5024,6 @@ descriptions for integrating actions from plugins.") (setenv "QT_QPA_PLATFORM" "offscreen") ;; These tests fail (invoke "ctest" "-E" "(ktoolbar_unittest|kxmlgui_unittest)"))))))))) -(define-public libplasma - (package - (name "libplasma") - (version "6.4.3") - (source (origin - (method url-fetch) - (uri (string-append "mirror://kde/stable/plasma/" - version "/" name "-" - version ".tar.xz")) - (sha256 - (base32 - "1j0cpf9bikrk02i7pdwf3fia2h741rh9a4g3wmi4849asg7cw27m")))) - (build-system qt-build-system) - (propagated-inputs - (list kpackage kwindowsystem)) - (native-inputs - (list extra-cmake-modules kdoctools pkg-config - gettext-minimal - ;; for wayland-scanner - wayland)) - (inputs (list - karchive - kconfigwidgets - kglobalaccel - kguiaddons - kiconthemes - kirigami - kio - ki18n - kcmutils - ksvg - kglobalaccel - knotifications - plasma-wayland-protocols - plasma-activities - qtdeclarative - qtsvg - qtwayland - wayland - libxkbcommon)) - (arguments - (list #:qtbase qtbase - #:phases - #~(modify-phases %standard-phases - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (setenv "HOME" (getcwd)) - (invoke "ctest" "-E" - (string-append "(plasma-dialogstatetest" - "|plasma-iconitemtest" - "|plasma-dialogqmltest" - "|plasma-themetest" - "|iconitemhidpitest" - "|bug485688test" - "|dialognativetest)")))))))) - (home-page "https://invent.kde.org/plasma/libplasma") - (synopsis "Libraries, components and tools of Plasma workspaces") - (description "The plasma framework provides QML components, libplasma and -script engines.") - ;; dual licensed - (license (list license:gpl2+ license:lgpl2.1+)))) - (define-public plasma-framework (package (name "plasma-framework") diff --git a/gnu/packages/kde-games.scm b/gnu/packages/kde-games.scm index 646735b55ede1f613459bbfd7cf0c3a460126895..4499b1b928385a8d941835b8226137383b3d9da3 100644 --- a/gnu/packages/kde-games.scm +++ b/gnu/packages/kde-games.scm @@ -38,6 +38,7 @@ #:use-module ((gnu packages freedesktop) #:select (shared-mime-info)) #:use-module (gnu packages kde) #:use-module (gnu packages kde-frameworks) + #:use-module (gnu packages kde-plasma) #:use-module (gnu packages perl) #:use-module (gnu packages pulseaudio) #:use-module (gnu packages python) diff --git a/gnu/packages/kde-plasma.scm b/gnu/packages/kde-plasma.scm index 66266d969e563334d79667b8976be09280078cdd..c478b84064dfb28fc69979fadac2871daa2dfdb5 100644 --- a/gnu/packages/kde-plasma.scm +++ b/gnu/packages/kde-plasma.scm @@ -51,6 +51,7 @@ #:use-module (gnu packages freedesktop) #:use-module (gnu packages gcc) #:use-module (gnu packages gdb) + #:use-module (gnu packages gettext) #:use-module (gnu packages ghostscript) #:use-module (gnu packages gnupg) #:use-module (gnu packages gl) @@ -102,6 +103,69 @@ #:use-module (gnu packages xml) #:use-module (gnu packages opencl)) +(define-public libplasma + (package + (name "libplasma") + (version "6.3.6") + (source (origin + (method url-fetch) + (uri (string-append "mirror://kde/stable/plasma/" + version "/" name "-" + version ".tar.xz")) + (sha256 + (base32 + "0i5k4w45gcm9kagawmskqbfcb4shajh59vrnbq09zi3hz78sxcxi")))) + (build-system qt-build-system) + (propagated-inputs + (list kpackage kwindowsystem)) + (native-inputs + (list extra-cmake-modules kdoctools pkg-config + gettext-minimal + ;; for wayland-scanner + wayland)) + (inputs (list + karchive + kconfigwidgets + kglobalaccel + kguiaddons + kiconthemes + kirigami + kio + ki18n + kcmutils + ksvg + kglobalaccel + knotifications + plasma-wayland-protocols + plasma-activities + qtdeclarative + qtsvg + qtwayland + wayland + libxkbcommon)) + (arguments + (list #:qtbase qtbase + #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (setenv "HOME" (getcwd)) + (invoke "ctest" "-E" + (string-append "(plasma-dialogstatetest" + "|plasma-iconitemtest" + "|plasma-dialogqmltest" + "|plasma-themetest" + "|iconitemhidpitest" + "|bug485688test" + "|dialognativetest)")))))))) + (home-page "https://invent.kde.org/plasma/libplasma") + (synopsis "Libraries, components and tools of Plasma workspaces") + (description "The plasma framework provides QML components, libplasma and +script engines.") + ;; dual licensed + (license (list license:gpl2+ license:lgpl2.1+)))) + (define-public bluedevil (package (name "bluedevil") diff --git a/gnu/packages/kde-sdk.scm b/gnu/packages/kde-sdk.scm index f5f4d8c73fb2ddbdfab74c055952dcbc16822c29..014a99062aec989913f85f8f9c3ec1af4475ac76 100644 --- a/gnu/packages/kde-sdk.scm +++ b/gnu/packages/kde-sdk.scm @@ -32,6 +32,7 @@ #:use-module (gnu packages freedesktop) #:use-module (gnu packages kde) #:use-module (gnu packages kde-frameworks) + #:use-module (gnu packages kde-plasma) #:use-module (gnu packages llvm) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config)