ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-27 23:02:16 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: qtwayland-5: Update to 5.15.8.

Browse source 
* gnu/packages/qt.scm (qtwayland-5): Update to 5.15.8.
[arguments]: Use gexps.
This commit is contained in:
Maxim Cournoyer 2023-03-27 16:09:50 -04:00
parent d6d39598dc
commit 242492f154
No known key found for this signature in database
GPG key ID: 1260E46482E63562
1 changed files with 27 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
gnu/packages/qt.scm
View file

@ -1608,38 +1608,38 @@ (define-public qtmultimedia
(license (package-license qtbase))))
(define-public qtwayland-5
(package (inherit qtsvg-5)
(package
(inherit qtsvg-5)
(name "qtwayland")
(version "5.15.5")
(version "5.15.8")
(source (origin
(method url-fetch)
(uri (qt-urls name version))
(patches (search-patches "qtwayland-gcc-11.patch"
"qtwayland-dont-recreate-callbacks.patch"
"qtwayland-cleanup-callbacks.patch"))
(sha256
(base32
"0yy8qf9kn15iqsxi2r7jbcsc0vsdyfz7bbxmfn4i9qmz1yvg0jgr"))))
(method url-fetch)
(uri (qt-urls name version))
(patches (search-patches "qtwayland-gcc-11.patch"
"qtwayland-dont-recreate-callbacks.patch"
"qtwayland-cleanup-callbacks.patch"))
(sha256
(base32
"0aa5jcvvap6qca6imdkhs1mhv5bnaxn466mmpl7x78jx1za7n3ps"))))
(arguments
(substitute-keyword-arguments (package-arguments qtsvg-5)
((#: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\\);")
""))))
(add-before 'check 'set-test-environment
(lambda _
;; Do not fail just because /etc/machine-id is missing.
(setenv "DBUS_FATAL_WARNINGS" "0")))))))
(native-inputs
(list glib perl pkg-config qtdeclarative-5))
#~(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\\);")
""))))
(add-before 'check 'set-test-environment
(lambda _
;; Do not fail just because /etc/machine-id is missing.
(setenv "DBUS_FATAL_WARNINGS" "0")))))))
(native-inputs (list glib perl pkg-config qtdeclarative-5))
(inputs
(list fontconfig
freetype