guix_mirror_bot pushed a commit to branch kde-team
in repository guix.

commit 85368f959c4a6d0b32d83f24885ec10725631fe3
Author: Zheng Junjie <[email protected]>
AuthorDate: Fri Jan 10 11:51:58 2025 +0800

    gnu: plasma-workspace: Update to 6.2.5.
    
    * gnu/packages/kde-plasma.scm (plasma-workspace): Update to 6.2.5.
    [inputs]: Add lsof and qtpositioning.
    [arguments]<#:phases>: Remove add-span-header phase. Adjust
    patch-workspace-bins and check-after-install phase.
    
    Change-Id: I4c960fd16ad3f162e5821858a17c6afaca8a3bf6
---
 gnu/packages/kde-plasma.scm | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/kde-plasma.scm b/gnu/packages/kde-plasma.scm
index df8e72c3fc..16fa8409f7 100644
--- a/gnu/packages/kde-plasma.scm
+++ b/gnu/packages/kde-plasma.scm
@@ -69,6 +69,7 @@
   #:use-module (gnu packages libcanberra)
   #:use-module (gnu packages linux)
   #:use-module (gnu packages libusb)
+  #:use-module (gnu packages lsof)
   #:use-module (gnu packages networking)
   #:use-module (gnu packages maths)
   #:use-module (gnu packages messaging)
@@ -2770,14 +2771,14 @@ sensors, process information and other system 
resources.")
 (define-public plasma-workspace
   (package
     (name "plasma-workspace")
-    (version "6.1.4")
+    (version "6.2.5")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://kde/stable/plasma/" version
                                   "/" name "-" version ".tar.xz"))
               (sha256
                (base32
-                "0mlddkjxq7p01wgy8pzp65fhg1sihibzd32wn3s3zcn077frj86b"))))
+                "0bs1dks8b7y2536706j051wzqcldin68574n1gvbiqb2dzj129dq"))))
     (build-system qt-build-system)
     (native-inputs (list extra-cmake-modules kdoctools pkg-config qtsvg
                          qttools
@@ -2813,6 +2814,7 @@ sensors, process information and other system resources.")
                   kiconthemes
                   kidletime
                   kio
+                  lsof
                   xdotool
                   qqc2-desktop-style
                   qcoro-qt6
@@ -2864,6 +2866,7 @@ sensors, process information and other system resources.")
                   qtshadertools
                   qtdeclarative
                   qttools
+                  qtpositioning
                   qtwayland
                   wayland
                   wayland-protocols
@@ -2897,18 +2900,15 @@ sensors, process information and other system 
resources.")
                              "/libexec/kglobalacceld"))
            #:phases
            #~(modify-phases %standard-phases
-               (add-after 'unpack 'add-span-header
-                 (lambda _
-                   (substitute* "xembed-sni-proxy/sniproxy.cpp"
-                     (("#include \"sniproxy.h\"")
-                      (string-append "#include \"sniproxy.h\"
-#include <span>")))))
                (add-after 'unpack 'patch-workspace-bins
                  (lambda* (#:key inputs #:allow-other-keys)
                    (let ((xmessage (search-input-file inputs "/bin/xmessage"))
                          (xsetroot (search-input-file inputs "/bin/xsetroot"))
                          (xrdb (search-input-file inputs "/bin/xrdb"))
                          (qttools #$(this-package-input "qttools")))
+                     (substitute* "applets/devicenotifier/plugin/\
+deviceerrormonitor_p.cpp"
+                       (("lsof") (search-input-file inputs "/bin/lsof")))
                      (substitute* "startkde/startplasma.cpp"
                        (("xmessage") xmessage))
                      (substitute* "kcms/krdb/krdb.cpp"
@@ -2971,7 +2971,11 @@ sensors, process information and other system 
resources.")
                                "testimageproxymodel"
                                "testpackageimagelistmodel"
                                "testslidemodel"
-                               "tst_triangleFilter")
+                               "tst_triangleFilter"
+
+                               "dbusmethodcalltest"
+                               "klipper-testHistoryCycler"
+                               "klipper-testHistoryModel")
                               "|")))))
                ;; share/dbus-1/system-services have same name file
                ;; when dbus-root-service-type merge it, wail report

Reply via email to