guix_mirror_bot pushed a commit to branch master
in repository guix.
commit 7527222a27dde45dbcac88218df01f7f35780425
Author: Maxim Cournoyer <[email protected]>
AuthorDate: Thu Aug 28 17:53:29 2025 +0900
gnu: qtbase: Fix tst_qthread for all platforms.
Rediscovered on x86_64... (see
<https://bugreports.qt.io/browse/QTBUG-139617>).
* gnu/packages/qt.scm (qtbase) [source]: Add qtbase-fix-thread-test.patch.
[#:phases] {patch-aarch64-tests}: Delete.
Change-Id: I1e77b5cd5f649138590fbe5b92f85c207a239254
---
gnu/packages/qt.scm | 11 +----------
1 file changed, 1 insertion(+), 10 deletions(-)
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 34265cac0e..6632902b16 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -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 _
