[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
39/72: gnu: qt-creator: Update to 11.0.1.
From: |
guix-commits |
Subject: |
39/72: gnu: qt-creator: Update to 11.0.1. |
Date: |
Tue, 15 Aug 2023 20:42:27 -0400 (EDT) |
apteryx pushed a commit to branch qt-updates
in repository guix.
commit e4e2516625a048418de8ac066946ddb3e2e05ba8
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Sat Aug 12 22:16:51 2023 -0400
gnu: qt-creator: Update to 11.0.1.
* gnu/packages/qt.scm (qt-creator): Update to 11.0.1.
[source]: Adjust snippet.
[arguments]: Adjust patch-paths phase. Disable the 'tst_process' failing
tests.
Series-to: 65280@debbugs.gnu.org
Cover-letter:
Refresh Qt 6 packages
This series refreshes our modern Qt 6 packages to their latest release,
6.5.2. It also adds some tooling for the Qt team in the form of two
manifests
to select all the core Qt 5 packages or the other core packages.
END
Series-version: 2
Series-changes: 2
- Delete fix-tests-build phase
- Only one new test is now disabled
---
gnu/packages/qt.scm | 35 +++++++++++++++++++----------------
1 file changed, 19 insertions(+), 16 deletions(-)
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 0d84231cef..c858bab571 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -4820,7 +4820,7 @@ including @i{fix-its} for automatic refactoring.")
(define-public qt-creator
(package
(name "qt-creator")
- (version "9.0.0")
+ (version "11.0.1")
(source (origin
(method url-fetch)
(uri (string-append
@@ -4834,7 +4834,6 @@ including @i{fix-its} for automatic refactoring.")
;; Remove bundled libraries, where supported.
;; TODO: package and unbundle litehtml
'("src/libs/3rdparty/yaml-cpp"
- "src/shared/qbs/src/shared/qtscript/src/3rdparty"
"tests/unit/unittest/3rdparty"
;; Marketplace recommends nonfree extensions;
;; remove it.
@@ -4845,7 +4844,7 @@ including @i{fix-its} for automatic refactoring.")
((".*marketplace/marketplace.qbs.*") ""))))
(sha256
(base32
- "1adyxs0cnqx14gwzkvh909c52449ia6y87n1r4qf6wwydhch43cs"))))
+ "0j90dv9micqsvj4r7iqd11szixr0mlpna4w5s2lnyqckjs6a0mm6"))))
(build-system qt-build-system)
(arguments
(list
@@ -4861,25 +4860,17 @@ including @i{fix-its} for automatic refactoring.")
#$output "/lib/qtcreator"))
#:phases
#~(modify-phases %standard-phases
- (add-after 'unpack 'fix-tests-build
- (lambda _
- ;; Add a missing link directive (see:
- ;; https://bugreports.qt.io/browse/QTCREATORBUG-28434).
- (substitute* "src/libs/tracing/CMakeLists.txt"
- (("DEPENDS Utils Qt5::Qml Qt5::Quick")
- "DEPENDS Utils Qt5::Quick")
- (("PUBLIC_DEPENDS Qt5::Widgets")
- "PUBLIC_DEPENDS Qt5::Widgets Qt5::Qml"))))
(add-after 'unpack 'patch-paths
(lambda* (#:key inputs #:allow-other-keys)
(substitute* '("src/libs/utils/commandline.cpp"
"src/libs/utils/deviceshell.cpp")
(("/bin/sh")
(search-input-file inputs "bin/sh")))
- (substitute* "src/libs/utils/qtcprocess.cpp"
+ (substitute* "src/libs/utils/process.cpp"
(("/usr/bin/env")
(search-input-file inputs "bin/env")))
- (substitute* "tests/auto/utils/qtcprocess/tst_qtcprocess.cpp"
+ (substitute* '("tests/auto/utils/process/tst_process.cpp"
+
"tests/auto/utils/commandline/tst_commandline.cpp")
(("/bin/sh")
(which "sh")))))
(add-before 'build 'build-doc
@@ -4892,7 +4883,6 @@ including @i{fix-its} for automatic refactoring.")
(invoke "cmake" "--install" "." "--prefix" #$output
"--component=html_docs")))
(replace 'check
- ;; Loosely based on .github/workflows/build_cmake.yml.
(lambda* (#:key tests? parallel-tests? #:allow-other-keys)
(when tests?
(invoke "xvfb-run" ;for the 'renderpass' tests
@@ -4900,7 +4890,20 @@ including @i{fix-its} for automatic refactoring.")
(number->string (parallel-job-count))
"1")
"--label-exclude" "exclude_from_precheck"
- "--exclude-regex" "tst_perfdata"))))
+ "-E"
+ (string-append
+ "("
+ (string-join
+ (list
+ ;; The performance data tests require external
+ ;; data.
+ "tst_perfdata"
+ ;; This test relies on counting processes, counts
+ ;; only 0 of them instead of 5 for unknown reasons
+ ;; (see:
+ ;;
https://bugreports.qt.io/browse/QTCREATORBUG-29495).
+ "tst_process") "|")
+ ")")))))
(add-after 'qt-wrap 'wrap-bin
;; Make a few well-integrated tools readily available.
(lambda* (#:key inputs outputs #:allow-other-keys)
- 10/72: gnu-maintenance: Extract 'canonicalize-url' from 'import-html-release'., (continued)
- 10/72: gnu-maintenance: Extract 'canonicalize-url' from 'import-html-release'., guix-commits, 2023/08/15
- 14/72: gnu: qt: Revert to use individual versions instead of %qt5-version., guix-commits, 2023/08/15
- 17/72: gnu: qtbase: Update to 6.5.2., guix-commits, 2023/08/15
- 20/72: gnu: qtsvg: Update to 6.5.2., guix-commits, 2023/08/15
- 12/72: gnu-maintenance: Allow mirror URLs to fallback to the generic HTML updater., guix-commits, 2023/08/15
- 16/72: etc: Add Qt manifests for Qt maintenance., guix-commits, 2023/08/15
- 21/72: gnu: qtimageformats: Rename variable to qtimageformats-5., guix-commits, 2023/08/15
- 23/72: gnu: Add qtimageformats., guix-commits, 2023/08/15
- 29/72: gnu: qtwayland: Update to 6.5.2., guix-commits, 2023/08/15
- 33/72: gnu: qttranslations: Update to 6.5.2., guix-commits, 2023/08/15
- 39/72: gnu: qt-creator: Update to 11.0.1.,
guix-commits <=
- 62/72: gnu: qtquickcontrols-5: Update to 5.15.10., guix-commits, 2023/08/15
- 65/72: gnu: qtgamepad: Update to 5.15.10., guix-commits, 2023/08/15
- 61/72: gnu: qtscript: Update to 5.15.10., guix-commits, 2023/08/15
- 53/72: gnu: qtwayland-5: Update to 5.15.10., guix-commits, 2023/08/15
- 05/72: gnu-maintenance: Fix docstring., guix-commits, 2023/08/15
- 18/72: gnu: qtbase: Enable zstd support., guix-commits, 2023/08/15
- 28/72: gnu: qtmultimedia: Update to 6.5.2., guix-commits, 2023/08/15
- 35/72: gnu: qtnetworkauth: Update to 6.5.2., guix-commits, 2023/08/15
- 36/72: gnu: qtremoteobjects: Update to 6.5.2., guix-commits, 2023/08/15
- 44/72: gnu: qtx11extras: Update to 5.15.10., guix-commits, 2023/08/15