From 86e4ab0366b5c51508dcaa426a1c2f553c2afbbd Mon Sep 17 00:00:00 2001
From: Zheng Junjie <zhengjunjie@iscas.ac.cn>
Date: Fri, 10 Jan 2025 11:51:55 +0800
Subject: [PATCH] gnu: kwin: Update to 6.2.5.

* gnu/packages/kde-plasma.scm (kwin): Update to 6.2.5.
[inputs]: Add libcanberra, kpipewire and qtsvg.
[native-inputs]: Add gcc-14.
[arguments]<#:phases>: Adjust test.

Change-Id: I301c8ac62699a5de9c43687fbe8b82ff8a196474
---
 gnu/packages/kde-plasma.scm | 30 ++++++++++++++++++++++++------
 1 file changed, 24 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/kde-plasma.scm b/gnu/packages/kde-plasma.scm
index a542007d62..159449c2cf 100644
--- a/gnu/packages/kde-plasma.scm
+++ b/gnu/packages/kde-plasma.scm
@@ -48,6 +48,7 @@ (define-module (gnu packages kde-plasma)
   #:use-module (gnu packages fonts)
   #:use-module (gnu packages fontutils)
   #:use-module (gnu packages freedesktop)
+  #:use-module (gnu packages gcc)
   #:use-module (gnu packages gdb)
   #:use-module (gnu packages ghostscript)
   #:use-module (gnu packages gnupg)
@@ -1381,7 +1382,7 @@ (define-public kwayland-integration
 (define-public kwin
   (package
     (name "kwin")
-    (version "6.1.4")
+    (version "6.2.5")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://kde/stable/plasma/"
@@ -1390,7 +1391,7 @@ (define-public kwin
               (patches (search-patches "kwin-unwrap-executable-name-for-dot-desktop-search.patch"))
               (sha256
                (base32
-                "0fpbmp6rshr3irmlzxcpsjchfp65ch91pb1kmlnaj8zaim3cxzzw"))))
+                "0j38fxgxqyvhyj84cagvmab7y8rind82bdr9k72ch18iwjk51i2w"))))
     (build-system qt-build-system)
     (arguments
      (list
@@ -1456,9 +1457,8 @@ (define-public kwin
                          (list
                           ;; Fails on an Apple M1 (aarch64) with the following error:
                           ;; TestColorspaces::roundtripConversion fails
-                          #$@(if (target-aarch64?)
-                                 #~("kwin-testColorspaces")
-                                 #~())
+                          "kwin-testColorspaces"
+
                           "kwin-testDrm" ;; require Drm
                           "kwin-testInputMethod"
                           "kwin-testPlasmaWindow" ;; require plasma-workspace qml module.
@@ -1473,7 +1473,21 @@ (define-public kwin
                           "kwin-testNightColor-waylandonly"
                           "kwin-testScriptedEffects"
                           "kwayland-testServerSideDecoration"
-                          "kwayland-testWaylandSurface")
+                          "kwayland-testWaylandSurface"
+
+                          "kwin-testLibinputDevice"
+                          "kwin-testLockScreen"
+                          "kwin-testTabBox"
+                          "kwin-testKeyboardLayout"
+                          "kwin-testQuickTiling"
+                          "kwin-testDbusInterface"
+                          "kwin-testX11KeyRead"
+                          "kwin-testVirtualKeyboardDBus"
+                          "kwin-testGlobalShortcuts"
+                          "kwin-testKWinBindings"
+                          "kwin-testMinimizeAllScript"
+                          "kwin-testLibinputDevice"
+                          "kwin-testX11Window")
                          "|"))))))))
     (native-inputs (list extra-cmake-modules
                          dbus
@@ -1484,6 +1498,7 @@ (define-public kwin
                          wayland-protocols
                          xorg-server-for-tests
                          python-minimal
+                         gcc-14 ;; for <format> header
                          ;; for QtWaylandScanner
                          qtwayland))
     (inputs (list breeze
@@ -1512,6 +1527,7 @@ (define-public kwin
                   knewstuff
                   knotifications
                   kpackage
+                  kpipewire
                   krunner
                   kscreenlocker
                   ktextwidgets
@@ -1523,6 +1539,7 @@ (define-public kwin
                   kguiaddons
                   libqaccessibilityclient
                   lcms
+                  libcanberra
                   libcap
                   libepoxy
                   libglvnd ; For OpenGLES
@@ -1536,6 +1553,7 @@ (define-public kwin
                   qtmultimedia
                   qtwayland
                   qtsensors
+                  qtsvg
                   wayland
                   xcb-util ;fails at build time without this
                   xcb-util-cursor