From patchwork Mon Aug 14 04:29:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 52806 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 75AB527BBE9; Mon, 14 Aug 2023 05:34:32 +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 B0DE927BBE2 for ; Mon, 14 Aug 2023 05:34:29 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qVPHI-0006Yh-So; Mon, 14 Aug 2023 00:34: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 1qVPHH-0006YH-DC for guix-patches@gnu.org; Mon, 14 Aug 2023 00:34:03 -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 1qVPHH-0003oQ-5T for guix-patches@gnu.org; Mon, 14 Aug 2023 00:34:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qVPHG-0002uB-JR; Mon, 14 Aug 2023 00:34:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65280] [PATCH 02/26] gnu: qtdeclarative: Disable QML cache to avoid stale cache issues. 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:34:02 +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 , Distopico Vegan , 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.169198763711123 (code B ref 65280); Mon, 14 Aug 2023 04:34:02 +0000 Received: (at 65280) by debbugs.gnu.org; 14 Aug 2023 04:33:57 +0000 Received: from localhost ([127.0.0.1]:60651 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qVPHA-0002tL-Gx for submit@debbugs.gnu.org; Mon, 14 Aug 2023 00:33:57 -0400 Received: from mail-qt1-x82c.google.com ([2607:f8b0:4864:20::82c]:60773) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qVPH5-0002si-Ou for 65280@debbugs.gnu.org; Mon, 14 Aug 2023 00:33:52 -0400 Received: by mail-qt1-x82c.google.com with SMTP id d75a77b69052e-40fe3850312so32880561cf.1 for <65280@debbugs.gnu.org>; Sun, 13 Aug 2023 21:33:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1691987626; x=1692592426; 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=jHqNsVPH8iRdgUDUfifiLFCIQkfKaE9bJzwM0KN8sXU=; b=hTJZOtdCbJWO5wWysrr8qXgWa6Lmqxmu0ZceEDceYjcZH4YHjVfogYI6+m1ry/EEt1 cGRzyEBhTdd7OKsShD6Ws8nsu4WY3F0ELD3TRyqoXAeeU5b5As8JoCpcS1Z35ouf09Nh e2zVK+aLRzXgj28myihhEk+/yFw865+Ue7I0n0VI6fNC0bMQNbgL+s/Tqf4yhpaeE+Db Yfk71FdJGpJhksi1MLZ2yAx+PrGzkahj991a/zkDSktRH7BIuTeU31HQ26+nIKloEdMQ VvcqilgqDyB7wvazu3DK2vYH0NyCOqiqIYUjuvC/ep5045K3QdmlxwyFuFgt7cPVnVnT tcBQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691987626; x=1692592426; 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=jHqNsVPH8iRdgUDUfifiLFCIQkfKaE9bJzwM0KN8sXU=; b=JapWF0bQypCEPHmaRTQ3T4PUYvWZgPjii79pt72+v6Z10rA9cuP5oSz9ZXHngYz0i5 rZPJByFGGRc8yzyHWZxstNr5o3KmJhzn5Uia2Zn2oxuXDSOtgt63Q5KduU/kSV69KM2u Nje6Y9Jolw/APygaKmAijg8hQGCU3Gj4Ym1XsfXWNQZ9DvXMQTnorFxPBQY21Q1nO0fJ O9WXxy5L+/OMexMtCZqTLwp292mdWBb6oewD315HZyrZPF0QBbfgz2krDgI2+F+omnNW S57FlnYoeEuMByxuiZqmMMUCRqfO99vdsNwRqpR/c8AGAihF6MBez0+JXjLNiWsi1E5O Px9Q== X-Gm-Message-State: AOJu0YxVorMocFhpE23FDzEdgXws0LPw7xWYGFWWcSwJ9fvPdWWPjJHG HCb0YgOnYxRPPu5aysE9efVq62wPGBb2gQ== X-Google-Smtp-Source: AGHT+IH9v5hJPIZB0g70rZDeTHCjKJLXah+vhnPXgoCq455Rmn6WM1bnsUF7d6aeoV8ShZEQjvvZUA== X-Received: by 2002:a05:622a:13d3:b0:403:b44a:a5e4 with SMTP id p19-20020a05622a13d300b00403b44aa5e4mr12521926qtk.52.1691987626085; Sun, 13 Aug 2023 21:33:46 -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.33.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 13 Aug 2023 21:33:45 -0700 (PDT) From: Maxim Cournoyer Date: Mon, 14 Aug 2023 00:29:12 -0400 Message-ID: <8a72e5cccd6eb746dae0e41cf9365ed246a11650.1691987375.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 Fixes and similar reports. * gnu/packages/patches/qtdeclarative-5-disable-qmlcache.patch: New patch. * gnu/packages/patches/qtdeclarative-disable-qmlcache.patch: Likewise. * gnu/local.mk (dist_patch_DATA): Register them. * gnu/packages/qt.scm (qtdeclarative-5, qtdeclarative): Apply them. Reported-by: Distopico Vegan --- gnu/local.mk | 2 ++ .../qtdeclarative-5-disable-qmlcache.patch | 16 ++++++++++++++++ .../patches/qtdeclarative-disable-qmlcache.patch | 16 ++++++++++++++++ gnu/packages/qt.scm | 6 ++++-- 4 files changed, 38 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/qtdeclarative-5-disable-qmlcache.patch create mode 100644 gnu/packages/patches/qtdeclarative-disable-qmlcache.patch diff --git a/gnu/local.mk b/gnu/local.mk index 1fc37ca6e8..bc703db2df 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1730,6 +1730,8 @@ dist_patch_DATA = \ %D%/packages/patches/python-typeguard-python3.10.patch \ %D%/packages/patches/python-w3lib-fix-test-failure.patch \ %D%/packages/patches/python-wxwidgets-type-errors.patch \ + %D%/packages/patches/qtdeclarative-5-disable-qmlcache.patch \ + %D%/packages/patches/qtdeclarative-disable-qmlcache.patch \ %D%/packages/patches/quodlibet-fix-invalid-glob.patch \ %D%/packages/patches/quodlibet-fix-mtime-tests.patch \ %D%/packages/patches/qxlsx-fix-include-directory.patch \ diff --git a/gnu/packages/patches/qtdeclarative-5-disable-qmlcache.patch b/gnu/packages/patches/qtdeclarative-5-disable-qmlcache.patch new file mode 100644 index 0000000000..2f1cf0dd4e --- /dev/null +++ b/gnu/packages/patches/qtdeclarative-5-disable-qmlcache.patch @@ -0,0 +1,16 @@ +Retrieved from +https://github.com/NixOS/nixpkgs/raw/master/pkgs/development/libraries/qt-5/5.15/qtdeclarative-default-disable-qmlcache.patch + +diff --git a/src/qml/qml/qqmltypeloader.cpp b/src/qml/qml/qqmltypeloader.cpp +index 1d66e75..827567a 100644 +--- a/src/qml/qml/qqmltypeloader.cpp ++++ b/src/qml/qml/qqmltypeloader.cpp +@@ -727,7 +727,7 @@ bool QQmlTypeLoader::Blob::isDebugging() const + + bool QQmlTypeLoader::Blob::diskCacheEnabled() const + { +- return (!disableDiskCache() && !isDebugging()) || forceDiskCache(); ++ return forceDiskCache(); + } + + bool QQmlTypeLoader::Blob::qmldirDataAvailable(const QQmlRefPointer &data, QList *errors) diff --git a/gnu/packages/patches/qtdeclarative-disable-qmlcache.patch b/gnu/packages/patches/qtdeclarative-disable-qmlcache.patch new file mode 100644 index 0000000000..5f06ec53b4 --- /dev/null +++ b/gnu/packages/patches/qtdeclarative-disable-qmlcache.patch @@ -0,0 +1,16 @@ +Retrieved from +https://raw.githubusercontent.com/NixOS/nixpkgs/master/pkgs/development/libraries/qt-6/patches/qtdeclarative-default-disable-qmlcache.patch + +diff --git a/src/qml/jsruntime/qv4engine.cpp b/src/qml/jsruntime/qv4engine.cpp +index 852cde9e..165f1b57 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 + { +- return (!disableDiskCache() && !debugger()) || forceDiskCache(); ++ return forceDiskCache(); + } + + void ExecutionEngine::callInContext(QV4::Function *function, QObject *self, diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 59c079934c..a4de003647 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -1205,7 +1205,8 @@ (define-public qtdeclarative-5 (uri (qt-url name version)) (sha256 (base32 - "1kb8nj17vmnky0ayiwypim7kf6rmlmfcjf6gnrw8rydmp61w0vh2")))) + "1kb8nj17vmnky0ayiwypim7kf6rmlmfcjf6gnrw8rydmp61w0vh2")) + (patches (search-patches "qtdeclarative-5-disable-qmlcache.patch")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg-5) ((#:tests? _ #f) #f) ;TODO: Enable the tests @@ -1251,7 +1252,8 @@ (define-public qtdeclarative (uri (qt-url name version)) (sha256 (base32 - "1hbw63828pp8vm9b46i2pkcbcpr4mq9nblhmpwrw2pflq0fi24xq")))) + "1hbw63828pp8vm9b46i2pkcbcpr4mq9nblhmpwrw2pflq0fi24xq")) + (patches (search-patches "qtdeclarative-disable-qmlcache.patch")))) (build-system cmake-build-system) (arguments (list