From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
To: 65280@debbugs.gnu.org
Cc: "Maxim Cournoyer" <maxim.cournoyer@gmail.com>,
"Andreas Enge" <andreas@enge.fr>,
"Maxim Cournoyer" <maxim.cournoyer@gmail.com>,
宋文武 <iyzsong@envs.net>
Subject: [bug#65280] [PATCH v2 26/59] gnu: qt-creator: Update to 11.0.1.
Date: Wed, 16 Aug 2023 08:10:42 -0400 [thread overview]
Message-ID: <c11bdf3aaa2f6ff9476f4303025ae642e14e9da7.1692187578.git.maxim.cournoyer@gmail.com> (raw)
In-Reply-To: <cover.1692187578.git.maxim.cournoyer@gmail.com>
* 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.
---
Changes in v2:
- 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 @@ (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
@@ -4834,7 +4834,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.
@@ -4845,7 +4844,7 @@ (define-public qt-creator
((".*marketplace/marketplace.qbs.*") ""))))
(sha256
(base32
- "1adyxs0cnqx14gwzkvh909c52449ia6y87n1r4qf6wwydhch43cs"))))
+ "0j90dv9micqsvj4r7iqd11szixr0mlpna4w5s2lnyqckjs6a0mm6"))))
(build-system qt-build-system)
(arguments
(list
@@ -4861,25 +4860,17 @@ (define-public qt-creator
#$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 @@ (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
@@ -4900,7 +4890,20 @@ (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"
+ ;; 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)
--
2.41.0
next prev parent reply other threads:[~2023-08-16 12:18 UTC|newest]
Thread overview: 66+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-14 4:21 [bug#65280] [PATCH 00/26] Refresh Qt 6 packages Maxim Cournoyer
2023-08-16 10:56 ` 宋文武 via Guix-patches via
2023-08-16 12:19 ` [bug#65280] [PATCH v2 00/59] Refresh Qt 5 and " Maxim Cournoyer
2023-08-17 11:56 ` 宋文武 via Guix-patches via
2023-08-17 13:47 ` Maxim Cournoyer
2023-08-16 12:10 ` Maxim Cournoyer
2023-08-16 12:10 ` [bug#65280] [PATCH v2 01/59] gnu: qt: Revert to use individual versions instead of %qt5-version Maxim Cournoyer
2023-08-16 12:10 ` [bug#65280] [PATCH v2 02/59] gnu: qtdeclarative: Disable QML cache to avoid stale cache issues Maxim Cournoyer
2023-08-16 12:10 ` [bug#65280] [PATCH v2 03/59] etc: Add Qt manifests for Qt maintenance Maxim Cournoyer
2023-08-16 12:10 ` [bug#65280] [PATCH v2 04/59] gnu: qtbase: Update to 6.5.2 Maxim Cournoyer
2023-08-16 12:10 ` [bug#65280] [PATCH v2 05/59] gnu: qtbase: Enable zstd support Maxim Cournoyer
2023-08-16 12:10 ` [bug#65280] [PATCH v2 06/59] gnu: qt5compat: Update to 6.5.2 Maxim Cournoyer
2023-08-16 12:10 ` [bug#65280] [PATCH v2 07/59] gnu: qtsvg: " Maxim Cournoyer
2023-08-16 12:10 ` [bug#65280] [PATCH v2 08/59] gnu: qtimageformats: Rename variable to qtimageformats-5 Maxim Cournoyer
2023-08-16 12:10 ` [bug#65280] [PATCH v2 09/59] gnu: qtimageformats-5: Fix indentation Maxim Cournoyer
2023-08-16 12:10 ` [bug#65280] [PATCH v2 10/59] gnu: Add qtimageformats Maxim Cournoyer
2023-08-16 12:10 ` [bug#65280] [PATCH v2 11/59] gnu: Add qtlanguageserver Maxim Cournoyer
2023-08-16 12:10 ` [bug#65280] [PATCH v2 12/59] gnu: qtdeclarative: Update to 6.5.2 Maxim Cournoyer
2023-08-16 12:10 ` [bug#65280] [PATCH v2 13/59] gnu: qtwebsockets: " Maxim Cournoyer
2023-08-16 12:10 ` [bug#65280] [PATCH v2 14/59] gnu: qtshadertools: " Maxim Cournoyer
2023-08-16 12:10 ` [bug#65280] [PATCH v2 15/59] gnu: qtmultimedia: " Maxim Cournoyer
2023-08-16 12:10 ` [bug#65280] [PATCH v2 16/59] gnu: qtwayland: " Maxim Cournoyer
2023-08-16 12:10 ` [bug#65280] [PATCH v2 17/59] gnu: qtwebchannel: " Maxim Cournoyer
2023-08-16 12:10 ` [bug#65280] [PATCH v2 18/59] gnu: qtlottie: " Maxim Cournoyer
2023-08-16 12:10 ` [bug#65280] [PATCH v2 19/59] gnu: qttools: " Maxim Cournoyer
2023-08-16 12:10 ` [bug#65280] [PATCH v2 20/59] gnu: qttranslations: " Maxim Cournoyer
2023-08-16 12:10 ` [bug#65280] [PATCH v2 21/59] gnu: qtpositioning: " Maxim Cournoyer
2023-08-16 12:10 ` [bug#65280] [PATCH v2 22/59] gnu: qtnetworkauth: " Maxim Cournoyer
2023-08-16 12:10 ` [bug#65280] [PATCH v2 23/59] gnu: qtremoteobjects: " Maxim Cournoyer
2023-08-16 12:10 ` [bug#65280] [PATCH v2 24/59] gnu: qtwebengine: " Maxim Cournoyer
2023-08-16 12:10 ` [bug#65280] [PATCH v2 25/59] gnu: Remove qtquickcontrols2 Maxim Cournoyer
2023-08-16 12:10 ` Maxim Cournoyer [this message]
2023-08-16 12:10 ` [bug#65280] [PATCH v2 27/59] gnu: qtbase-5: Update to 5.15.10 Maxim Cournoyer
2023-08-16 12:10 ` [bug#65280] [PATCH v2 28/59] gnu: qt3d-5: " Maxim Cournoyer
2023-08-16 12:10 ` [bug#65280] [PATCH v2 29/59] gnu: qtsvg-5: " Maxim Cournoyer
2023-08-16 12:10 ` [bug#65280] [PATCH v2 30/59] gnu: qtimageformats-5: " Maxim Cournoyer
2023-08-16 12:10 ` [bug#65280] [PATCH v2 31/59] gnu: qtx11extras: " Maxim Cournoyer
2023-08-16 12:10 ` [bug#65280] [PATCH v2 32/59] gnu: qtxmlpatterns: " Maxim Cournoyer
2023-08-16 12:10 ` [bug#65280] [PATCH v2 33/59] gnu: qtdeclarative-5: " Maxim Cournoyer
2023-08-16 12:10 ` [bug#65280] [PATCH v2 34/59] gnu: qtconnectivity: " Maxim Cournoyer
2023-08-16 12:10 ` [bug#65280] [PATCH v2 35/59] gnu: qtwebsockets-5: " Maxim Cournoyer
2023-08-16 12:10 ` [bug#65280] [PATCH v2 36/59] gnu: qtsensors: " Maxim Cournoyer
2023-08-16 12:10 ` [bug#65280] [PATCH v2 37/59] gnu: qtmultimedia-5: " Maxim Cournoyer
2023-08-16 12:10 ` [bug#65280] [PATCH v2 38/59] gnu: qtsensors: Shorten line width Maxim Cournoyer
2023-08-16 12:10 ` [bug#65280] [PATCH v2 39/59] gnu: qtmultimedia-5: Shorten maximum " Maxim Cournoyer
2023-08-16 12:10 ` [bug#65280] [PATCH v2 40/59] gnu: qtwayland-5: Update to 5.15.10 Maxim Cournoyer
2023-08-16 12:10 ` [bug#65280] [PATCH v2 41/59] gnu: qtserialport: " Maxim Cournoyer
2023-08-16 12:10 ` [bug#65280] [PATCH v2 42/59] gnu: qtserialbus: " Maxim Cournoyer
2023-08-16 12:10 ` [bug#65280] [PATCH v2 43/59] gnu: qtwebchannel-5: " Maxim Cournoyer
2023-08-16 12:11 ` [bug#65280] [PATCH v2 44/59] gnu: qtwebglplugin: " Maxim Cournoyer
2023-08-16 12:11 ` [bug#65280] [PATCH v2 45/59] gnu: qtwebview: " Maxim Cournoyer
2023-08-16 12:11 ` [bug#65280] [PATCH v2 46/59] gnu: qtlocation: " Maxim Cournoyer
2023-08-16 12:11 ` [bug#65280] [PATCH v2 47/59] gnu: qttools-5: " Maxim Cournoyer
2023-08-16 12:11 ` [bug#65280] [PATCH v2 48/59] gnu: qtscript: " Maxim Cournoyer
2023-08-16 12:11 ` [bug#65280] [PATCH v2 49/59] gnu: qtquickcontrols-5: " Maxim Cournoyer
2023-08-16 12:11 ` [bug#65280] [PATCH v2 50/59] gnu: qtquickcontrols2-5: " Maxim Cournoyer
2023-08-16 12:11 ` [bug#65280] [PATCH v2 51/59] gnu: qtgraphicaleffects: " Maxim Cournoyer
2023-08-16 12:11 ` [bug#65280] [PATCH v2 52/59] gnu: qtgamepad: " Maxim Cournoyer
2023-08-16 12:11 ` [bug#65280] [PATCH v2 53/59] gnu: qtscxml: " Maxim Cournoyer
2023-08-16 12:11 ` [bug#65280] [PATCH v2 54/59] gnu: qtpurchasing: " Maxim Cournoyer
2023-08-16 12:11 ` [bug#65280] [PATCH v2 55/59] gnu: qtcharts: " Maxim Cournoyer
2023-08-16 12:11 ` [bug#65280] [PATCH v2 56/59] gnu: qtdatavis3d: " Maxim Cournoyer
2023-08-16 12:11 ` [bug#65280] [PATCH v2 57/59] gnu: qtnetworkauth-5: " Maxim Cournoyer
2023-08-16 12:11 ` [bug#65280] [PATCH v2 58/59] gnu: qtspeech: " Maxim Cournoyer
2023-08-16 12:11 ` [bug#65280] [PATCH v2 59/59] gnu: qtwebengine-5: " Maxim Cournoyer
2023-08-22 16:36 ` bug#65280: [PATCH 00/26] Refresh Qt 6 packages Maxim Cournoyer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=c11bdf3aaa2f6ff9476f4303025ae642e14e9da7.1692187578.git.maxim.cournoyer@gmail.com \
--to=maxim.cournoyer@gmail.com \
--cc=65280@debbugs.gnu.org \
--cc=andreas@enge.fr \
--cc=iyzsong@envs.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.