[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#64798] [PATCH 182/209] gnu: kwin: Update to 5.27.6.
From: |
Zheng Junjie |
Subject: |
[bug#64798] [PATCH 182/209] gnu: kwin: Update to 5.27.6. |
Date: |
Sun, 23 Jul 2023 16:46:42 +0800 |
* gnu/packages/kde-plasma.scm (kwin): Update to 5.27.6.
[native-inputs]: use wayland-protocols-next replace wayland-protocols.
---
gnu/packages/kde-plasma.scm | 48 ++++++++++++++++++++-----------------
1 file changed, 26 insertions(+), 22 deletions(-)
diff --git a/gnu/packages/kde-plasma.scm b/gnu/packages/kde-plasma.scm
index 8248181643..82c76a171c 100644
--- a/gnu/packages/kde-plasma.scm
+++ b/gnu/packages/kde-plasma.scm
@@ -1141,14 +1141,14 @@ (define-public kwayland-integration
(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 @@ (define-public kwin
_ 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,27 +1210,26 @@ (define-public kwin
(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
mesa-utils
pkg-config
qttools-5
- wayland-protocols
+ wayland-protocols-next
xorg-server-for-tests))
(inputs (list breeze
eudev
--
2.41.0
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [bug#64798] [PATCH 182/209] gnu: kwin: Update to 5.27.6.,
Zheng Junjie <=