ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-27 23:02:16 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: qt-creator: Update to 11.0.1.

Browse source 
* 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-changes: 2
- Delete fix-tests-build phase
- Only one new test is now disabled
This commit is contained in:
Maxim Cournoyer 2023-08-12 22:16:51 -04:00
parent 72abf72062
commit e253911955
No known key found for this signature in database
GPG key ID: 1260E46482E63562
1 changed files with 19 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
gnu/packages/qt.scm
View file

@ -4890,7 +4890,7 @@ (define-public clazy
(define-public qt-creator (define-public qt-creator
(package (package
(name "qt-creator") (name "qt-creator")
(version "9.0.0") (version "11.0.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -4904,7 +4904,6 @@ (define-public qt-creator
;; Remove bundled libraries, where supported. ;; Remove bundled libraries, where supported.
;; TODO: package and unbundle litehtml ;; TODO: package and unbundle litehtml
'("src/libs/3rdparty/yaml-cpp" '("src/libs/3rdparty/yaml-cpp"
"src/shared/qbs/src/shared/qtscript/src/3rdparty"
"tests/unit/unittest/3rdparty" "tests/unit/unittest/3rdparty"
;; Marketplace recommends nonfree extensions; ;; Marketplace recommends nonfree extensions;
;; remove it. ;; remove it.
@ -4915,7 +4914,7 @@ (define-public qt-creator
((".*marketplace/marketplace.qbs.*") "")))) ((".*marketplace/marketplace.qbs.*") ""))))
(sha256 (sha256
(base32 (base32
"1adyxs0cnqx14gwzkvh909c52449ia6y87n1r4qf6wwydhch43cs")))) "0j90dv9micqsvj4r7iqd11szixr0mlpna4w5s2lnyqckjs6a0mm6"))))
(build-system qt-build-system) (build-system qt-build-system)
(arguments (arguments
(list (list
@ -4931,25 +4930,17 @@ (define-public qt-creator
#$output "/lib/qtcreator")) #$output "/lib/qtcreator"))
#:phases #:phases
#~(modify-phases %standard-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 (add-after 'unpack 'patch-paths
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(substitute* '("src/libs/utils/commandline.cpp" (substitute* '("src/libs/utils/commandline.cpp"
"src/libs/utils/deviceshell.cpp") "src/libs/utils/deviceshell.cpp")
(("/bin/sh") (("/bin/sh")
(search-input-file inputs "bin/sh"))) (search-input-file inputs "bin/sh")))
(substitute* "src/libs/utils/qtcprocess.cpp" (substitute* "src/libs/utils/process.cpp"
(("/usr/bin/env") (("/usr/bin/env")
(search-input-file inputs "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") (("/bin/sh")
(which "sh"))))) (which "sh")))))
(add-before 'build 'build-doc (add-before 'build 'build-doc
@ -4962,7 +4953,6 @@ (define-public qt-creator
(invoke "cmake" "--install" "." "--prefix" #$output (invoke "cmake" "--install" "." "--prefix" #$output
"--component=html_docs"))) "--component=html_docs")))
(replace 'check (replace 'check
;; Loosely based on .github/workflows/build_cmake.yml.
(lambda* (#:key tests? parallel-tests? #:allow-other-keys) (lambda* (#:key tests? parallel-tests? #:allow-other-keys)
(when tests? (when tests?
(invoke "xvfb-run" ;for the 'renderpass' tests (invoke "xvfb-run" ;for the 'renderpass' tests
@ -4970,7 +4960,20 @@ (define-public qt-creator
(number->string (parallel-job-count)) (number->string (parallel-job-count))
"1") "1")
"--label-exclude" "exclude_from_precheck" "--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 (add-after 'qt-wrap 'wrap-bin
;; Make a few well-integrated tools readily available. ;; Make a few well-integrated tools readily available.
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)