me
/
guix
Archived
1
0
Fork 0
Code

gnu: kwin: Update to 5.27.6. 

* gnu/packages/kde-plasma.scm (kwin): Update to 5.27.6.
[arguments]: Enable more tests with "dbus-launch".

Signed-off-by: 宋文武 <iyzsong@member.fsf.org>
master
Zheng Junjie 2023-07-15 19:22:55 +08:00 committed by 宋文武
parent 3e2cbce34b
commit 0fe172efdb
No known key found for this signature in database
GPG Key ID: D415BF253B515976
1 changed files with 25 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
gnu/packages/kde-plasma.scm
View File

@ -1141,14 +1141,14 @@ KDE Frameworks components.")
(define-public kwin (define-public kwin
(package (package
(name "kwin") (name "kwin")
(version "5.25.5") (version "5.27.6")
(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
"1dh7ydwxbb9r53p353d53gq7w9vmp7idvsr4s5ldxmah35436v2s")))) "1v4r4h2zbandg43iyww5p66sgv2z90lrri1gijnwjlg9j5gbvmb2"))))
(build-system qt-build-system) (build-system qt-build-system)
(arguments (arguments
(list (list
@ -1179,9 +1179,14 @@ KDE Frameworks components.")
_ a Xwayland b) _ a Xwayland b)
(string-append a (string-append a
(which "Xwayland") b))) (which "Xwayland") b)))
;; https://github.com/NixOS/nixpkgs/blob/6da4bc6cb07cba1b8e53d139cbf1d2fb8061d967/pkgs/desktops/plasma-5/kwin/0003-plugins-qpa-allow-using-nixos-wrapper.patch
(substitute* "src/plugins/qpa/main.cpp"
(("(\\(QLatin1String\\(\"kwin_wayland\"\\)\\))" _ start)
(string-append start " && !QCoreApplication::applicationFilePath()\
.endsWith(QLatin1String(\".kwin_wayland-real\"))" )))
(substitute* '("cmake/modules/Findhwdata.cmake") (substitute* '("cmake/modules/Findhwdata.cmake")
(("/usr/share") (("/usr/share")
(string-append #$hwdata:pnp "/share"))))) (string-append #$(this-package-input "hwdata") "/share")))))
(add-after 'install 'add-symlinks (add-after 'install 'add-symlinks
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let ((kst5 (string-append #$output (let ((kst5 (string-append #$output
@ -1205,20 +1210,19 @@ KDE Frameworks components.")
(setenv "DISPLAY" ":1") (setenv "DISPLAY" ":1")
(system "Xvfb :1 &") (system "Xvfb :1 &")
(sleep 5) (sleep 5)
(invoke "ctest" "-E" (invoke "dbus-launch"
"ctest"
"-E"
(string-join (string-join
(list "kwayland-testXdgDecoration" (list "kwin-testXkb"
"kwin-testXkb" "kwin-testPointerInput"
"kwin-testPointerInput" "kwin-testXdgShellWindow"
"kwin-testXdgShellWindow" "kwin-testXdgShellWindow-waylandonly"
"kwin-testXdgShellWindow-waylandonly" "kwin-testSceneOpenGLES"
"kwin-testSceneOpenGLES" "kwin-testSceneOpenGLES-waylandonly"
"kwin-testSceneOpenGLES-waylandonly" "kwin-testNightColor"
"kwin-testNightColor" "kwin-testNightColor-waylandonly")
"kwin-testNightColor-waylandonly" "|"))))))))
"kwin-testSceneQPainter"
"kwin-testLibinputDevice")
"|"))))))))
(native-inputs (list extra-cmake-modules (native-inputs (list extra-cmake-modules
dbus dbus
kdoctools kdoctools