From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id 0NVmDF128WUuWQEA62LTzQ:P1 (envelope-from ) for ; Wed, 13 Mar 2024 10:48:13 +0100 Received: from aspmx1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id 0NVmDF128WUuWQEA62LTzQ (envelope-from ) for ; Wed, 13 Mar 2024 10:48:13 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1710323293; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post; bh=RVBB3cn+8B2YfYFEMhlwZ1axloLT3bVDiZFk7DjuE0A=; b=U8DQYjxF0ygB9SkcreLen7LUg//vGNvr31PLk/u4KEr6GQe0wbsZPb7wnpaznRvpUIrCx/ fqOYCH/kFmyfxg3/UVcbnN0dY95eIgCri4TNGRsyEOBrCU8qRqlDsP6D6lI27e03vL/OJb OjzCcevN7CND0QF0NoKxqRr5OwQC3IVaAkMfZHB1WUOiNUCPye7ezE7eX0rG7esmICrGTK UUtN7lHVllz6T8mqdI5+UmRAbKH1ORYvVBWPWWIS7oqWTXrWH8Ge+ScivUGM2aJsl0MKYE amRKxT/44vfN1frNbCLmQ0dl+wB8FPsXo5rQS0B1EEJmaxiTeEReOU0Kto//UA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=none ARC-Seal: i=1; s=key1; d=yhetil.org; t=1710323293; a=rsa-sha256; cv=none; b=o2Me9sIH8pdS8wCV0QXNFu2B4041WN+06hdYzs6O8UXJcZNmDHY48H4M4OoquW9pZd1z/K HekjCNsbOqTVC1kW/hBmZnYnddPYkCOkFpi+SsTE0bLR2/z8zdcijTrpTXZE//b1MU+kVt 0X7YACEpb/9Q9KYEUChzOF4XkfQPGrJ4pbl3YqnifoT3F3yBPRUuWI1hjasiyF2GA4iv5a Z83f0HuU3czRMQZ0Ax3GQlxhiCa26+ZdfZqQ/xvsiqQqwtXwwpxpYjkRuLxYwgWtb0LGJJ M8OAkbSWxdQEeDMn+T117hgNOqWhOcjgXF2O2VGQwd3YaCUXYfTAF7hP8FfqZg== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id E015B15C99 for ; Wed, 13 Mar 2024 10:48:12 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rkKaC-0002my-JY; Wed, 13 Mar 2024 05:07:32 -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 1rkKa9-0002mR-L2 for guix-patches@gnu.org; Wed, 13 Mar 2024 05:07:29 -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 1rkKa9-0004HN-7v for guix-patches@gnu.org; Wed, 13 Mar 2024 05:07:29 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rkKah-0001d3-Lw; Wed, 13 Mar 2024 05:08:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#69628] [PATCH qt-team v4 05/24] gnu: qtdeclarative: Update to 6.6.2. Resent-From: Zheng Junjie Original-Sender: "Debbugs-submit" Resent-CC: maxim.cournoyer@gmail.com, iyzsong@envs.net, guix-patches@gnu.org Resent-Date: Wed, 13 Mar 2024 09:08:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 69628 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69628@debbugs.gnu.org Cc: Maxim Cournoyer , =?UTF-8?Q?=E5=AE=8B=E6=96=87=E6=AD=A6?= X-Debbugs-Original-Xcc: Maxim Cournoyer , =?UTF-8?Q?=E5=AE=8B=E6=96=87=E6=AD=A6?= Received: via spool by 69628-submit@debbugs.gnu.org id=B69628.17103208556186 (code B ref 69628); Wed, 13 Mar 2024 09:08:03 +0000 Received: (at 69628) by debbugs.gnu.org; 13 Mar 2024 09:07:35 +0000 Received: from localhost ([127.0.0.1]:44689 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rkKaF-0001bd-CL for submit@debbugs.gnu.org; Wed, 13 Mar 2024 05:07:35 -0400 Received: from smtp84.cstnet.cn ([159.226.251.84]:37682 helo=cstnet.cn) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rkKaB-0001ap-JQ for 69628@debbugs.gnu.org; Wed, 13 Mar 2024 05:07:33 -0400 Received: from m.taildaf0f.ts.net (unknown [183.247.5.134]) by APP-05 (Coremail) with SMTP id zQCowABnbqLEavFlQy_gBQ--.17593S7; Wed, 13 Mar 2024 16:58:49 +0800 (CST) From: Zheng Junjie Date: Wed, 13 Mar 2024 16:57:59 +0800 Message-ID: <340c6adc68dd92785a826909b2ffb5a07b2c19b8.1710320156.git.zhengjunjie@iscas.ac.cn> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CM-TRANSID: zQCowABnbqLEavFlQy_gBQ--.17593S7 X-Coremail-Antispam: 1UD129KBjvJXoWxurWxZr1rKr1DZr1xKrW7Jwb_yoWrJFWUp3 y3AFyFvay0gFy7t3Z3tw4xWF15u397JFyDC3ykJw109w4avryIqryftFWF9F4fCr45Ww42 9r10qFn3GFy5AFJanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUB0b7Iv0xC_Kw4lb4IE77IF4wAFF20E14v26r4j6ryUM7CY07I2 0VC2zVCF04k26cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28IrcIa0xkI8VA2jI 8067AKxVWUAVCq3wA2048vs2IY020Ec7CjxVAFwI0_Jrv_JF4l8cAvFVAK0II2c7xJM28C jxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVW5JVW7JwA2z4x0Y4vE2Ix0cI 8IcVCY1x0267AKxVWxJVW8Jr1l84ACjcxK6I8E87Iv67AKxVWxJr0_GcWl84ACjcxK6I8E 87Iv6xkF7I0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4xI64 kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv67AKxVWUJVW8JwAm 72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41l42xK82IYc2Ij64vIr41l4I8I3I 0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAqx4xG67AKxVWUJVWUGwC20s026x8GjcxK67AKxVWU GVWUWwC2zVAF1VAY17CE14v26r1j6r15MIIYY7kG6xAYrwCIc40Y0x0EwIxGrwCI42IY6x IIjxv20xvE14v26r1I6r4UMIIF0xvE2Ix0cI8IcVCY1x0267AKxVWUJVW8JwCI42IY6xAI w20EY4v20xvaj40_Jr0_JF4lIxAIcVC2z280aVAFwI0_Jr0_Gr1lIxAIcVC2z280aVCY1x 0267AKxVWUJVW8JbIYCTnIWIevJa73UjIFyTuYvjxUldgADUUUU X-Originating-IP: [183.247.5.134] X-CM-SenderInfo: x2kh0wxmxqyx3h6l2u1dvotugofq/ 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -4.79 X-Spam-Score: -4.79 X-Migadu-Queue-Id: E015B15C99 X-Migadu-Scanner: mx13.migadu.com X-TUID: ivUTDTXEVBMS * gnu/packages/qt.scm (qtdeclarative): Update to 6.6.2. [arguments]<#:phases>: Adjust 'check phase. * gnu/packages/patches/qtdeclarative-disable-qmlcache.patch: Adjust it. Change-Id: Ic7ddb603524ff07916d57b2ce92b7ffa407a5004 --- .../qtdeclarative-disable-qmlcache.patch | 27 ++++++++++++++----- gnu/packages/qt.scm | 8 +++--- 2 files changed, 26 insertions(+), 9 deletions(-) diff --git a/gnu/packages/patches/qtdeclarative-disable-qmlcache.patch b/gnu/packages/patches/qtdeclarative-disable-qmlcache.patch index 5f06ec53b4..df76fab910 100644 --- a/gnu/packages/patches/qtdeclarative-disable-qmlcache.patch +++ b/gnu/packages/patches/qtdeclarative-disable-qmlcache.patch @@ -1,16 +1,31 @@ Retrieved from https://raw.githubusercontent.com/NixOS/nixpkgs/master/pkgs/development/libraries/qt-6/patches/qtdeclarative-default-disable-qmlcache.patch +From 2d561e0a80f2d123a7348187975ee845f9dcd9e0 Mon Sep 17 00:00:00 2001 +From: Nick Cao +Date: Tue, 10 Oct 2023 11:12:27 -0400 +Subject: [PATCH] qtdeclarative: disable qml disk cache + +--- + src/qml/jsruntime/qv4engine.cpp | 6 +----- + 1 file changed, 1 insertion(+), 5 deletions(-) + diff --git a/src/qml/jsruntime/qv4engine.cpp b/src/qml/jsruntime/qv4engine.cpp -index 852cde9e..165f1b57 100644 +index d1b4c4fff6..50f8a07420 100644 --- a/src/qml/jsruntime/qv4engine.cpp +++ b/src/qml/jsruntime/qv4engine.cpp -@@ -2093,7 +2093,7 @@ void ExecutionEngine::registerModule(const QString &_name, const QJSValue &modul - - bool ExecutionEngine::diskCacheEnabled() const +@@ -2232,11 +2232,7 @@ ExecutionEngine::DiskCacheOptions ExecutionEngine::diskCacheOptions() const { -- return (!disableDiskCache() && !debugger()) || forceDiskCache(); -+ return forceDiskCache(); + if (forceDiskCache()) + return DiskCache::Enabled; +- if (disableDiskCache() || debugger()) +- return DiskCache::Disabled; +- static const DiskCacheOptions options = qmlGetConfigOption< +- DiskCacheOptions, transFormDiskCache>("QML_DISK_CACHE"); +- return options; ++ return DiskCache::Disabled; } void ExecutionEngine::callInContext(QV4::Function *function, QObject *self, +-- +2.42.0 diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 4bbdb53f07..7160beb702 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -1433,14 +1433,14 @@ (define-public qtdeclarative-5 (define-public qtdeclarative (package (name "qtdeclarative") - (version "6.5.2") + (version "6.6.2") ;; TODO: Package 'masm' and unbundle from sources. (source (origin (method url-fetch) (uri (qt-url name version)) (sha256 (base32 - "06c7xfqn2a5s2m8j1bcvx3pyjqg1rgqkjvp49737gb4z9vjiz8gk")) + "0k6qndjvkkx3g8lr7f64xx86b3cwxzkgpl6fr6cp73s6qjkyk763")) (patches (search-patches "qtdeclarative-disable-qmlcache.patch")))) (outputs '("out" "debug")) (build-system cmake-build-system) @@ -1510,6 +1510,8 @@ (define-public qtdeclarative "(" (string-join (list + ;; FIXME + "tst_qquickiconimage" ;; This test is marked as flaky upstream (see: ;; https://bugreports.qt.io/browse/QTBUG-101488). "tst_qquickfiledialogimpl" @@ -1541,7 +1543,7 @@ (define-public qtdeclarative ;; fixing/applying #30948). "tst_qqmlpreview" - ;; These tests fail starting with 6.5.2 (see: + ;; These tests fail starting with 6.6.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. -- 2.41.0