From patchwork Wed Aug 16 12:10:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 52923 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 6946527BBE9; Wed, 16 Aug 2023 13:18:10 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id BFF7327BBEA for ; Wed, 16 Aug 2023 13:18:06 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qWFPb-00088u-Am; Wed, 16 Aug 2023 08:14:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qWFPZ-00085s-At for guix-patches@gnu.org; Wed, 16 Aug 2023 08:14:05 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qWFPZ-0002d9-2R for guix-patches@gnu.org; Wed, 16 Aug 2023 08:14:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qWFPY-0005fn-UD; Wed, 16 Aug 2023 08:14:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65280] [PATCH v2 26/59] gnu: qt-creator: Update to 11.0.1. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: andreas@enge.fr, maxim.cournoyer@gmail.com, iyzsong@envs.net, guix-patches@gnu.org Resent-Date: Wed, 16 Aug 2023 12:14:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65280 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65280@debbugs.gnu.org Cc: Maxim Cournoyer , Andreas Enge , Maxim Cournoyer , =?utf-8?b?5a6L5paH5q2m?= X-Debbugs-Original-Xcc: Andreas Enge , Maxim Cournoyer , =?utf-8?b?5a6L5paH5q2m?= Received: via spool by 65280-submit@debbugs.gnu.org id=B65280.169218802521521 (code B ref 65280); Wed, 16 Aug 2023 12:14:04 +0000 Received: (at 65280) by debbugs.gnu.org; 16 Aug 2023 12:13:45 +0000 Received: from localhost ([127.0.0.1]:39253 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qWFPE-0005b2-H1 for submit@debbugs.gnu.org; Wed, 16 Aug 2023 08:13:44 -0400 Received: from mail-vs1-xe32.google.com ([2607:f8b0:4864:20::e32]:58573) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qWFOW-0005N3-N2 for 65280@debbugs.gnu.org; Wed, 16 Aug 2023 08:13:01 -0400 Received: by mail-vs1-xe32.google.com with SMTP id ada2fe7eead31-44ac5e32ed5so323457137.0 for <65280@debbugs.gnu.org>; Wed, 16 Aug 2023 05:13:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1692187975; x=1692792775; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=7fTXCvx4RT+6GGB310RJl29+tX7sRKmtzPhDA09jx2E=; b=sT5wfEfVp2HeVaEbuMd3w9ABFyLOnh1ui5pBEDHVUrRAdyODrys6qKP0E7TOvTWrID F7Hv9G8zJGbfkj+xCtnhk7AOkDng6axKTyaIIvQjldYJpe3nJO5rb6nAhoi+CUi2Tymx M5PctberCgNdLEXSciYFg55aAOjrAgBKJxifSKG8Gh1KPWVmPFx9HdnWlhjYknvFi9pQ RSPE9O8tGMl+wGdLGL74v6G9ioFEOZ+QqtkVCuaNONl2vTccKfci5cuBJp9g85Hx9d3J ca+qlO/WDZHM92+X5FGyQanaDjCrqG11woJ3VVfI8gIBq0g3cml34kcYztS3/UTf/ruT DPNA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692187975; x=1692792775; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=7fTXCvx4RT+6GGB310RJl29+tX7sRKmtzPhDA09jx2E=; b=lvrxVQAFLRASuHY5A8t/fdydk2+376XFIkmAQ6zI8eBMhAzFKyCHz5h1Ok2/J5atTU 0Y+CxEgeVFTwcIF04kcI/ZPLYDrUM/HQ7dO6NvStoSXLYf7zRVrEz5uXJ8Icp+n91gTr 3ZMBeBZO1HDUz1p64m3GMvsumUG8OaAWaxE9X/doL/FYbQdQvAsfkdB5NIVvDfq89KCu flGIhVq4VWMbwN8eAqK+6d03jTGJrX8e/uATiNkgVFfFQ6WmkrRhqN/vRIHmhaQpw0Eh VTjTbvBATfhgOYyTgX7wDkdrH9vbI3Tm/JnXsJX4UvM9KX4VhG9Mbel7m12mbIybHtog g+bA== X-Gm-Message-State: AOJu0YyVRCl5cmhowfN0dInFD3zVRwlncI8GZTTtSmMi5zC9700CLGTi CGWifbPrrVvcTJqqdKXWsPLb0tBtpzQ= X-Google-Smtp-Source: AGHT+IFWBT7jj2iMD/hW7LQgKeccqWQVmlBzMnWL21EgihyaSDv5R/LRLVywl15oPKrUjLpFgEkzow== X-Received: by 2002:a67:e3d2:0:b0:447:779b:a357 with SMTP id k18-20020a67e3d2000000b00447779ba357mr778377vsm.32.1692187974979; Wed, 16 Aug 2023 05:12:54 -0700 (PDT) Received: from localhost.localdomain (dsl-152-182.b2b2c.ca. [66.158.152.182]) by smtp.gmail.com with ESMTPSA id c17-20020a0ce151000000b00641899958efsm4468320qvl.130.2023.08.16.05.12.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Aug 2023 05:12:54 -0700 (PDT) From: Maxim Cournoyer Date: Wed, 16 Aug 2023 08:10:42 -0400 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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)