guix_mirror_bot pushed a commit to branch master
in repository guix.

commit 7eb80557a1dafbe9e584ff0543dec972f33bd84c
Author: Danny Milosavljevic <[email protected]>
AuthorDate: Fri Feb 13 17:35:33 2026 +0000

    gnu: qtwayland@5: Update to 5.15.18.
    
    * gnu/packages/qt.scm (qtwayland-5): Update to 5.15.18.
    [arguments]<#:phases>{disable-failing-tests}: Skip
    tst_surface::createSubsurface, which expects an immediate parent
    surface commit after moving a subsurface.  KDE patch 0053 removed
    hidden wl_surface.commit calls from setMask(), so the commit is
    deferred to the next frame.
    
    Change-Id: I4f97030dc42e050f18a4353e91375f1f87b22730
---
 gnu/packages/qt.scm | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 13ae2d3b8b..aec939c736 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -2144,7 +2144,7 @@ record media, and manage a collection of media content.")
   (package
     (inherit qtsvg-5)
     (name "qtwayland")
-    (version "5.15.17")
+    (version "5.15.18")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
@@ -2211,7 +2211,7 @@ record media, and manage a collection of media content.")
                         
"qtwayland-5.15.18-0055-bradient-use-qwaylandwindow-actual-window-title.patch"))
               (sha256
                (base32
-                "1pz380ndfdb78nzhwvjjwyijil2x9vr51nv4sl01q9wrfcw2ylam"))))
+                "07gqgd6ixqnsvc9r1c9y92vaxwj11ijrqvnxib8sv6xwhcmhvw43"))))
     (arguments
      (substitute-keyword-arguments (package-arguments qtsvg-5)
        ((#:phases phases)
@@ -2240,6 +2240,15 @@ record media, and manage a collection of media content.")
                 (substitute* "tests/auto/client/xdgshell/tst_xdgshell.cpp"
                   
(("QCOMPOSITOR_TRY_COMPARE\\(xdgToplevel\\(\\)->m_committed\\.maxSize, 
QSize\\(500, 400\\)\\)")
                    "QSKIP(\"setMaximumSize no longer triggers a surface commit 
(patch 0053)\")"))
+                ;; Same issue: patch 0053 removed the wl_surface.commit
+                ;; from setMask(), so moving a subsurface no longer
+                ;; triggers an immediate parent surface commit.  The
+                ;; test expects the parent to commit right after
+                ;; setGeometry on the child, but the commit count
+                ;; stays at 0.
+                (substitute* "tests/auto/client/surface/tst_surface.cpp"
+                  (("window\\.setObjectName\\(\"main\"\\)")
+                   "QSKIP(\"subsurface move no longer triggers parent commit 
(patch 0053)\"); window.setObjectName(\"main\")"))
                 #$@(if (target-aarch64?)
                        ;; The tst_surface::createSubsurface test fails on
                        ;; aarch64 (see:

Reply via email to