[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#65280] [PATCH 26/26] gnu: qt-creator: Update to 11.0.1.
From: |
Maxim Cournoyer |
Subject: |
[bug#65280] [PATCH 26/26] gnu: qt-creator: Update to 11.0.1. |
Date: |
Mon, 14 Aug 2023 00:29:36 -0400 |
* gnu/packages/qt.scm (qt-creator): Update to 11.0.1.
[source]: Adjust snippet.
[arguments]: Adjust patch-paths phase. Disable new failing tests.
---
gnu/packages/qt.scm | 32 +++++++++++++++++++++++++-------
1 file changed, 25 insertions(+), 7 deletions(-)
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 50731ba8ac..bfcf3affc5 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -4789,7 +4789,7 @@ (define-public clazy
(define-public qt-creator
(package
(name "qt-creator")
- (version "9.0.0")
+ (version "11.0.1")
(source (origin
(method url-fetch)
(uri (string-append
@@ -4803,7 +4803,6 @@ (define-public qt-creator
;; 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.
@@ -4814,7 +4813,7 @@ (define-public qt-creator
((".*marketplace/marketplace.qbs.*") ""))))
(sha256
(base32
- "1adyxs0cnqx14gwzkvh909c52449ia6y87n1r4qf6wwydhch43cs"))))
+ "0j90dv9micqsvj4r7iqd11szixr0mlpna4w5s2lnyqckjs6a0mm6"))))
(build-system qt-build-system)
(arguments
(list
@@ -4845,10 +4844,11 @@ (define-public qt-creator
"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
@@ -4861,7 +4861,6 @@ (define-public qt-creator
(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
@@ -4869,7 +4868,26 @@ (define-public qt-creator
(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"
+ ;; These tests fail due to not being able to create
+ ;; an OpenGL context, with error "This plugin does
+ ;; not support createPlatformOpenGLContext" (see:
+ ;;
https://bugreports.qt.io/browse/QTCREATORBUG-29495).
+ "tst_tracing_timelineitemsrenderpass"
+ "tst_tracing_timelinenotesrenderpass"
+ "tst_tracing_timelineselectionrenderpass"
+ ;; This test relies on counting processes, counts
+ ;; only 0 of them instead of 5 for unknown reasons.
+ "tst_process"
+ ) "|")
+ ")")))))
(add-after 'qt-wrap 'wrap-bin
;; Make a few well-integrated tools readily available.
(lambda* (#:key inputs outputs #:allow-other-keys)
--
2.41.0
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [bug#65280] [PATCH 26/26] gnu: qt-creator: Update to 11.0.1.,
Maxim Cournoyer <=