amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: qtbase: Fix tst_qthread for all platforms.

Browse source 
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
This commit is contained in:
Maxim Cournoyer 2025-08-28 17:53:29 +09:00
parent 450e33b0f8
commit 7527222a27
No known key found for this signature in database
GPG key ID: 1260E46482E63562
1 changed files with 1 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

11
gnu/packages/qt.scm
View file

@ -779,6 +779,7 @@ developers using C++ or QML, a CSS & JavaScript like language.")
(patches (patches
(search-patches "qtbase-moc-ignore-gcc-macro.patch" (search-patches "qtbase-moc-ignore-gcc-macro.patch"
"qtbase-absolute-runpath.patch" "qtbase-absolute-runpath.patch"
"qtbase-fix-thread-test.patch"
"qtbase-qmake-use-libname.patch" "qtbase-qmake-use-libname.patch"
"qtbase-qmlimportscanner-qml-import-path.patch" "qtbase-qmlimportscanner-qml-import-path.patch"
"qtbase-qmake-fix-includedir.patch")))) "qtbase-qmake-fix-includedir.patch"))))
@ -899,16 +900,6 @@ tst_qt_cmake_create.cpp"
"dirs.append(\"" "dirs.append(\""
#$(this-package-input "shared-mime-info") "/share/mime" #$(this-package-input "shared-mime-info") "/share/mime"
"\");\n" all))))) "\");\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 (delete 'do-not-capture-python) ;move after patch-source-shebangs
(add-after 'patch-source-shebangs 'do-not-capture-python (add-after 'patch-source-shebangs 'do-not-capture-python
(lambda _ (lambda _