[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
234/416: gnu: qtdeclarative-5: Update to 5.15.8.
From: |
guix-commits |
Subject: |
234/416: gnu: qtdeclarative-5: Update to 5.15.8. |
Date: |
Fri, 14 Apr 2023 15:25:58 -0400 (EDT) |
apteryx pushed a commit to branch master
in repository guix.
commit eb03caf7d7a8a9f0439ff7c5f99158170220c455
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Mon Mar 27 15:27:09 2023 -0400
gnu: qtdeclarative-5: Update to 5.15.8.
* gnu/packages/qt.scm (qtdeclarative-5): Update to 5.15.8.
[arguments]: Use gexps. Address TODO.
---
gnu/packages/qt.scm | 49 +++++++++++++++++++++++--------------------------
1 file 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
- 206/416: gnu: rust-cargo: Update to 0.60.0., (continued)
- 206/416: gnu: rust-cargo: Update to 0.60.0., guix-commits, 2023/04/14
- 207/416: gnu: rav1e: Fix building., guix-commits, 2023/04/14
- 209/416: NEWS: Mention new rpm format., guix-commits, 2023/04/14
- 214/416: gnu: gst-plugins-bad: Update to 1.22.1 and reinstate a few tests., guix-commits, 2023/04/14
- 215/416: gnu: gst-plugins-ugly: Update to 1.22.1., guix-commits, 2023/04/14
- 216/416: gnu: gst-libav: Update to 1.22.1., guix-commits, 2023/04/14
- 220/416: gnu: ffmpeg-5: Rename variable to ffmpeg., guix-commits, 2023/04/14
- 212/416: gnu: gst-plugins-base: Update to 1.22.1., guix-commits, 2023/04/14
- 221/416: gnu: ffmpeg: Update to 6.0., guix-commits, 2023/04/14
- 229/416: gnu: qt3d-5: Update to 5.15.8., guix-commits, 2023/04/14
- 234/416: gnu: qtdeclarative-5: Update to 5.15.8.,
guix-commits <=
- 245/416: gnu: qtlocation: Update to 5.15.5., guix-commits, 2023/04/14
- 248/416: gnu: qtquickcontrols-5: Update to 5.15.8., guix-commits, 2023/04/14
- 249/416: gnu: qtquickcontrols2-5: Update to 5.15.8., guix-commits, 2023/04/14
- 266/416: gnu: ruby-puma: Disable a flaky test., guix-commits, 2023/04/14
- 278/416: gnu: python-coverage: Update to 5.5., guix-commits, 2023/04/14
- 289/416: gnu: Add orangeduck-mpc., guix-commits, 2023/04/14
- 293/416: gnu: utf8-h: Install header under include/utf8 prefix., guix-commits, 2023/04/14
- 294/416: gnu: imgui: Use gexp output variables., guix-commits, 2023/04/14
- 295/416: gnu: Add imgui-1.87., guix-commits, 2023/04/14
- 300/416: gnu: farstream: Use gexps., guix-commits, 2023/04/14