[bug#58054] [PATCH 0/2] gnu: Add qtwayland, version 6.3.1.

[Maxim Cournoyer]

Hello Hilton!

Hilton Chain <hako@ultrarare.space> writes:

> * gnu/packages/qt.scm (qtwayland): New variable.
> ---
>  gnu/packages/qt.scm | 49 +++++++++++++++++++++++++++++++++++++++++++++
>  1 file changed, 49 insertions(+)

Great work!

> diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
> index bf978eec50..25b246d7d4 100644
> --- a/gnu/packages/qt.scm
> +++ b/gnu/packages/qt.scm
> @@ -1500,6 +1500,55 @@ (define-public qtwayland-5
>      (description "The Qt Wayland module provides the QtWayland client and
>  compositor libraries.")))
>
> +(define-public qtwayland
> +  (package (inherit qtsvg)

For the qt 6 packages, I tried to not inherit from qtsvg, as while that
can shorten some repetition sometimes, it doesn't really make sense
(qtwayland is not related to qtsvg) and could cause problems down the
line.

> +    (name "qtwayland")
> +    (version "6.3.1")
> +    (source (origin
> +             (method url-fetch)
> +             (uri (qt-urls name version))
> +             (sha256
> +              (base32
> +               "1w60p1did7awdlzq5k8vnq2ncpskb07cpvz31cbv99bjs6igw53g"))))
> +    (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.

Please link to the upstream issue, already reported at
https://bugreports.qt.io/browse/QTBUG-78317?jql=text%20~%20%22animatedCursor%22.

> +                (substitute* "tests/auto/client/seatv4/tst_seatv4.cpp"
> +                  (((string-append "QVERIFY\\(!cursorSurface\\(\\)->"
> +                                   
> "m_waitingFrameCallbacks\\.empty\\(\\)\\);"))
> +                   "")
> +                  (("QTRY_COMPARE\\(bufferSpy\\.count\\(\\), 1\\);")
> +                   ""))))
> +            (add-before 'check 'set-test-environment
> +              (lambda _
> +                ;; Do not fail just because /etc/machine-id is missing.
> +                (setenv "DBUS_FATAL_WARNINGS" "0")))
> +            ;; No such directory anymore.
> +            (delete 'delete-installed-tests)))))

That's unwanted inherited stuff from qtsvg which should be no longer
necessary after removing the inheritance.

> +    (native-inputs
> +     (list glib perl pkg-config qtdeclarative))
> +    (inputs
> +     (list fontconfig
> +           freetype
> +           libx11
> +           libxcomposite
> +           libxext
> +           libxkbcommon
> +           libxrender
> +           mesa
> +           mtdev
> +           qtbase
> +           vulkan-headers
> +           wayland))
> +    (synopsis "Qt Wayland module")
> +    (description "The Qt Wayland module provides the QtWayland client and
> +compositor libraries.")))
> +

Please send a v2 version with the above addressed and it should be good
to merge it!

Thank you,

Maxim