aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages/qt.scm
diff options
context:
space:
mode:
authorMarius Bakke <marius@gnu.org>2020-06-03 23:36:27 +0200
committerMarius Bakke <marius@gnu.org>2020-06-06 22:13:25 +0200
commit0ec1622cb26a351c7662f32877b5a8368f8f0584 (patch)
treeacc39238bc5856768f4dab6df49f3203aef8e75a /gnu/packages/qt.scm
parent7cfa1f5e78a2e2a4f0b068e67b0362ac12993005 (diff)
downloadguix-0ec1622cb26a351c7662f32877b5a8368f8f0584.tar
guix-0ec1622cb26a351c7662f32877b5a8368f8f0584.tar.gz
gnu: grantlee: Update to 5.2.0.
* gnu/packages/qt.scm (grantlee): Update to 5.2.0. [inputs]: Add QTDECLARATIVE. [arguments]: Remove #:configure-flags. Remove obsolete phase.
Diffstat (limited to 'gnu/packages/qt.scm')
-rw-r--r--gnu/packages/qt.scm20
1 files changed, 4 insertions, 16 deletions
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index bb5ed59ac9..ba12760b1a 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -101,7 +101,7 @@
(define-public grantlee
(package
(name "grantlee")
- (version "5.1.0")
+ (version "5.2.0")
(source
(origin
(method git-fetch)
@@ -110,30 +110,18 @@
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "1dmah2gd6zd4fgz2f4ir11dazqg067hjz8xshhywhfsmavchi626"))))
+ (base32 "02dyqxjyxiqxrlz5g7v9ly8f095vs3iha39l75q6s8axs36y01lq"))))
(native-inputs
;; Optional: lcov and cccc, both are for code coverage
`(("doxygen" ,doxygen)))
(inputs
`(("qtbase" ,qtbase)
+ ("qtdeclarative" ,qtdeclarative)
("qtscript" ,qtscript)))
(build-system cmake-build-system)
(arguments
- `(#:configure-flags '("-DCMAKE_CXX_STANDARD=11")
- #:phases
+ `(#:phases
(modify-phases %standard-phases
- (add-after 'unpack 'delete-broken-tests
- (lambda _
- ;; TODO: Two date tests (for date01 and date02) fail for unknown
- ;; reasons.
- ;; Actual (result): ""
- ;; Expected (output): "01"
- ;; Actual (result): ""
- ;; Expected (output): "Jan. 1, 2008"
- (delete-file "templates/tests/testfilters.cpp")
- (substitute* "templates/tests/CMakeLists.txt"
- (("testfilters") ""))
- #t))
(add-before 'check 'check-setup
(lambda _
;; make Qt render "offscreen", required for tests