diff options
| author | Zheng Junjie <zhengjunjie@iscas.ac.cn> | 2024-09-10 20:53:14 +0800 |
|---|---|---|
| committer | John Kehayias <john.kehayias@protonmail.com> | 2024-11-05 11:56:40 -0500 |
| commit | baef6448695482220c9d9b82dfa8d6e2dbba4674 (patch) | |
| tree | 28728404af457509079898519ed410b1ea753b11 /gnu/packages/qt.scm | |
| parent | e13f4b10c5875ea4d2e174b82c5ae10985d6dfb4 (diff) | |
| download | guix-baef6448695482220c9d9b82dfa8d6e2dbba4674.tar guix-baef6448695482220c9d9b82dfa8d6e2dbba4674.tar.gz | |
gnu: qtwayland-6: Fix build.
* gnu/packages/patches/qtwayland-6-update-wayland-xml.patch: new patch.
* gnu/local.mk (dist_patch_DATA): Registered it.
* gnu/packages/qt.scm (qtwayland-6)[source]: Use it.
[arguments]<#:phases>: Adjust disable-failing-tests to disable tst_scaling
test.
Change-Id: I23aa602ce572e2a1eb5092bada97a84ba4af596e
Diffstat (limited to 'gnu/packages/qt.scm')
| -rw-r--r-- | gnu/packages/qt.scm | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 687c20cd90..37d9eb0bee 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -2011,6 +2011,8 @@ compositor libraries."))) (origin (method url-fetch) (uri (qt-url name version)) + (patches (search-patches + "qtwayland-6-update-wayland-xml.patch")) (sha256 (base32 "0gamcqpl302wlznfnlcg9vlnnhfpxgjnz05prwc9wpy0xh7wqvm9")))) (build-system cmake-build-system) @@ -2026,7 +2028,11 @@ compositor libraries."))) (((string-append "QVERIFY\\(!cursorSurface\\(\\)->" "m_waitingFrameCallbacks\\.empty\\(\\)\\);")) "") - (("QTRY_COMPARE\\(bufferSpy\\.size\\(\\), 1\\);") "")))) + (("QTRY_COMPARE\\(bufferSpy\\.size\\(\\), 1\\);") "")) + ;; known failing with wayland-1.23.0, so skip this. + ;; See also: <https://bugreports.qt.io/browse/QTBUG-126379> + (substitute* "tests/auto/client/CMakeLists.txt" + (("add_subdirectory\\(scaling\\)") "")))) (add-before 'check 'set-test-environment (lambda _ (setenv "XDG_RUNTIME_DIR" (getcwd)) |