diff options
| author | Zheng Junjie <873216071@qq.com> | 2023-07-15 19:22:55 +0800 |
|---|---|---|
| committer | 宋文武 <iyzsong@member.fsf.org> | 2023-08-02 22:27:43 +0800 |
| commit | 0fe172efdbac46db4e087b237f3b322a33e8c767 (patch) | |
| tree | 47569c9f1001438c574c344279373021671d6ada | |
| parent | 3e2cbce34b1acc63f031e8d362e931dd06752638 (diff) | |
| download | guix-0fe172efdbac46db4e087b237f3b322a33e8c767.tar.gz guix-0fe172efdbac46db4e087b237f3b322a33e8c767.zip | |
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>
| -rw-r--r-- | gnu/packages/kde-plasma.scm | 46 |
1 files changed, 25 insertions, 21 deletions
diff --git a/gnu/packages/kde-plasma.scm b/gnu/packages/kde-plasma.scm index 8248181643..b245bb8e61 100644 --- a/gnu/packages/kde-plasma.scm +++ b/gnu/packages/kde-plasma.scm @@ -1141,14 +1141,14 @@ KDE Frameworks components.") (define-public kwin (package (name "kwin") - (version "5.25.5") + (version "5.27.6") (source (origin - (method url-fetch) - (uri (string-append "mirror://kde/stable/plasma/" version "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "1dh7ydwxbb9r53p353d53gq7w9vmp7idvsr4s5ldxmah35436v2s")))) + (method url-fetch) + (uri (string-append "mirror://kde/stable/plasma/" version "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "1v4r4h2zbandg43iyww5p66sgv2z90lrri1gijnwjlg9j5gbvmb2")))) (build-system qt-build-system) (arguments (list @@ -1179,9 +1179,14 @@ KDE Frameworks components.") _ a Xwayland b) (string-append a (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") (("/usr/share") - (string-append #$hwdata:pnp "/share"))))) + (string-append #$(this-package-input "hwdata") "/share"))))) (add-after 'install 'add-symlinks (lambda* (#:key outputs #:allow-other-keys) (let ((kst5 (string-append #$output @@ -1205,20 +1210,19 @@ KDE Frameworks components.") (setenv "DISPLAY" ":1") (system "Xvfb :1 &") (sleep 5) - (invoke "ctest" "-E" + (invoke "dbus-launch" + "ctest" + "-E" (string-join - (list "kwayland-testXdgDecoration" - "kwin-testXkb" - "kwin-testPointerInput" - "kwin-testXdgShellWindow" - "kwin-testXdgShellWindow-waylandonly" - "kwin-testSceneOpenGLES" - "kwin-testSceneOpenGLES-waylandonly" - "kwin-testNightColor" - "kwin-testNightColor-waylandonly" - "kwin-testSceneQPainter" - "kwin-testLibinputDevice") - "|")))))))) + (list "kwin-testXkb" + "kwin-testPointerInput" + "kwin-testXdgShellWindow" + "kwin-testXdgShellWindow-waylandonly" + "kwin-testSceneOpenGLES" + "kwin-testSceneOpenGLES-waylandonly" + "kwin-testNightColor" + "kwin-testNightColor-waylandonly") + "|")))))))) (native-inputs (list extra-cmake-modules dbus kdoctools |