z572 pushed a commit to branch kde-team
in repository guix.
commit adc68ce305a6be232c41450fcd4697ae0d05ae19
Author: Zheng Junjie <[email protected]>
AuthorDate: Thu Mar 7 11:56:05 2024 +0800
gnu: Add kwindowsystem-6.
* gnu/packages/kde-frameworks.scm (kwindowsystem-6): New variable.
(kwindowsystem): Inherit above.
Change-Id: Ib5c2d5d396ea372ddc0284b24575d33c3a57a4ff
---
gnu/packages/kde-frameworks.scm | 51 +++++++++++++++++++++++++++++++++--------
1 file changed, 42 insertions(+), 9 deletions(-)
diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index a442bc2720..b1ec50e180 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -1638,10 +1638,10 @@ configuration pages, message boxes, and password
requests.")
"(ksqueezedtextlabelautotest|\
kwidgetsaddons-kcolumnresizertest)")))))))))
-(define-public kwindowsystem
+(define-public kwindowsystem-6
(package
(name "kwindowsystem")
- (version "5.114.0")
+ (version "6.1.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -1650,19 +1650,24 @@ kwidgetsaddons-kcolumnresizertest)")))))))))
name "-" version ".tar.xz"))
(sha256
(base32
- "03xbsf1pmswd2kpn3pdszp4vndclsh7j02fp22npxaxllmfr4va9"))))
+ "15b54bacasg7x3vfky0601vr1n2rjm1v81lga00qp8xahcw581wc"))))
(build-system cmake-build-system)
(native-inputs
(list extra-cmake-modules
pkg-config
+ wayland; for wayland-scanner
dbus ; for the tests
- openbox ; for the tests
- qttools-5
+ openbox ; for the test
+ qttools
xorg-server-for-tests)) ; for the tests
(inputs
- (list libxrender
- qtbase-5
- qtx11extras
+ (list qtbase
+ qtdeclarative
+ qtwayland
+ wayland-protocols
+ plasma-wayland-protocols
+ libxkbcommon
+ wayland
xcb-util-keysyms
xcb-util-wm))
(arguments
@@ -1673,7 +1678,7 @@ kwidgetsaddons-kcolumnresizertest)")))))))))
(lambda* (#:key tests? #:allow-other-keys)
;; The test suite requires a running window anager
(when tests?
- (setenv "XDG_RUNTIME_DIR" "/tmp")
+ (setenv "XDG_RUNTIME_DIR" (getcwd))
(system "Xvfb :1 -ac -screen 0 640x480x24 &")
(setenv "DISPLAY" ":1")
(sleep 5) ;; Give Xvfb a few moments to get on it's feet
@@ -1695,6 +1700,34 @@ lower level classes for interaction with the X Windowing
System.")
;; the lgpl2.1. Some source files are under non-copyleft licenses.
(license license:lgpl2.1+)))
+(define-public kwindowsystem
+ (package
+ (inherit kwindowsystem-6)
+ (name "kwindowsystem")
+ (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
+ "03xbsf1pmswd2kpn3pdszp4vndclsh7j02fp22npxaxllmfr4va9"))))
+ (native-inputs
+ (list extra-cmake-modules
+ pkg-config
+ dbus ; for the tests
+ openbox ; for the tests
+ qttools-5
+ xorg-server-for-tests)) ; for the tests
+ (inputs
+ (list libxrender
+ qtbase-5
+ qtx11extras
+ xcb-util-keysyms
+ xcb-util-wm))))
+
(define-public modemmanager-qt
(package
(name "modemmanager-qt")
