From 09ec78857396ce075011c24806d113389eecf101 Mon Sep 17 00:00:00 2001 From: Zheng Junjie Date: Sat, 6 Jul 2024 14:26:17 +0800 Subject: [PATCH] gnu: plasma-workspace: Update to 6.1.2. * gnu/packages/kde-plasma.scm (plasma-workspace): Update to 6.1.2. [inputs]: Remove appstream-qt, kactivities, kactivities-stats, kinit, kio-fuse, plasma-framework, qtbase-5, qtdeclarative-5, qtquickcontrols2-5, qttools-5, qtwayland-5, qtgraphicaleffects, qtx11extras, polkit-qt, and qtquickcontrols-5; add appstream-qt6, plasma-activities, plasma-activities-stats, kauth, ksvg, kstatusnotifieritem, kglobalacceld, xdotool, qqc2-desktop-style, qcoro-qt6, kirigami-addons, kirigami-addons, eudev, libplasma, plasma5support, qt5compat, qtsvg, qtshadertools, qtdeclarative, qttools, qtwayland, and polkit-qt6. [native-inputs]: Remove qtsvg-5 and qttools-5; add qtsvg, qttools, and python-minimal. [arguments]: Set #:qtbase to qtbase. <#:configure-flags>: set kglobalacceld_PATH. <#:phases>: Adjust it. Change-Id: I7624b18d06a9bec1ea5015b73c31e8eae36d992d --- gnu/packages/kde-plasma.scm | 96 +++++++++++++++++++------------------ 1 file changed, 50 insertions(+), 46 deletions(-) diff --git a/gnu/packages/kde-plasma.scm b/gnu/packages/kde-plasma.scm index 25ee50faa9..bd74a7957c 100644 --- a/gnu/packages/kde-plasma.scm +++ b/gnu/packages/kde-plasma.scm @@ -2547,20 +2547,21 @@ (define-public plasma-welcome (define-public plasma-workspace (package (name "plasma-workspace") - (version "5.27.7") + (version "6.1.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" version "/" name "-" version ".tar.xz")) (sha256 (base32 - "0pyf5vc466mfgicxpp76igdz58lpa0n7x2cl2hhaq4zmrlfr8hh6")))) + "16k55b08q42nc89slp49ivqssx6rs21zlzshwmjqx1na5nwikw27")))) (build-system qt-build-system) - (native-inputs (list extra-cmake-modules kdoctools pkg-config qtsvg-5 - qttools-5 - xorg-server-for-tests)) + (native-inputs (list extra-cmake-modules kdoctools pkg-config qtsvg + qttools + xorg-server-for-tests + python-minimal)) (inputs (list appmenu-gtk-module - appstream-qt + appstream-qt6 baloo breeze breeze-icons @@ -2568,9 +2569,12 @@ (define-public plasma-workspace fontconfig icu4c iso-codes - kactivities - kactivities-stats + plasma-activities + plasma-activities-stats karchive + kauth + ksvg + kstatusnotifieritem kcmutils kcoreaddons kcrash @@ -2579,17 +2583,21 @@ (define-public plasma-workspace kded kdesu kglobalaccel + kglobalacceld kguiaddons kholidays ki18n kiconthemes kidletime - kinit kio + xdotool + qqc2-desktop-style + qcoro-qt6 + kirigami-addons kio-extras - kio-fuse kitemmodels kirigami + kirigami-addons knewstuff knotifications knotifyconfig @@ -2613,6 +2621,7 @@ (define-public plasma-workspace libqalculate gmp mpfr + eudev libsm libxft libxkbcommon @@ -2621,17 +2630,17 @@ (define-public plasma-workspace networkmanager-qt phonon pipewire - plasma-framework + libplasma + plasma5support plasma-workspace-wallpapers plasma-wayland-protocols prison - qtbase-5 - qtdeclarative-5 - qtquickcontrols2-5 - qttools-5 - qtwayland-5 - qtgraphicaleffects - qtx11extras + qt5compat + qtsvg + qtshadertools + qtdeclarative + qttools + qtwayland wayland wayland-protocols xcb-util @@ -2640,7 +2649,7 @@ (define-public plasma-workspace xrdb xmessage xsetroot - polkit-qt + polkit-qt6 ucd libxcursor @@ -2649,43 +2658,35 @@ (define-public plasma-workspace zlib ;; qml dependency - qtquickcontrols-5 plasma-nm plasma-pa kscreen)) (arguments - (list #:phases + (list #:qtbase qtbase + #:configure-flags + #~(list + ;; libkmpris/autotests/CMakeLists.txt find it from + ;; KDE_INSTALL_FULL_LIBEXECDIR, But we are install to itself prefix. + ;; so we set it. + (string-append "-Dkglobalacceld_PATH=" + #$(this-package-input "kglobalacceld") + "/libexec/kglobalacceld")) + #:phases #~(modify-phases %standard-phases - (add-after 'unpack 'patch-wallpaper - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "lookandfeel/sddm-theme/theme.conf.cmake" - (("background=..KDE_INSTALL_FULL_WALLPAPERDIR.") - (string-append "background=" - #$(this-package-input "breeze") - "/share/wallpapers"))))) (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")) - (kinit #$(this-package-input "kinit")) (qttools #$(this-package-input "qttools"))) (substitute* "startkde/startplasma.cpp" - (("xmessage") xmessage) + (("xmessage") xmessage)) + (substitute* "kcms/krdb/krdb.cpp" (("xsetroot") xsetroot)) (substitute* (list "kcms/fonts/fontinit.cpp" "kcms/fonts/fonts.cpp" "kcms/krdb/krdb.cpp") (("xrdb") xrdb)) - (substitute* "startkde/plasma-session/startup.cpp" - (("CMAKE_INSTALL_FULL_LIBEXECDIR_KF5..") - (string-append "\"" kinit - "/libexec/kf5"))) - (substitute* (list - "startkde/startplasma-wayland.cpp" - "startkde/startplasma-x11.cpp") - (("kdeinit5_shutdown") - (string-append kinit "/bin/kdeinit5_shutdown"))) ;; QT_INSTALL_BINS refers to qtbase, but qdbus is in ;; qttools. (substitute* "CMakeLists.txt" @@ -2704,19 +2705,22 @@ (define-public plasma-workspace (setenv "QT_QPA_PLATFORM" "offscreen") (setenv "QT_PLUGIN_PATH" (string-append #$output - "/lib/qt5/plugins:" + "/lib/qt6/plugins:" (getenv "QT_PLUGIN_PATH"))) - (setenv "QML2_IMPORT_PATH" + (setenv "QML_IMPORT_PATH" (string-append #$output - "/lib/qt5/qml:" - (getenv "QML2_IMPORT_PATH"))) + "/lib/qt6/qml:" + (getenv "QML_IMPORT_PATH"))) (invoke "dbus-launch" "ctest" "--output-on-failure" "--rerun-failed" "-E" - "(appstreamtest|tasksmodeltest|shelltest|\ -testimagefinder|systemtraymodeltest|testimagelistmodel|\ -testpackageimagelistmodel|testimageproxymodel|testslidemodel|testdesktop)"))))))) + "(appstreamtest|tasktoolstest|tasksmodeltest|\ +fetchinitialplayertest|mprisdeclarativetest|mediakeystest|shelltest|\ +locationsrunnertest|testimagefinder|testimagelistmodel|\ +testpackageimagelistmodel|testimageproxymodel|testslidemodel|testimagefrontend|\ +dbusservicewatchertest|klippertest|keystatetest|lockedtest|tst_triangleFilter|\ +testimagebackend)"))))))) (home-page "https://invent.kde.org/plasma/plasma-workspace") (synopsis "Plasma workspace components") (description