---
gnu/packages/qt.scm | 32 ++++++++++++++++++--------------
1 file changed, 18 insertions(+), 14 deletions(-)
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index acf2d70736..46fbdb2368 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -68,6 +68,7 @@ (define-module (gnu packages qt)
#:use-module (gnu packages cmake)
#:use-module (gnu packages compression)
#:use-module (gnu packages cpp)
+ #:use-module (gnu packages crypto)
#:use-module (gnu packages cups)
#:use-module (gnu packages curl)
#:use-module (gnu packages databases)
@@ -593,29 +594,28 @@ (define-public qtbase-5
(define-public qtbase
(package/inherit qtbase-5
(name "qtbase")
- (version "6.3.2")
+ (version "6.5.0")
(source (origin
(inherit (package-source qtbase-5))
(uri (qt-urls name version))
(sha256
(base32
- "19m9r8sf9mvyrwipn44if3nhding4ljys2mwf04b7dkhz16vlabr"))
+ "1vzmxak112llvnx9rdgss99i9bc88rzsaxn59wdyqr5y9xxsmqgx"))
(modules '((guix build utils)))
(snippet
;; corelib uses bundled harfbuzz, md4, md5, sha3
'(with-directory-excursion "src/3rdparty"
(for-each delete-file-recursively
- ;; The bundled pcre2 copy is kept, as its headers
- ;; are required by some internal bootstrap target
- ;; used for the tools.
- (list "double-conversion" "freetype" "harfbuzz-ng"
- "libpng" "libjpeg" "sqlite" "xcb"
"zlib"))))))
+ (list "blake2" "double-conversion" "freetype"
+ "harfbuzz-ng" "libpng" "libjpeg" "pcre2"
+ "sqlite" "xcb" "zlib"))))))
(build-system cmake-build-system)
(arguments
(substitute-keyword-arguments (package-arguments qtbase-5)
((#:configure-flags _ ''())
`(let ((out (assoc-ref %outputs "out")))
- (list "-DQT_BUILD_TESTS=ON"
+ (list "-GNinja"
+ "-DQT_BUILD_TESTS=ON"
(string-append "-DINSTALL_ARCHDATADIR=" out "/lib/qt6")
(string-append "-DINSTALL_DATADIR=" out "/share/qt6")
(string-append "-DINSTALL_DOCDIR=" out "/share/doc/qt6")
@@ -759,9 +759,6 @@ (define-public qtbase
;; The 'tst_qfilesystemwatcher' installs a watcher on
;; '/home', which doesn't exist in the build container.
"tst_qfilesystemwatcher"
- ;; Not all of the tested formats are supported by our
- ;; build of openssl; 871 passed, 122 failed.
- "tst_qsslkey"
;; The 'mockplugins' test fail following error: "Unknown
;; platform linux-g++", and the other plugin tests
;; depend on it.
@@ -848,14 +845,21 @@ (define-public qtbase
'("device_config.prf" "moc.prf"
"qt_build_config.prf"
"qt_config.prf"))
(("\\$\\$\\[QT_HOST_DATA/get\\]") archdata)
- (("\\$\\$\\[QT_HOST_DATA/src\\]") archdata)))))))))
+ (("\\$\\$\\[QT_HOST_DATA/src\\]") archdata)))))
+ (replace 'build
+ (lambda* _
+ (invoke "cmake" "--build" ".")))
+ (replace 'install
+ (lambda* _
+ (invoke "cmake" "--install" ".")))))))
(native-inputs
(modify-inputs (package-native-inputs qtbase-5)
- (prepend wayland-protocols
+ (prepend ninja
+ wayland-protocols
xvfb-run)))
(inputs
(modify-inputs (package-inputs qtbase-5)
- (prepend bash-minimal coreutils-minimal libxcb md4c)
+ (prepend bash-minimal coreutils-minimal libb2 libxcb md4c)
(replace "postgresql" postgresql))) ;use latest postgresql
(native-search-paths
(list (search-path-specification
base-commit: ac8b2a0469a4884353ac5c0f0854012da0b04fda
--
2.39.2
