guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

285/347: gnu: kwin: Update to 6.1.1.


From: guix-commits
Subject: 285/347: gnu: kwin: Update to 6.1.1.
Date: Fri, 28 Jun 2024 09:59:15 -0400 (EDT)

z572 pushed a commit to branch kde-team
in repository guix.

commit 85e9daa5c548708d1f2d7fc5c39dd549d8b8fc31
Author: Zheng Junjie <zhengjunjie@iscas.ac.cn>
AuthorDate: Thu Jun 27 01:48:26 2024 +0800

    gnu: kwin: Update to 6.1.1.
    
    * gnu/packages/kde-plasma.scm (kwin): Update to 6.1.1.
    [native-inputs]: Remove wayland-protocols; add wayland-protocols-next and 
qtwayland.
    [arguments]<#:configure-flags>: Set QtWaylandScanner path.
    <#:phases>: Skip kwin-testButtonRebind test.
    
    Change-Id: I5501bd4c8e74579d72fb12021138899171d4d23b
---
 gnu/packages/kde-plasma.scm | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/kde-plasma.scm b/gnu/packages/kde-plasma.scm
index d6a16438ec..02482c335e 100644
--- a/gnu/packages/kde-plasma.scm
+++ b/gnu/packages/kde-plasma.scm
@@ -1282,19 +1282,23 @@ KDE Frameworks components.")
 (define-public kwin
   (package
     (name "kwin")
-    (version "6.0.4.1")
+    (version "6.1.1")
     (source (origin
               (method url-fetch)
-              (uri (string-append "mirror://kde/stable/plasma/6.0.4/"
+              (uri (string-append "mirror://kde/stable/plasma/" version "/"
                                   name "-" version ".tar.xz"))
               (patches (search-patches 
"kwin-unwrap-executable-name-for-dot-desktop-search.patch"))
               (sha256
                (base32
-                "0dnb9fy67w11g5070zdcardi08bbiy2wd6alxicg043fldzv7zsn"))))
+                "0r42bj6jxg1f0rwkbsf1a8ba99c714kvp6w3dx02ac3is5jl002h"))))
     (build-system qt-build-system)
     (arguments
      (list
       #:qtbase qtbase
+      #:configure-flags
+      #~(list (string-append "-DQtWaylandScanner_EXECUTABLE="
+                             #$(this-package-native-input "qtwayland")
+                             "/lib/qt6/libexec/qtwaylandscanner"))
       #:phases
       #~(modify-phases %standard-phases
           (add-after 'unpack 'patch
@@ -1353,6 +1357,7 @@ KDE Frameworks components.")
                           "kwin-testDrm" ;; require Drm
                           "kwin-testInputMethod"
                           "kwin-testPlasmaWindow" ;; require plasma-workspace 
qml module.
+                          "kwin-testButtonRebind"
                           "kwin-testPointerInput"
                           "kwin-testXdgShellWindow"
                           "kwin-testXdgShellWindow-waylandonly"
@@ -1370,9 +1375,11 @@ KDE Frameworks components.")
                          mesa-utils
                          pkg-config
                          qttools
-                         wayland-protocols
+                         wayland-protocols-next
                          xorg-server-for-tests
-                         python-minimal))
+                         python-minimal
+                         ;; for QtWaylandScanner
+                         qtwayland))
     (inputs (list breeze
                   eudev
                   fontconfig



reply via email to

[Prev in Thread] Current Thread [Next in Thread]