From a39798baa1b2a415e6b19f19cd603e9735731f49 Mon Sep 17 00:00:00 2001 From: Brendan Tildesley Date: Wed, 2 Feb 2022 14:13:48 +1100 Subject: [PATCH v3 17/86] gnu: KDE Plasma: Update all packages to 5.24.4. * gnu/packages/kde-plasma.scm (breeze, kdecoration, kscreenlocker, ksshaskpass, layer-shell-qt, libkscreen, libksysguard): Update to 5.24.4. (kdecoration)[inputs]: Add new dependency. (libkscreen)[inputs]: Add new Wayland inputs. (kscreenlocker)[inputs]: Add layer-shell-qt. (libksysguard)[origin]: Fix url so refresh script works. [native-inputs]: Add qttools. [inputs]: Add libnl libcap libpcap, qtwebengine, qtwebchannel, lm-sensors:lib. [arguments]: Remove unneened hacks. Respect tests?. diff --git a/gnu/packages/kde-plasma.scm b/gnu/packages/kde-plasma.scm index 2c723d34f8..7ebc08b965 100644 --- a/gnu/packages/kde-plasma.scm +++ b/gnu/packages/kde-plasma.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2017, 2019, 2020 Hartmut Goebel ;;; Copyright © 2019 Tobias Geerinckx-Rice ;;; Copyright © 2020 Zheng Junjie <873216071@qq.com> -;;; Copyright © 2021 Brendan Tildesley +;;; Copyright © 2022 Brendan Tildesley ;;; ;;; This file is part of GNU Guix. ;;; @@ -29,6 +29,7 @@ (define-module (gnu packages kde-plasma) #:use-module (guix gexp) #:use-module (guix build-system cmake) #:use-module (guix build-system qt) + #:use-module (gnu packages admin) #:use-module (gnu packages compression) #:use-module (gnu packages freedesktop) #:use-module (gnu packages glib) @@ -45,14 +46,14 @@ (define-module (gnu packages kde-plasma) (define-public breeze (package (name "breeze") - (version "5.19.5") + (version "5.24.4") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" version "/" name "-" version ".tar.xz")) (sha256 (base32 - "0dpk1w7zcafrzf46j060i1qb0fwqpsflkfzr6gcar81llmjnc4b1")))) + "01cqji6figwb95drcq9vrqlkv7xmpn2csbi2mvixbcdawqhywsg3")))) (build-system qt-build-system) ;; TODO: Warning at /gnu/store/…-kpackage-5.34.0/…/KF5PackageMacros.cmake: ;; warnings during generation of metainfo for org.kde.breezedark.desktop: @@ -115,19 +116,19 @@ (define-public breeze-gtk (define-public kdecoration (package (name "kdecoration") - (version "5.19.5") + (version "5.24.4") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" version "/kdecoration-" version ".tar.xz")) (sha256 (base32 - "0pn8n7zyb0adzjnn92vmbcf7pmpss60k9k1rk5llamj016xzfgnf")))) + "05ccyb314mxf0d4ivj71l9lh13s3fqr7f4d2rmg6qshsql39569c")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules)) (inputs - (list ki18n qtbase-5)) + (list kcoreaddons ki18n qtbase-5)) (home-page "https://invent.kde.org/plasma/kdecoration") (synopsis "Plugin based library to create window decorations") (description "KDecoration is a library to create window decorations. @@ -138,14 +139,14 @@ (define-public kdecoration (define-public ksshaskpass (package (name "ksshaskpass") - (version "5.19.5") + (version "5.24.4") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" version "/ksshaskpass-" version ".tar.xz")) (sha256 (base32 - "1k2va2v9051f71w78dn3gihk642iyy5yzrkcfnp97fag8g6dpisi")))) + "1pa41w793dbi3rv6mm1a4xp46n80qwdpdlwhi6z4x76hjvqx9i9l")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules kdoctools)) @@ -162,14 +163,14 @@ (define-public ksshaskpass (define-public layer-shell-qt (package (name "layer-shell-qt") - (version "5.24.1") + (version "5.24.4") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" version "/layer-shell-qt-" version ".tar.xz")) (sha256 (base32 - "1aq089pws39w9ncsiqzgg3qvfg5hc5a74pzra0smdpy5ipfsb6a4")))) + "03qyf6pvk36ig6ilimq02q19frdlsmrkbng2iz3d59k15zdrz5x0")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules pkg-config)) @@ -188,14 +189,14 @@ (define-public layer-shell-qt (define-public kscreenlocker (package (name "kscreenlocker") - (version "5.19.5") + (version "5.24.4") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" version "/kscreenlocker-" version ".tar.xz")) (sha256 (base32 - "1fd5sqaqx9kj3kr0bgxpllhcm5arf8bc9pkpd9yk9c8xjy0j0fxi")))) + "1xzc80awsapsg65kk21ssp7y0jb374k1w2bb7gvzj8j40rrn48pv")))) (build-system qt-build-system) (arguments `(#:tests? #f ;; TODO: make tests pass @@ -213,35 +214,36 @@ (define-public kscreenlocker (if tests? (begin (setenv "CTEST_OUTPUT_ON_FAILURE" "1") - (invoke "dbus-launch" "ctest" "."))) + (invoke "dbus-launch" "ctest"))) #t))))) (native-inputs (list extra-cmake-modules pkg-config ;; For tests. dbus xorg-server-for-tests)) (inputs - `(("kcmutils" ,kcmutils) - ("kcrash" ,kcrash) - ("kdeclarative" ,kdeclarative) - ("kglobalaccel" ,kglobalaccel) - ("ki18n" ,ki18n) - ("kidletime" ,kidletime) - ("knotifications" ,knotifications) - ("ktextwidgets" ,ktextwidgets) - ("kwayland" ,kwayland) - ("kwindowsystem" ,kwindowsystem) - ("kxmlgui" ,kxmlgui) - ("libseccomp" ,libseccomp) ;for sandboxing the look'n'feel package - ("libxcursor" ,libxcursor) ;missing in CMakeList.txt - ("libxi" ,libxi) ;XInput, required for grabbing XInput2 devices - ("linux-pam" ,linux-pam) - ("logind" ,elogind) ;optional loginctl support - ("qtbase" ,qtbase-5) - ("qtdeclarative" ,qtdeclarative) - ("qtx11extras" ,qtx11extras) - ("solid" ,solid) - ("wayland" ,wayland) - ("xcb-util-keysyms" ,xcb-util-keysyms))) + (list kcmutils + kcrash + kdeclarative + kglobalaccel + ki18n + kidletime + knotifications + ktextwidgets + kwayland + kwindowsystem + kxmlgui + layer-shell-qt + libseccomp ;for sandboxing the look'n'feel package + libxcursor ;missing in CMakeList.txt + libxi ;XInput, required for grabbing XInput2 devices + linux-pam + elogind ;optional loginctl support + qtbase-5 + qtdeclarative + qtx11extras + solid + wayland + xcb-util-keysyms)) (home-page "https://invent.kde.org/plasma/kscreenlocker") (synopsis "Screen locking library") (description @@ -251,21 +253,22 @@ (define-public kscreenlocker (define-public libkscreen (package (name "libkscreen") - (version "5.19.5") + (version "5.24.4") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" version "/" name "-" version ".tar.xz")) (sha256 - (base32 "0rf1pm0yyc069f4n5s9ipdx4glzfr9zvv5cbrmn4q9i4v6z1qd8i")))) + (base32 "1xv7vml5lxj1lnansisfbfym35h265ggwsyjplz76aibj5nyqv81")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules ;; For testing. dbus)) (inputs - (list kwayland libxrandr qtbase-5 qtx11extras)) + (list kwayland libxrandr plasma-wayland-protocols + qtbase-5 qtwayland wayland qtx11extras)) (arguments '(#:tests? #f)) ; FIXME: 55% tests passed, 5 tests failed out of 11 (home-page "https://community.kde.org/Solid/Projects/ScreenManagement") @@ -278,56 +281,53 @@ (define-public libkscreen (define-public libksysguard (package (name "libksysguard") - (version "5.19.5") + (version "5.24.4") (source (origin (method url-fetch) - (uri (string-append "mirror://kde//stable/plasma/" version + (uri (string-append "mirror://kde/stable/plasma/" version "/libksysguard-" version ".tar.xz")) (sha256 - (base32 "1kd0h3p8bf9k5pqp0frhr81pa0yyrpkckg9zznirk9p1v88v7bfq")))) + (base32 "00i4l2kc02wymmiqh7wam8dp4h9hvn8nsxfv258waq7pnxzjmnkn")))) (native-inputs - (list extra-cmake-modules pkg-config)) + (list extra-cmake-modules pkg-config qttools)) (inputs - `(("kconfigwidgets" ,kconfigwidgets) - ("kiconthemes" ,kiconthemes) - ("kwindowsystem" ,kwindowsystem) - ("ki18n" ,ki18n) - ("kauth" ,kauth) - ("kcompletion" ,kcompletion) - ("kconfig" ,kconfig) - ("kcoreaddons" ,kcoreaddons) - ("kdeclarative" ,kdeclarative) - ("kglobalaccel" ,kglobalaccel) - ("kio" ,kio) - ("knewstuff" ,knewstuff) - ("kwidgetsaddons" ,kwidgetsaddons) - ("kservice" ,kservice) - ("qtbase" ,qtbase-5) - ("qtdeclarative" ,qtdeclarative) - ("qtscript" ,qtscript) - ("qtwebkit" ,qtwebkit) - ("qtx11extras" ,qtx11extras) - ("plasma" ,plasma-framework) - ("zlib" ,zlib))) + (list kauth + kcompletion + kconfig + kconfigwidgets + kcoreaddons + kdeclarative + kglobalaccel + ki18n + kiconthemes + kio + knewstuff + kservice + kwidgetsaddons + kwindowsystem + libnl + libcap + libpcap + `(,lm-sensors "lib") + plasma-framework + qtbase-5 + qtdeclarative + qtscript + qtwebchannel + qtwebengine + qtwebkit + qtx11extras + zlib)) (build-system qt-build-system) (arguments - (list #:configure-flags - #~`(,(string-append "-DKDE_INSTALL_DATADIR=" - #$output "/share")) - #:phases + (list #:phases #~(modify-phases %standard-phases - (add-before 'configure 'patch-cmakelists - (lambda _ - ;; TODO: Verify: This should no longer be necessary, since - ;; KF5AuthConfig.cmake.in contains this already. - (substitute* "processcore/CMakeLists.txt" - (("KAUTH_HELPER_INSTALL_DIR") - "KDE_INSTALL_LIBEXECDIR")))) (replace 'check - (lambda _ - ;; TODO: Fix this failing test-case - (invoke "ctest" "-E" "processtest")))))) + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + ;; TODO: Fix this failing test-case + (invoke "ctest" "-E" "processtest"))))))) (home-page "https://userbase.kde.org/KSysGuard") (synopsis "Network enabled task and system monitoring") (description "KSysGuard can obtain information on system load and -- 2.37.0