From patchwork Wed Aug 16 12:10:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 52887 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 EE7EF27BBED; Wed, 16 Aug 2023 13:13:40 +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 2726827BBE2 for ; Wed, 16 Aug 2023 13:13:38 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qWFP0-0007Hz-QZ; Wed, 16 Aug 2023 08:13:30 -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 1qWFOt-00078A-CU for guix-patches@gnu.org; Wed, 16 Aug 2023 08:13:25 -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 1qWFOf-0002Lz-7G for guix-patches@gnu.org; Wed, 16 Aug 2023 08:13:15 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qWFOe-0005Sy-Uu; Wed, 16 Aug 2023 08:13:08 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65280] [PATCH v2 12/59] gnu: qtdeclarative: Update to 6.5.2. 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:13:08 +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.169218796920601 (code B ref 65280); Wed, 16 Aug 2023 12:13:08 +0000 Received: (at 65280) by debbugs.gnu.org; 16 Aug 2023 12:12:49 +0000 Received: from localhost ([127.0.0.1]:39047 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qWFOL-0005Lw-1h for submit@debbugs.gnu.org; Wed, 16 Aug 2023 08:12:49 -0400 Received: from mail-qv1-xf2f.google.com ([2607:f8b0:4864:20::f2f]:45256) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qWFOF-0005K8-1j for 65280@debbugs.gnu.org; Wed, 16 Aug 2023 08:12:46 -0400 Received: by mail-qv1-xf2f.google.com with SMTP id 6a1803df08f44-6491907dbc3so1432456d6.2 for <65280@debbugs.gnu.org>; Wed, 16 Aug 2023 05:12:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1692187957; x=1692792757; 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=B+cGj++h1JYVtdOn5d5iJrLit1PJgPcFrFGO2KWXnj8=; b=WVJtoPWhkN4Z3S7iky4x9k+W6c2/QPfbcAr/jf+SeXK1PLvJArYXallmWhFj+ZWVuY GX/KiNP28l++lDCL6ZbI7DqzcJ5XUIEn+r7nKInAiwmFBR7HzXlcdjQbpnxRrLUVNv25 HomSkqUrUDYWDALIWjO6NTgMRjXL9oYdZBfXbGLpsvmdCVnpbldedYPfVmR7KccekuH+ YvC9eYyaNQHNgJO+HnGZzSn80A/GeyzBf/aP8+t2Jd+oRAfSzGiVdFUb/0ZhG8espBqu XvcBw4th2jvXvxRs7vturiWAC2Ak36tpp4ac3HvVgzvSqmFrqj0L60GNWP9HN/p/NUd1 wAAQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692187957; x=1692792757; 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=B+cGj++h1JYVtdOn5d5iJrLit1PJgPcFrFGO2KWXnj8=; b=MdJKvXgjzhzHuMuDNmwYPf/tKoZ7PpT64Z71qNGZWkwgSqDxeKuL/NQnAsWq7NyPRV Nkplux3hEXz/GqcaQmFk4/d52dHan2ZPqmdR410ZhB5YMtNw2FOgk5We2nU3Ue0FmmFs DDMedxE/ge6KanLjSbplrxdSOP/CpnZ4As8Ii38LcI2nrUsbqnMB7/JAYHpCyHtgY376 XCl82k3ChyQmVE9I14POLkeKX/ZZ9lVBOjGq/HBgZJYsj6CQL4a8F+Hox3isLu9PDVcp n2aP4MwFB5X2+CW8rq2EUa2peKq0tcxy1OJ7yA4hthX16Ch17DJ1WuuWV1A38WdTiBAj Pu0Q== X-Gm-Message-State: AOJu0Yx8HXPfTd+dKeR7ZQHFbfBPwKd6p34qrdsVQZgDF3EPuW+OI1sJ 3aW8MNzTpReIjZCtqSPVpCdW65Y7Kx4= X-Google-Smtp-Source: AGHT+IHq/mPr6rWm1iEWoobXlEG1lwwjZE1le6PzymzKh/TDWnwjG8yOchi3rUn/3LuNSPGrNzXM/Q== X-Received: by 2002:a0c:e492:0:b0:649:914:64a8 with SMTP id n18-20020a0ce492000000b00649091464a8mr1448021qvl.41.1692187957381; Wed, 16 Aug 2023 05:12:37 -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.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Aug 2023 05:12:37 -0700 (PDT) From: Maxim Cournoyer Date: Wed, 16 Aug 2023 08:10:28 -0400 Message-ID: <32eb5c356b35241e313cb71e41d16ffae543d07f.1692187578.git.maxim.cournoyer@gmail.com> 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 (qtdeclarative): Update to 6.5.2. [arguments]: Disable a few extra tests in check phase. [inputs]: Add at-spi2-core, qtimageformats, qtlanguageserver and qtsvg. --- (no changes since v1) gnu/packages/qt.scm | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index d66ecda169..e362ae7a15 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -1300,14 +1300,14 @@ (define-public qtdeclarative-5 (define-public qtdeclarative (package (name "qtdeclarative") - (version "6.3.2") + (version "6.5.2") ;; TODO: Package 'masm' and unbundle from sources. (source (origin (method url-fetch) (uri (qt-url name version)) (sha256 (base32 - "1hbw63828pp8vm9b46i2pkcbcpr4mq9nblhmpwrw2pflq0fi24xq")) + "06c7xfqn2a5s2m8j1bcvx3pyjqg1rgqkjvp49737gb4z9vjiz8gk")) (patches (search-patches "qtdeclarative-disable-qmlcache.patch")))) (build-system cmake-build-system) (arguments @@ -1405,7 +1405,20 @@ (define-public qtdeclarative ;; waiting for a killed process, which becomes a zombie in ;; the build container (perhaps solved after ;; fixing/applying #30948). - "tst_qqmlpreview") "|") + "tst_qqmlpreview" + + ;; These tests fail starting with 6.5.2 (see: + ;; https://bugreports.qt.io/browse/QTBUG-116019). They + ;; appear to fail because of attempting to load QML from + ;; elsewhere than from QML2_IMPORT_PATH. + "cmake_test_common_import_path" + "tst_qqmlcomponent" + "tst_qmllint" + "tst_qmldomitem" + "tst_dom_all" + "tst_qmlls" + "tst_qmllscompletions" + ) "|") ")"))))) (add-after 'install 'delete-installed-tests (lambda _ @@ -1418,9 +1431,13 @@ (define-public qtdeclarative qtshadertools vulkan-headers)) (inputs - (list libxkbcommon + (list at-spi2-core + libxkbcommon mesa - qtbase)) + qtbase + qtimageformats + qtlanguageserver + qtsvg)) (home-page (package-home-page qtbase)) (synopsis "Qt QML module (Quick 2)") (description "The Qt QML module provides a framework for developing