From patchwork Mon Aug 14 04:29:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 52830 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 A603A27BBE9; Mon, 14 Aug 2023 05:36:41 +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=ham 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 D1E6627BBE2 for ; Mon, 14 Aug 2023 05:36:39 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qVPJF-0007WD-0Y; Mon, 14 Aug 2023 00:36:05 -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 1qVPIO-0006qc-9I for guix-patches@gnu.org; Mon, 14 Aug 2023 00:35:12 -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 1qVPIN-00047S-HK for guix-patches@gnu.org; Mon, 14 Aug 2023 00:35:11 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qVPIN-000344-BE; Mon, 14 Aug 2023 00:35:11 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65280] [PATCH 26/26] 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: Mon, 14 Aug 2023 04:35:11 +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.169198768511527 (code B ref 65280); Mon, 14 Aug 2023 04:35:11 +0000 Received: (at 65280) by debbugs.gnu.org; 14 Aug 2023 04:34:45 +0000 Received: from localhost ([127.0.0.1]:60731 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qVPHw-0002zl-QY for submit@debbugs.gnu.org; Mon, 14 Aug 2023 00:34:45 -0400 Received: from mail-qt1-x832.google.com ([2607:f8b0:4864:20::832]:62481) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qVPHt-0002z0-Mv for 65280@debbugs.gnu.org; Mon, 14 Aug 2023 00:34:42 -0400 Received: by mail-qt1-x832.google.com with SMTP id d75a77b69052e-4085ee5b1e6so22027541cf.0 for <65280@debbugs.gnu.org>; Sun, 13 Aug 2023 21:34:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1691987676; x=1692592476; 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=brwZnD10Fbg+C9j+btgBMHjUnIs8phZdbNvQpHtNCCc=; b=UENWFo4MiVQCH+bFZELGVO67ai3AB4PxXQvnkuvqfDND8zjH3pyzlHhH/hrGUYfPRF t9oEV8M/LB+80vQNgd6OthtrSDzH4AHpPru31DPKriJiWvA040meOcnEve2a09YfkFtg db3d2okR5jSR+pZmCT5eKc+xeAIynBgcGhOBiXDMMXUAXeit4fSudLY/qLEUZatGRH2G fLsztnP0t5bmrKDKD4IP/EEdLUPSmxP2kl5JE7i1ZwxXcclSA/RuSsWJfyRkxUaFs2fU KTN532/42V4QLbqqPI206FvjmCg5dljxyZfQYATUIQ8DIJr9w65f42+NeLV8590M5/8P luzQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691987676; x=1692592476; 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=brwZnD10Fbg+C9j+btgBMHjUnIs8phZdbNvQpHtNCCc=; b=bbQ3qOLOee3ehfaG7vehx46ZowSIIU2t56qqygS0RngomPkNnVaddmGNNLzeLHnn6h ECtDBtPg9YZCoEhR5H+04ycMS5Ql4ha4iNoD3UWVP4jRJE9Goc6wUPvzHI3DvRLWfZwv mod1EG+uU/WR4qVcbZtMi5/iFouERHz5X/pSWrQB3ZT9zpQej0iIWqLeM7iwn6koG5TS 6IhCsSF12zFr3905d2wmMn95D7ZoMHdEGTJPvGNRDFgPO/6T+tQcyE4UIpHaUH4LBWs+ PN3LQnuPLd51h3GyiulxCwuDIXspIeGXS0nUP+dlzBDrf1Zj+51E4z8fYExHEMyvVQuc TbPQ== X-Gm-Message-State: AOJu0YwD4Q6qM6d4uRSYYh6jUOw1r4pt8YlJecheGECr7G+8ez3LziUF xt0Ko+oNxEZZKxnDpfV+j29RrxTMMreK4Q== X-Google-Smtp-Source: AGHT+IHgRNaRLd0D26RwzsOKhSRLi2cdoncUDeiXum+IMmDHtaZ86KWz24G/8rrWABtsz13ysuW1kg== X-Received: by 2002:ac8:5c43:0:b0:403:b23f:9e16 with SMTP id j3-20020ac85c43000000b00403b23f9e16mr16086850qtj.2.1691987676149; Sun, 13 Aug 2023 21:34:36 -0700 (PDT) Received: from localhost.localdomain (dsl-205-233-124-111.b2b2c.ca. [205.233.124.111]) by smtp.gmail.com with ESMTPSA id f23-20020ac80157000000b0040541a8bd66sm2844492qtg.60.2023.08.13.21.34.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 13 Aug 2023 21:34:35 -0700 (PDT) From: Maxim Cournoyer Date: Mon, 14 Aug 2023 00:29:36 -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 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)