~ruther/guix-local: gnu: libplasma: Move to kde-plasma.scm.

5 files changed, 67 insertions(+), 63 deletions(-)

M gnu/packages/fcitx5.scm
M gnu/packages/kde-frameworks.scm
M gnu/packages/kde-games.scm
M gnu/packages/kde-plasma.scm
M gnu/packages/kde-sdk.scm

M gnu/packages/fcitx5.scm => gnu/packages/fcitx5.scm +1 -0

@@ 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)

M gnu/packages/kde-frameworks.scm => gnu/packages/kde-frameworks.scm +0 -63

@@ 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")

M gnu/packages/kde-games.scm => gnu/packages/kde-games.scm +1 -0

@@ 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)

M gnu/packages/kde-plasma.scm => gnu/packages/kde-plasma.scm +64 -0

@@ 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")

M gnu/packages/kde-sdk.scm => gnu/packages/kde-sdk.scm +1 -0

@@ 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)