diff options
Diffstat (limited to 'gnu/packages/qt.scm')
| -rw-r--r-- | gnu/packages/qt.scm | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 34265cac0e..1d584dd555 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2013, 2014, 2015, 2023 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2015, 2025 宋文武 <iyzsong@envs.net> ;;; Copyright © 2015, 2018, 2019, 2020, 2021, 2023 Ludovic Courtès <ludo@gnu.org> -;;; Copyright © 2015-2019, 2024 Efraim Flashner <efraim@flashner.co.il> +;;; Copyright © 2015-2019, 2024, 2025 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016, 2017 Nikita <nikita@n0.is> ;;; Copyright © 2016 Thomas Danckaert <post@thomasdanckaert.be> ;;; Copyright © 2017, 2018, 2019, 2023 Ricardo Wurmus <rekado@elephly.net> @@ -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". @@ -4030,6 +4025,8 @@ linux/libcurl_wrapper.h" (modify-inputs (package-native-inputs qtwebengine-5) (delete "python2" "python2-six") (replace "node" node-lts) + ;; Try with a newer gperf after 6.8.2. + (replace "gperf" gperf-3.1) (append clang-18 lld-as-ld-wrapper-18 python-wrapper |