gnu: plasma-desktop: Update to 6.1.2.
* gnu/packages/kde-plasma.scm (plasma-desktop): Update to 6.1.2. [inputs]: Remove packagekit-qt5, signond, appstream-qt, kactivities, kactivities-stats, kdelibs4support, kinit, libaccounts-qt, plasma-framework, qtbase-5, qtdeclarative-5, qtquickcontrols-5, qtquickcontrols2-5, qtwayland-5, and qtx11extras; add packagekit-qt6, signond-qt6, icu4c, appstream-qt6, plasma-activities, plasma-activities-stats, ksvg, plasma5support, libaccounts-qt6, libplasma, qt5compat, qtdeclarative, and qtwayland. [propagated-inputs]: Add kcmutils. [native-inputs]: Remove qtsvg-5, qttools-5, and qtwayland-5; add qtsvg, qttools, libxml2, and qtwayland. [arguments]: Set #:qtbase to qtbase. <#:phases>: Adjust disabled test. Change-Id: Ie1dc72ab52b3d39eebca95e75ab06085c35f9b7a
This commit is contained in:
parent
6e5942350c
commit
c1586f03ba
1 changed files with 31 additions and 23 deletions
|
@ -80,6 +80,7 @@
|
||||||
#:use-module (gnu packages textutils)
|
#:use-module (gnu packages textutils)
|
||||||
#:use-module (gnu packages qt)
|
#:use-module (gnu packages qt)
|
||||||
#:use-module (gnu packages xdisorg)
|
#:use-module (gnu packages xdisorg)
|
||||||
|
#:use-module (gnu packages xml)
|
||||||
#:use-module (gnu packages xorg)
|
#:use-module (gnu packages xorg)
|
||||||
#:use-module (gnu packages base)
|
#:use-module (gnu packages base)
|
||||||
#:use-module (gnu packages gps)
|
#:use-module (gnu packages gps)
|
||||||
|
@ -1842,29 +1843,31 @@ the KDE Plasma 5 desktop.")
|
||||||
(define-public plasma-desktop
|
(define-public plasma-desktop
|
||||||
(package
|
(package
|
||||||
(name "plasma-desktop")
|
(name "plasma-desktop")
|
||||||
(version "5.27.7")
|
(version "6.1.2")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
(uri (string-append "mirror://kde/stable/plasma/" version
|
(uri (string-append "mirror://kde/stable/plasma/" version
|
||||||
"/" name "-" version ".tar.xz"))
|
"/" name "-" version ".tar.xz"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"1njkjf3fhxfmwyviypxqzrn23klxiih82bazvd8y61cshqwai6i2"))))
|
"1n72hynnvgyy0ja0f20p322c2y5yvb5ra1i4jrlxwji795y09r19"))))
|
||||||
(build-system qt-build-system)
|
(build-system qt-build-system)
|
||||||
(native-inputs (list extra-cmake-modules
|
(native-inputs (list extra-cmake-modules
|
||||||
dbus
|
dbus
|
||||||
kdoctools
|
kdoctools
|
||||||
intltool
|
intltool
|
||||||
pkg-config
|
pkg-config
|
||||||
qtsvg-5
|
qtsvg
|
||||||
qttools-5
|
qttools
|
||||||
|
libxml2
|
||||||
;; require QtWaylandScanner
|
;; require QtWaylandScanner
|
||||||
qtwayland-5))
|
qtwayland))
|
||||||
(inputs (list packagekit-qt5
|
(inputs (list packagekit-qt6
|
||||||
signon-plugin-oauth2
|
signon-plugin-oauth2
|
||||||
signond
|
signond-qt6
|
||||||
|
icu4c
|
||||||
attica
|
attica
|
||||||
appstream-qt
|
appstream-qt6
|
||||||
baloo
|
baloo
|
||||||
breeze
|
breeze
|
||||||
breeze-icons
|
breeze-icons
|
||||||
|
@ -1873,8 +1876,8 @@ the KDE Plasma 5 desktop.")
|
||||||
glib
|
glib
|
||||||
ibus
|
ibus
|
||||||
kaccounts-integration
|
kaccounts-integration
|
||||||
kactivities
|
plasma-activities
|
||||||
kactivities-stats
|
plasma-activities-stats
|
||||||
kauth
|
kauth
|
||||||
karchive
|
karchive
|
||||||
kcmutils
|
kcmutils
|
||||||
|
@ -1885,14 +1888,12 @@ the KDE Plasma 5 desktop.")
|
||||||
kdeclarative
|
kdeclarative
|
||||||
kded
|
kded
|
||||||
kdesu
|
kdesu
|
||||||
kdelibs4support
|
|
||||||
kglobalaccel
|
kglobalaccel
|
||||||
kguiaddons
|
kguiaddons
|
||||||
kholidays
|
kholidays
|
||||||
ki18n
|
ki18n
|
||||||
kiconthemes
|
kiconthemes
|
||||||
kidletime
|
kidletime
|
||||||
kinit
|
|
||||||
kio
|
kio
|
||||||
kitemmodels
|
kitemmodels
|
||||||
knewstuff
|
knewstuff
|
||||||
|
@ -1909,8 +1910,10 @@ the KDE Plasma 5 desktop.")
|
||||||
kwallet
|
kwallet
|
||||||
kwayland
|
kwayland
|
||||||
kwin
|
kwin
|
||||||
|
ksvg
|
||||||
|
plasma5support
|
||||||
layer-shell-qt
|
layer-shell-qt
|
||||||
libaccounts-qt
|
libaccounts-qt6
|
||||||
libcanberra
|
libcanberra
|
||||||
libkscreen
|
libkscreen
|
||||||
libksysguard
|
libksysguard
|
||||||
|
@ -1926,17 +1929,14 @@ the KDE Plasma 5 desktop.")
|
||||||
networkmanager-qt
|
networkmanager-qt
|
||||||
phonon
|
phonon
|
||||||
pipewire
|
pipewire
|
||||||
plasma-framework
|
libplasma
|
||||||
plasma-wayland-protocols
|
plasma-wayland-protocols
|
||||||
pulseaudio
|
pulseaudio
|
||||||
prison
|
prison
|
||||||
qqc2-desktop-style
|
qqc2-desktop-style
|
||||||
qtbase-5
|
qt5compat
|
||||||
qtdeclarative-5
|
qtdeclarative
|
||||||
qtquickcontrols-5
|
qtwayland
|
||||||
qtquickcontrols2-5
|
|
||||||
qtwayland-5
|
|
||||||
qtx11extras
|
|
||||||
wayland
|
wayland
|
||||||
wayland-protocols
|
wayland-protocols
|
||||||
xcb-util
|
xcb-util
|
||||||
|
@ -1953,10 +1953,18 @@ the KDE Plasma 5 desktop.")
|
||||||
libxkbfile
|
libxkbfile
|
||||||
libxcursor
|
libxcursor
|
||||||
libxkbcommon))
|
libxkbcommon))
|
||||||
(propagated-inputs (list iso-codes kirigami plasma-workspace))
|
(propagated-inputs (list iso-codes kirigami kcmutils plasma-workspace))
|
||||||
(arguments
|
(arguments
|
||||||
(list #:phases
|
(list #:qtbase qtbase
|
||||||
|
#:phases
|
||||||
#~(modify-phases %standard-phases
|
#~(modify-phases %standard-phases
|
||||||
|
(add-after 'unpack 'patch-wallpaper
|
||||||
|
(lambda* (#:key inputs #:allow-other-keys)
|
||||||
|
(substitute* "sddm-theme/theme.conf.cmake"
|
||||||
|
(("background=..KDE_INSTALL_FULL_WALLPAPERDIR.")
|
||||||
|
(string-append "background="
|
||||||
|
#$(this-package-input "breeze")
|
||||||
|
"/share/wallpapers")))))
|
||||||
(add-after 'unpack 'fix-paths
|
(add-after 'unpack 'fix-paths
|
||||||
(lambda* (#:key inputs #:allow-other-keys)
|
(lambda* (#:key inputs #:allow-other-keys)
|
||||||
(substitute* "kcms/keyboard/iso_codes.h"
|
(substitute* "kcms/keyboard/iso_codes.h"
|
||||||
|
@ -1971,7 +1979,7 @@ the KDE Plasma 5 desktop.")
|
||||||
(setenv "XDG_RUNTIME_DIR" (getcwd))
|
(setenv "XDG_RUNTIME_DIR" (getcwd))
|
||||||
(setenv "XDG_CACHE_HOME" (getcwd))
|
(setenv "XDG_CACHE_HOME" (getcwd))
|
||||||
(setenv "QT_QPA_PLATFORM" "offscreen")
|
(setenv "QT_QPA_PLATFORM" "offscreen")
|
||||||
(invoke "ctest" "-E" "foldermodeltest")))))))
|
(invoke "ctest" "-E" "(kcm-keyboard-keyboard_memory_persister_test|foldermodeltest)")))))))
|
||||||
(home-page "https://kde.org/plasma-desktop/")
|
(home-page "https://kde.org/plasma-desktop/")
|
||||||
(synopsis "Plasma for the Desktop")
|
(synopsis "Plasma for the Desktop")
|
||||||
(description
|
(description
|
||||||
|
|
Reference in a new issue