Subject: [PATCH kde-team 14/63] gnu: Add kwidgetsaddons-6.

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

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

Change-Id: Ic038d61fef6ca173c7cca2ce45dab38702512a95
---
 gnu/packages/kde-frameworks.scm | 50 ++++++++++++++++++++++++++-------
 1 file changed, 40 insertions(+), 10 deletions(-)

diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index fb19220480..f5448b91e8 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -1407,10 +1407,10 @@ (define-public kwayland
 represented by a QPoint or a QSize.")
     (license license:lgpl2.1+)))
 
-(define-public kwidgetsaddons
+(define-public kwidgetsaddons-6
   (package
     (name "kwidgetsaddons")
-    (version "5.114.0")
+    (version "6.1.0")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -1419,23 +1419,25 @@ (define-public kwidgetsaddons
                     name "-" version ".tar.xz"))
               (sha256
                (base32
-                "1cc8lsk9v0cp2wiy1q26mlkf8np0yj01sq8a7w13ga5s6hv4sh2n"))))
+                "1kp48sh3lhp5n87avnm2fwzrqqzbinbl3zjmxn6p7snnq9z5s8l1"))))
     (build-system qt-build-system)
     (native-inputs
-     (list extra-cmake-modules qttools-5 xorg-server-for-tests))
-    (inputs
-     (list qtbase-5))
+     (list extra-cmake-modules qttools))
     (arguments
      (list
+      #:qtbase qtbase
       #:phases
       #~(modify-phases %standard-phases
           (replace 'check
-            (lambda* (#:key tests? #:allow-other-keys)
+            (lambda* (#:key tests? parallel-tests? #:allow-other-keys)
               (when tests?
-                (setenv "XDG_CACHE_HOME" "/tmp/xdg-cache")
+                ;; hideLaterShouldHideAfterDelay function time: 300000ms, total time: 300009ms
                 (invoke "ctest" "-E"
-                        "(ksqueezedtextlabelautotest|\
-kwidgetsaddons-kcolumnresizertest)")))))))
+                        "(ktooltipwidgettest)"
+                        "-j"
+                        (if parallel-tests?
+                            (number->string (parallel-job-count))
+                            "1"))))))))
     (home-page "https://community.kde.org/Frameworks")
     (synopsis "Large set of desktop widgets")
     (description "Provided are action classes that can be added to toolbars or
@@ -1444,6 +1446,34 @@ (define-public kwidgetsaddons
 configuration pages, message boxes, and password requests.")
     (license (list license:gpl2+ license:lgpl2.1+))))
 
+(define-public kwidgetsaddons
+  (package
+    (inherit kwidgetsaddons-6)
+    (name "kwidgetsaddons")
+    (version "5.114.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "mirror://kde/stable/frameworks/"
+                    (version-major+minor version) "/"
+                    name "-" version ".tar.xz"))
+              (sha256
+               (base32
+                "1cc8lsk9v0cp2wiy1q26mlkf8np0yj01sq8a7w13ga5s6hv4sh2n"))))
+    (native-inputs
+     (list extra-cmake-modules qttools-5 xorg-server-for-tests))
+    (arguments
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (replace 'check
+            (lambda* (#:key tests? #:allow-other-keys)
+              (when tests?
+                (setenv "XDG_CACHE_HOME" "/tmp/xdg-cache")
+                (invoke "ctest" "-E"
+                        "(ksqueezedtextlabelautotest|\
+kwidgetsaddons-kcolumnresizertest)")))))))))
+
 (define-public kwindowsystem
   (package
     (name "kwindowsystem")
-- 
2.41.0