From 299ec828fd159bec95265a502672aea6ab52397d Mon Sep 17 00:00:00 2001 From: Sughosha Date: Wed, 22 Oct 2025 22:29:35 +0530 Subject: [PATCH] gnu: kwin: Update to 6.5.0. * gnu/packages/kde-plasma.scm (kwin): Update to 6.5.0. [arguments]<#:test-exclude>: Exclude "kwin-testColorspaces", "kwin-testDrm", "kwin-testInputMethod", "kwin-testPlasmaWindow", "kwin-testButtonRebind", "kwin-testDecorationInput", "kwin-testPointerInput", "kwin-testXdgShellWindow", "kwin-testXdgShellWindow-waylandonly", "kwin-testSceneOpenGLES", "kwin-testSceneOpenGLES-waylandonly", "kwin-testNightColor", "kwin-testNightColor-waylandonly", "kwin-testScriptedEffects", "kwayland-testServerSideDecoration", "kwayland-testWaylandSurface", "kwin-testLibinputDevice", "kwin-testLockScreen", "kwin-testTabBox", "kwin-testKeyboardInput", "kwin-testKeyboardLayout", "kwin-testQuickTiling", "kwin-testDbusInterface", "kwin-testX11KeyRead", "kwin-testVirtualKeyboardDBus", "kwin-testGlobalShortcuts", "kwin-testKWinBindings", "kwin-testMinimizeAllScript", "kwin-testLibinputDevice", "kwin-testX11Window", "kwin-testXwaylandInput" and "kwin-testWindowRules". <#:phases>: In 'check phase, replace the tests to exclude with the test-exclude keyword. [inputs]: Remove kconfigwidgets and xcb-util-cursor. Change-Id: If7cb8cea3dc4f2b3b5d1baa98278c71136ac107c --- gnu/packages/kde-plasma.scm | 91 ++++++++++++++++++------------------- 1 file changed, 44 insertions(+), 47 deletions(-) diff --git a/gnu/packages/kde-plasma.scm b/gnu/packages/kde-plasma.scm index 59bc94d8647bbd0956a692acfee12e85fd4a2169..eea94c6634e0aba442b7f4f870a9008f2edf0360 100644 --- a/gnu/packages/kde-plasma.scm +++ b/gnu/packages/kde-plasma.scm @@ -1474,7 +1474,7 @@ KDE Frameworks components.") (define-public kwin (package (name "kwin") - (version "6.4.5") + (version "6.5.0") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" @@ -1483,11 +1483,51 @@ KDE Frameworks components.") (patches (search-patches "kwin-unwrap-executable-name-for-dot-desktop-search.patch")) (sha256 (base32 - "1xsiq5m9a2wgfn2jdj1m8wqjziwp9zzyfs57xp3qbhi7j6virkyy")))) + "10prbkvcad4xi0d4w7gq35lpf1l2izqwj59dwdzy4vr6h1wsdsp0")))) (build-system qt-build-system) (arguments (list #:qtbase qtbase + #:test-exclude + (string-append "(" + (string-join + '(;; Fails on an Apple M1 (aarch64) with the following error: + ;; TestColorspaces::roundtripConversion fails + "kwin-testColorspaces" + + "kwin-testDrm" ;; require Drm + "kwin-testInputMethod" + "kwin-testPlasmaWindow" ;; require plasma-workspace qml module. + "kwin-testButtonRebind" + "kwin-testDecorationInput" + "kwin-testPointerInput" + "kwin-testXdgShellWindow" + "kwin-testXdgShellWindow-waylandonly" + "kwin-testSceneOpenGLES" + "kwin-testSceneOpenGLES-waylandonly" + "kwin-testNightColor" + "kwin-testNightColor-waylandonly" + "kwin-testScriptedEffects" + "kwayland-testServerSideDecoration" + "kwayland-testWaylandSurface" + + "kwin-testLibinputDevice" + "kwin-testLockScreen" + "kwin-testTabBox" + "kwin-testKeyboardInput" + "kwin-testKeyboardLayout" + "kwin-testQuickTiling" + "kwin-testDbusInterface" + "kwin-testX11KeyRead" + "kwin-testVirtualKeyboardDBus" + "kwin-testGlobalShortcuts" + "kwin-testKWinBindings" + "kwin-testMinimizeAllScript" + "kwin-testLibinputDevice" + "kwin-testX11Window" + "kwin-testXwaylandInput" + "kwin-testWindowRules") + "|")) #:phases #~(modify-phases %standard-phases (add-after 'unpack 'patch @@ -1519,7 +1559,7 @@ KDE Frameworks components.") (("/usr/share") (string-append #$(this-package-input "hwdata") "/share"))))) (replace 'check - (lambda* (#:key tests? #:allow-other-keys) + (lambda* (#:key tests? (test-exclude "") #:allow-other-keys) (when tests? (setenv "XDG_RUNTIME_DIR" (getcwd)) (setenv "HOME" (getcwd)) @@ -1533,48 +1573,7 @@ KDE Frameworks components.") (setenv "DISPLAY" ":1") (system "Xvfb :1 &") (sleep 5) - (invoke "dbus-launch" - "ctest" - "-E" - (string-join - (list - ;; Fails on an Apple M1 (aarch64) with the following error: - ;; TestColorspaces::roundtripConversion fails - "kwin-testColorspaces" - - "kwin-testDrm" ;; require Drm - "kwin-testInputMethod" - "kwin-testPlasmaWindow" ;; require plasma-workspace qml module. - "kwin-testButtonRebind" - "kwin-testDecorationInput" - "kwin-testPointerInput" - "kwin-testXdgShellWindow" - "kwin-testXdgShellWindow-waylandonly" - "kwin-testSceneOpenGLES" - "kwin-testSceneOpenGLES-waylandonly" - "kwin-testNightColor" - "kwin-testNightColor-waylandonly" - "kwin-testScriptedEffects" - "kwayland-testServerSideDecoration" - "kwayland-testWaylandSurface" - - "kwin-testLibinputDevice" - "kwin-testLockScreen" - "kwin-testTabBox" - "kwin-testKeyboardInput" - "kwin-testKeyboardLayout" - "kwin-testQuickTiling" - "kwin-testDbusInterface" - "kwin-testX11KeyRead" - "kwin-testVirtualKeyboardDBus" - "kwin-testGlobalShortcuts" - "kwin-testKWinBindings" - "kwin-testMinimizeAllScript" - "kwin-testLibinputDevice" - "kwin-testX11Window" - "kwin-testXwaylandInput" - "kwin-testWindowRules") - "|")))))))) + (invoke "dbus-launch" "ctest" "-E" test-exclude))))))) (native-inputs (list extra-cmake-modules dbus kdoctools @@ -1596,7 +1595,6 @@ KDE Frameworks components.") kcmutils kcompletion kconfig - kconfigwidgets kcoreaddons kcrash kdbusaddons @@ -1640,7 +1638,6 @@ KDE Frameworks components.") qtsvg wayland xcb-util ;fails at build time without this - xcb-util-cursor xcb-util-keysyms xcb-util-wm xcmsdb