diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2023-03-27 15:27:09 -0400 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2023-04-14 15:11:40 -0400 |
| commit | eb03caf7d7a8a9f0439ff7c5f99158170220c455 (patch) | |
| tree | 674d3cbea2ee7b358fdcb598a01a618000b56deb /gnu/packages/qt.scm | |
| parent | cbd36c72bedfb60bda3af7fd84af5e994a5f04a5 (diff) | |
| download | guix-eb03caf7d7a8a9f0439ff7c5f99158170220c455.tar.gz | |
gnu: qtdeclarative-5: Update to 5.15.8.
* gnu/packages/qt.scm (qtdeclarative-5): Update to 5.15.8. [arguments]: Use gexps. Address TODO.
Diffstat (limited to 'gnu/packages/qt.scm')
| -rw-r--r-- | gnu/packages/qt.scm | 49 |
1 files changed, 23 insertions, 26 deletions
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index ad43be4821..6de6bbe599 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -1181,38 +1181,35 @@ XML and custom data models. It contains programs such as xmlpatterns and xmlpatternsvalidator."))) (define-public qtdeclarative-5 - (package (inherit qtsvg-5) + (package + (inherit qtsvg-5) (name "qtdeclarative") - (version "5.15.5") + (version "5.15.8") (source (origin - (method url-fetch) - (uri (qt-urls name version)) - (sha256 - (base32 - "0ji5131g7h2mrgxw1wxc5mcvmsn3fbw64j28gzpa25gv3vcnkhaw")))) + (method url-fetch) + (uri (qt-urls name version)) + (sha256 + (base32 + "1kb8nj17vmnky0ayiwypim7kf6rmlmfcjf6gnrw8rydmp61w0vh2")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg-5) ((#:tests? _ #f) #f) ;TODO: Enable the tests ((#:phases phases) - `(modify-phases ,phases - (add-after 'build 'fix-qt5core-install-prefix - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - ;; The Qt5Core install prefix is set to qtbase, but qmlcachegen - ;; is provided by qtdeclarative-5. - (substitute* - "lib/cmake/Qt5QuickCompiler/Qt5QuickCompilerConfig.cmake" - (("\\$\\{_qt5Core_install_prefix\\}") out))))) - ;; TODO: Add phase unconditionally. - ,@(if (target-riscv64?) - '((add-after 'unpack 'fix-linking-riscv64 - (lambda _ - (substitute* "src/qml/qml.pro" - (("DEFINES \\+= QT_NO_FOREACH") - (string-append - "isEqual(QT_ARCH, \"riscv64\"): QMAKE_LIBS += -latomic\n\n" - "DEFINES += QT_NO_FOREACH")))))) - '()))))) + #~(modify-phases #$phases + (add-after 'build 'fix-qt5core-install-prefix + (lambda _ + ;; The Qt5Core install prefix is set to qtbase, but qmlcachegen + ;; is provided by qtdeclarative-5. + (substitute* + "lib/cmake/Qt5QuickCompiler/Qt5QuickCompilerConfig.cmake" + (("\\$\\{_qt5Core_install_prefix\\}") #$output)))) + (add-after 'unpack 'fix-linking-riscv64 + (lambda _ + (substitute* "src/qml/qml.pro" + (("DEFINES \\+= QT_NO_FOREACH") + (string-append + "isEqual(QT_ARCH, \"riscv64\"): QMAKE_LIBS += -latomic\n\n" + "DEFINES += QT_NO_FOREACH"))))))))) (native-inputs (list perl pkg-config |