From patchwork Mon Aug 14 04:29:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 52823 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 277D227BBE9; Mon, 14 Aug 2023 05:36:12 +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 7233E27BBE2 for ; Mon, 14 Aug 2023 05:36:10 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qVPJE-0007Va-Mn; Mon, 14 Aug 2023 00:36:04 -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 1qVPII-0006nk-1h for guix-patches@gnu.org; Mon, 14 Aug 2023 00:35:06 -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 1qVPIH-00044y-Pp for guix-patches@gnu.org; Mon, 14 Aug 2023 00:35:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qVPIH-00031j-2Y; Mon, 14 Aug 2023 00:35:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65280] [PATCH 12/26] 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: Mon, 14 Aug 2023 04:35:05 +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.169198765811326 (code B ref 65280); Mon, 14 Aug 2023 04:35:05 +0000 Received: (at 65280) by debbugs.gnu.org; 14 Aug 2023 04:34:18 +0000 Received: from localhost ([127.0.0.1]:60691 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qVPHV-0002wc-NT for submit@debbugs.gnu.org; Mon, 14 Aug 2023 00:34:18 -0400 Received: from mail-qt1-x831.google.com ([2607:f8b0:4864:20::831]:49338) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qVPHR-0002vW-7E for 65280@debbugs.gnu.org; Mon, 14 Aug 2023 00:34:13 -0400 Received: by mail-qt1-x831.google.com with SMTP id d75a77b69052e-4103aa6229cso9309841cf.2 for <65280@debbugs.gnu.org>; Sun, 13 Aug 2023 21:34:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1691987647; x=1692592447; 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=OC72OY/ZlZGv2nkfKyR1OLHyqBn5W1vr3kVoqNvNqiQ=; b=BNVBXNn06N6nwz56p64TI7dn4teGHWb/I5CaWfrR4aV9jELqFOdlku3pz+r2Kcrz9X bh6UMNj3hgFDBxmnz72Xo550CiAcVmGcn3adtuEQYJL3Rg32c/Fb4cf3nncwtuB7xDoY wsfRX9e+AX1S5p3Ea9ex6MMi+BNS0r1YRcX7BY62upPwRdCAbmbxrj8rWGjv60JASX8q s4i/lhYUMNta4C3FtZoiKE2o5bNoFPwscveACaBSYj6rncqEX+FIrTynk0MwedxiDB7h cBoQ1tNtI3ZtXpSAAFcJIOdffpMh/BDxfOl63fJfif9cNkKkXF4tq6rQSskP7zYjHLx2 CVCA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691987647; x=1692592447; 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=OC72OY/ZlZGv2nkfKyR1OLHyqBn5W1vr3kVoqNvNqiQ=; b=lwwEEVXxwJz3gDGGJSqAPKAJu5kutCQAVKACm3qSDZ6o1WZBusiPjg4r/zc0j9r+UL 7iUIX54PvlnYSeOummwN5yZvnlFctm1wm/SRkaeVXNblE/ChclHlfvy/9ZGd17tWhaMp h+al0hiYK1FrCtY7L3ob3U0snzMNFukCrlwy3xWftcgqT++u4Af4kpL+ECB8tPqx+gI+ T0PdneGP3rLYUwXkavD5NeYGjQPT3c7hR7z2UHkSa9O8Hx3GzDk6WSYasXoLuLge9TVL BqehSlqOBPVT8fqK+cVq4bKaVEyyExb2cU4+iJ9TcixuS3uUGiJQXd/9dBxCg27RUJlI kBuw== X-Gm-Message-State: AOJu0YwIAcA5Syr0KAk5foZjva9HOFZrnh1I6bAMrhk+ODFvhJyirfxH i8JfeHUr7Nf9y2wthH/hLA9aQcshjqGj3Q== X-Google-Smtp-Source: AGHT+IG/U95GD/rzeS2RCSRO+wLZCSDyuTTBp9RvV7GwGK5zl5K9JTq9FRz8ZAxMhMAfcE9pH5ZoJg== X-Received: by 2002:a05:622a:5ce:b0:406:9466:6962 with SMTP id d14-20020a05622a05ce00b0040694666962mr7970509qtb.61.1691987647408; Sun, 13 Aug 2023 21:34:07 -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.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 13 Aug 2023 21:34:06 -0700 (PDT) From: Maxim Cournoyer Date: Mon, 14 Aug 2023 00:29:22 -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 (qtdeclarative): Update to 6.5.2. [arguments]: Disable a few extra tests in check phase. [inputs]: Add at-spi2-core, qtimageformats, qtlanguageserver and qtsvg. --- 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