diff options
Diffstat (limited to 'gnu/packages/qt.scm')
| -rw-r--r-- | gnu/packages/qt.scm | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 34265cac0e..c2de89668f 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -761,13 +761,13 @@ developers using C++ or QML, a CSS & JavaScript like language.") (package (inherit qtbase-5) (name "qtbase") - (version "6.8.2") + (version "6.8.3") (source (origin (inherit (package-source qtbase-5)) (uri (qt-url name version)) (sha256 (base32 - "01gy1p8zvxq8771x6iqkrc7s3kzdddgf1i7xj656w7j1dp746801")) + "100bkvs320s9gim4j7l6wkrl1abz1mwbmwwrscir1fq1as81n02n")) (modules '((guix build utils))) (snippet ;; corelib uses bundled harfbuzz, md4, md5, sha3 @@ -779,6 +779,7 @@ developers using C++ or QML, a CSS & JavaScript like language.") (patches (search-patches "qtbase-moc-ignore-gcc-macro.patch" "qtbase-absolute-runpath.patch" + "qtbase-fix-thread-test.patch" "qtbase-qmake-use-libname.patch" "qtbase-qmlimportscanner-qml-import-path.patch" "qtbase-qmake-fix-includedir.patch")))) @@ -899,16 +900,6 @@ tst_qt_cmake_create.cpp" "dirs.append(\"" #$(this-package-input "shared-mime-info") "/share/mime" "\");\n" all))))) - #$@(if (target-aarch64?) - ;; backport of 2bce75a6b53cccbf9c813581b64eea87f3ab55fc, - ;; which makes flaky tst_qthread less flaky. - #~((add-after 'patch-more-paths 'patch-aarch64-tests - (lambda _ - (invoke - "patch" "-p1" "-i" - #$(local-file - (search-patch "qtbase-fix-thread-test.patch")))))) - #~()) (delete 'do-not-capture-python) ;move after patch-source-shebangs (add-after 'patch-source-shebangs 'do-not-capture-python (lambda _ @@ -1013,6 +1004,10 @@ tst_qt_cmake_create.cpp" ;; The 'tst_qsqlthread' test sometimes fails. "tst_qsqlthread" + ;; The 'tst_qthread' test is also flaky, despite the + ;; patch applied that promised to fix it. + "tst_qthread" + ;; The 'tst_qsystemsemaphore' test sometimes fails. "tst_qsystemsemaphore" ;; The 'tst_moc' test fails with "'fi.exists()' returned FALSE". |