From 6e5458ebb15b6cc495f6b46724138b653826c1ca Mon Sep 17 00:00:00 2001
From: Eric Brown <ecbrown@ericcbrown.com>
Date: Fri, 21 May 2021 17:21:59 -0500
Subject: [PATCH 12/37] gnu: qtwayland: Update to 6.1.0

* gnu/packages/qt.scm (qtwayland): Update to 6.1.0
* gnu/packages/qt.scm (qtwayland-5): New variable.
---
 gnu/packages/kde-frameworks.scm |  2 +-
 gnu/packages/kde.scm            |  2 +-
 gnu/packages/qt.scm             | 58 +++++++++++++++++++++++++++++++--
 gnu/packages/telegram.scm       |  2 +-
 4 files changed, 58 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index 9b78741ae0..3233a0d4f6 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -1075,7 +1075,7 @@ integration with a custom editor as well as a ready-to-use
        ("pkg-config" ,pkg-config)))
     (inputs
      `(("qtbase" ,qtbase-5)
-       ("qtwayland" ,qtwayland)
+       ("qtwayland" ,qtwayland-5)
        ("wayland" ,wayland)
        ("wayland-protocols" ,wayland-protocols)))
     (arguments
diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm
index 3a42e544eb..55832f0f2a 100644
--- a/gnu/packages/kde.scm
+++ b/gnu/packages/kde.scm
@@ -754,7 +754,7 @@ different notification systems.")
        ("qtmultimedia" ,qtmultimedia-5)
        ("qtquickcontrols" ,qtquickcontrols)
        ("qtquickcontrols2" ,qtquickcontrols2)
-       ("qtwayland" ,qtwayland)
+       ("qtwayland" ,qtwayland-5)
        ("qtx11extras" ,qtx11extras-5)))
     (home-page "https://community.kde.org/KDEConnect")
     (synopsis "Enable your devices to communicate with each other")
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 89093eb41d..f24f0f1416 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -236,7 +236,7 @@ window managers, that don't provide Qt integration by themselves.")
          ("pkg-config" ,pkg-config)))
       (inputs
        `(("qtbase" ,qtbase-5)
-         ("qtwayland" ,qtwayland)
+         ("qtwayland" ,qtwayland-5)
          ("wayland" ,wayland)
          ("xkbcommon" ,libxkbcommon)))
       (synopsis "Material Decoration for Qt")
@@ -1133,12 +1133,64 @@ record media, and manage a collection of media content.  It also contains a
 set of plugins for interacting with pulseaudio and GStreamer.")))
 
 (define-public qtwayland
-  (package (inherit qtsvg-5)
+  (package (inherit qtsvg)
     (name "qtwayland")
-    (version "5.15.2")
+    (version "6.1.0")
     (source (origin
              (method url-fetch)
              (uri (qt5-urls name version))
+             (sha256
+              (base32
+               "15xdf2daal365a0bkhfs5bdmb58ljaimiwxccic6p9hl83z8yznn"))))
+    (arguments
+     (substitute-keyword-arguments (package-arguments qtsvg)
+       ((#:phases phases)
+        `(modify-phases ,phases
+           (add-after 'unpack 'disable-failing-tests
+             (lambda _
+               ;; FIXME: tst_seatv4::animatedCursor() fails for no good
+               ;; reason and breaks these two tests.
+               (substitute* "tests/auto/client/seatv4/tst_seatv4.cpp"
+                 (((string-append "QVERIFY\\(!cursorSurface\\(\\)->"
+                                  "m_waitingFrameCallbacks\\.empty\\(\\)\\);"))
+                  "")
+                 (("QTRY_COMPARE\\(bufferSpy\\.count\\(\\), 1\\);")
+                  ""))
+               #t))
+           (add-before 'check 'set-test-environment
+             (lambda _
+               ;; Do not fail just because /etc/machine-id is missing.
+               (setenv "DBUS_FATAL_WARNINGS" "0")
+               #t))))))
+    (native-inputs
+     `(("glib" ,glib)
+       ("perl" ,perl)
+       ("pkg-config" ,pkg-config)
+       ("qtdeclarative" ,qtdeclarative)))
+    (inputs
+     `(("fontconfig" ,fontconfig)
+       ("freetype" ,freetype)
+       ("libx11" ,libx11)
+       ("libxcomposite" ,libxcomposite)
+       ("libxext" ,libxext)
+       ("libxkbcommon" ,libxkbcommon)
+       ("libxrender" ,libxrender)
+       ("mesa" ,mesa)
+       ("mtdev" ,mtdev)
+       ("qtbase" ,qtbase)
+       ("vulkan-headers" ,vulkan-headers)
+       ("wayland" ,wayland)))
+    (synopsis "Qt Wayland module")
+    (description "The Qt Wayland module provides the QtWayland client and
+compositor libraries.")))
+
+(define-public qtwayland-5
+  (package (inherit qtsvg-5)
+    (name "qtwayland-5")
+    (version "5.15.2")
+    (source (origin
+             (method url-fetch)
+             (uri (qt5-urls "qtwayland" version))
              (sha256
               (base32
                "1ddfx4nak16xx0zh1kl836zxvpbixmmjyplsmfmg65pqkwi34dqr"))))
diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm
index e787615468..53a1ffbb22 100644
--- a/gnu/packages/telegram.scm
+++ b/gnu/packages/telegram.scm
@@ -541,7 +541,7 @@ Telegram project, for its use in telegram desktop client.")
        ("qt" ,qtbase-5)
        ("qt5ct" ,qt5ct)
        ("qtimageformats" ,qtimageformats-5)
-       ("qtwayland" ,qtwayland)
+       ("qtwayland" ,qtwayland-5)
        ("range-v3" ,range-v3)
        ("rlottie" ,rlottie-for-telegram-desktop)
        ("tgcalls-source"
-- 
2.31.1