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: qtbase: Update to 6.5.2.

Browse source 
* gnu/packages/qt.scm (qtbase): Update to 6.5.2.  Use normal inheritance, not
package/inherit, as the package is distinct and not a variant (it does not use
the same source).
[arguments]: Disable a few newly failing tests in the check phase.  Adjust the
patch-mkspecs phase.
[inputs]: Remove extraneous postgresql replacement.  Add at-spi2-core, libice,
libsm, libxext and xcb-util-cursor.

Series-changes: 2
- Fix xcb backend by adding missing inputs
This commit is contained in:
Maxim Cournoyer 2023-08-11 21:21:58 -04:00
parent 0b994bb9b1
commit d31352dad0
No known key found for this signature in database
GPG key ID: 1260E46482E63562
1 changed files with 26 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
gnu/packages/qt.scm
View file

@ -607,15 +607,16 @@ (define-public qtbase-5
(license (list license:lgpl2.1 license:lgpl3)))) (license (list license:lgpl2.1 license:lgpl3))))
(define-public qtbase (define-public qtbase
(package/inherit qtbase-5 (package
(inherit qtbase-5)
(name "qtbase") (name "qtbase")
(version "6.3.2") (version "6.5.2")
(source (origin (source (origin
(inherit (package-source qtbase-5)) (inherit (package-source qtbase-5))
(uri (qt-url name version)) (uri (qt-url name version))
(sha256 (sha256
(base32 (base32
"19m9r8sf9mvyrwipn44if3nhding4ljys2mwf04b7dkhz16vlabr")) "0s8jwzdcv97dfy8n3jjm8zzvllv380l73mwdva7rs2nqnhlwgd1x"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
;; corelib uses bundled harfbuzz, md4, md5, sha3 ;; corelib uses bundled harfbuzz, md4, md5, sha3
@ -768,6 +769,18 @@ (define-public qtbase
(list (list
;; The 'tst_moc' test fails with "'fi.exists()' returned FALSE". ;; The 'tst_moc' test fails with "'fi.exists()' returned FALSE".
"tst_moc" "tst_moc"
;; The 'tst_qdate' test fails because the current time
;; is reported as an invalid date (see:
;; https://bugreports.qt.io/browse/QTBUG-116017).
"tst_qdate"
;; The qgraphicsview and qopenglwidget tests fail with a
;; segfault for unknown reasons (see:
;; https://bugreports.qt.io/browse/QTBUG-116018).
"tst_qgraphicsview"
"tst_qopenglwidget"
;; The 'test_rcc' test fails on a comparison: ;; The 'test_rcc' test fails on a comparison:
;; <<<<<< actual ;; <<<<<< actual
;; 0x0,0x0,0x0,0x0,0x0,0x0,0x3,0xe8, ;; 0x0,0x0,0x0,0x0,0x0,0x0,0x3,0xe8,
@ -879,8 +892,7 @@ (define-public qtbase
(search-input-file (search-input-file
outputs outputs
(string-append "lib/qt6/mkspecs/features/" file))) (string-append "lib/qt6/mkspecs/features/" file)))
'("device_config.prf" "moc.prf" "qt_build_config.prf" '("device_config.prf" "moc.prf" "qt_config.prf"))
"qt_config.prf"))
(("\\$\\$\\[QT_HOST_DATA/get\\]") archdata) (("\\$\\$\\[QT_HOST_DATA/get\\]") archdata)
(("\\$\\$\\[QT_HOST_DATA/src\\]") archdata))))))))) (("\\$\\$\\[QT_HOST_DATA/src\\]") archdata)))))))))
(native-inputs (native-inputs
@ -889,8 +901,15 @@ (define-public qtbase
xvfb-run))) xvfb-run)))
(inputs (inputs
(modify-inputs (package-inputs qtbase-5) (modify-inputs (package-inputs qtbase-5)
(prepend bash-minimal coreutils-minimal libxcb md4c) (prepend at-spi2-core
(replace "postgresql" postgresql))) ;use latest postgresql bash-minimal
coreutils-minimal
md4c
libice
libsm
libxcb
libxext
xcb-util-cursor)))
(native-search-paths (native-search-paths
(list (search-path-specification (list (search-path-specification
(variable "QMAKEPATH") (variable "QMAKEPATH")