me
/
guix
Archived
1
0
Fork 0
Code

gnu: qtdeclarative-5: Update to 5.15.8. 

* gnu/packages/qt.scm (qtdeclarative-5): Update to 5.15.8.
[arguments]: Use gexps.  Address TODO.
master
Maxim Cournoyer 2023-03-27 15:27:09 -04:00
parent cbd36c72be
commit eb03caf7d7
No known key found for this signature in database
GPG Key ID: 1260E46482E63562
1 changed files with 23 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
gnu/packages/qt.scm
View File

@ -1181,38 +1181,35 @@ XML and custom data models. It contains programs such as xmlpatterns and
xmlpatternsvalidator."))) xmlpatternsvalidator.")))
(define-public qtdeclarative-5 (define-public qtdeclarative-5
(package (inherit qtsvg-5) (package
(inherit qtsvg-5)
(name "qtdeclarative") (name "qtdeclarative")
(version "5.15.5") (version "5.15.8")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (qt-urls name version)) (uri (qt-urls name version))
(sha256 (sha256
(base32 (base32
"0ji5131g7h2mrgxw1wxc5mcvmsn3fbw64j28gzpa25gv3vcnkhaw")))) "1kb8nj17vmnky0ayiwypim7kf6rmlmfcjf6gnrw8rydmp61w0vh2"))))
(arguments (arguments
(substitute-keyword-arguments (package-arguments qtsvg-5) (substitute-keyword-arguments (package-arguments qtsvg-5)
((#:tests? _ #f) #f) ;TODO: Enable the tests ((#:tests? _ #f) #f) ;TODO: Enable the tests
((#:phases phases) ((#:phases phases)
`(modify-phases ,phases #~(modify-phases #$phases
(add-after 'build 'fix-qt5core-install-prefix (add-after 'build 'fix-qt5core-install-prefix
(lambda* (#:key outputs #:allow-other-keys) (lambda _
(let ((out (assoc-ref outputs "out")))
;; The Qt5Core install prefix is set to qtbase, but qmlcachegen ;; The Qt5Core install prefix is set to qtbase, but qmlcachegen
;; is provided by qtdeclarative-5. ;; is provided by qtdeclarative-5.
(substitute* (substitute*
"lib/cmake/Qt5QuickCompiler/Qt5QuickCompilerConfig.cmake" "lib/cmake/Qt5QuickCompiler/Qt5QuickCompilerConfig.cmake"
(("\\$\\{_qt5Core_install_prefix\\}") out))))) (("\\$\\{_qt5Core_install_prefix\\}") #$output))))
;; TODO: Add phase unconditionally. (add-after 'unpack 'fix-linking-riscv64
,@(if (target-riscv64?)
'((add-after 'unpack 'fix-linking-riscv64
(lambda _ (lambda _
(substitute* "src/qml/qml.pro" (substitute* "src/qml/qml.pro"
(("DEFINES \\+= QT_NO_FOREACH") (("DEFINES \\+= QT_NO_FOREACH")
(string-append (string-append
"isEqual(QT_ARCH, \"riscv64\"): QMAKE_LIBS += -latomic\n\n" "isEqual(QT_ARCH, \"riscv64\"): QMAKE_LIBS += -latomic\n\n"
"DEFINES += QT_NO_FOREACH")))))) "DEFINES += QT_NO_FOREACH")))))))))
'())))))
(native-inputs (native-inputs
(list perl (list perl
pkg-config pkg-config