Subject: [bug#70395] [PATCH kde-team 26/63] gnu: Add solid-6.

From: Zheng Junjie <[email-masked]>
Date: Mon, 15 Apr 2024 20:47:03 +0800

* gnu/packages/kde-frameworks.scm (solid-6): New variable.
(solid): Inherit above.

Change-Id: I7f0f4c51f5f4ec550149664e016a55af19f961b4
---
 gnu/packages/kde-frameworks.scm | 40 +++++++++++++++++++++++++--------
 1 file changed, 31 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index abeac4b30b..97fba6aba4 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -1943,8 +1943,38 @@ (define-public qqc2-desktop-style
     ;; Mostly LGPL 2+, but many files are dual-licensed
     (license (list license:lgpl2.1+ license:gpl3+))))
 
+(define-public solid-6
+  (package
+    (name "solid")
+    (version "6.1.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "mirror://kde/stable/frameworks/"
+                    (version-major+minor version) "/"
+                    name "-" version ".tar.xz"))
+              (sha256
+               (base32
+                "0qj2z9na884hph0ap9481rqvn06aw3y8nm37wxz02lggb15rhjh7"))))
+    (build-system cmake-build-system)
+    (native-inputs
+     (list bison dbus extra-cmake-modules flex qttools))
+    ;; TODO: Add runtime-only dependency MediaPlayerInfo
+    (inputs
+     (list `(,util-linux "lib") ;; Optional, for libmount
+           libxkbcommon
+           vulkan-headers
+           qtbase qtdeclarative eudev))
+    (home-page "https://community.kde.org/Frameworks")
+    (synopsis "Desktop hardware abstraction")
+    (description "Solid is a device integration framework.  It provides a way of
+querying and interacting with hardware independently of the underlying operating
+system.")
+    (license license:lgpl2.1+)))
+
 (define-public solid
   (package
+    (inherit solid-6)
     (name "solid")
     (version "5.114.0")
     (source (origin
@@ -1956,7 +1986,6 @@ (define-public solid
               (sha256
                (base32
                 "1slxlj5jhp8g745l328932934633nl81sq3n8fd73h655hymsk4s"))))
-    (build-system cmake-build-system)
     (arguments
      (list #:phases #~(modify-phases %standard-phases
                         (replace 'check
@@ -1967,14 +1996,7 @@ (define-public solid
     (native-inputs
      (list bison dbus extra-cmake-modules flex qttools-5))
     (inputs
-     (list qtbase-5 qtdeclarative-5 eudev))
-    ;; TODO: Add runtime-only dependency MediaPlayerInfo
-    (home-page "https://community.kde.org/Frameworks")
-    (synopsis "Desktop hardware abstraction")
-    (description "Solid is a device integration framework.  It provides a way of
-querying and interacting with hardware independently of the underlying operating
-system.")
-    (license license:lgpl2.1+)))
+     (list qtbase-5 qtdeclarative-5 eudev))))
 
 (define-public sonnet
   (package
-- 
2.41.0