From patchwork Wed Aug 16 12:10:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 52897 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 4D47727BBE2; Wed, 16 Aug 2023 13:14:25 +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 984D927BBEC for ; Wed, 16 Aug 2023 13:14:22 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qWFPC-0007gO-Uz; Wed, 16 Aug 2023 08:13:42 -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-000785-95 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 1qWFOb-0002LY-3c 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 1qWFOZ-0005Qc-73; Wed, 16 Aug 2023 08:13:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65280] [PATCH v2 02/59] 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: Wed, 16 Aug 2023 12:13:03 +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.169218795420411 (code B ref 65280); Wed, 16 Aug 2023 12:13:03 +0000 Received: (at 65280) by debbugs.gnu.org; 16 Aug 2023 12:12:34 +0000 Received: from localhost ([127.0.0.1]:39015 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qWFO5-0005J7-OE for submit@debbugs.gnu.org; Wed, 16 Aug 2023 08:12:34 -0400 Received: from mail-qv1-xf33.google.com ([2607:f8b0:4864:20::f33]:50371) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qWFO2-0005Hn-4p for 65280@debbugs.gnu.org; Wed, 16 Aug 2023 08:12:30 -0400 Received: by mail-qv1-xf33.google.com with SMTP id 6a1803df08f44-6418cc115cdso33932446d6.0 for <65280@debbugs.gnu.org>; Wed, 16 Aug 2023 05:12:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1692187944; x=1692792744; 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=e+K97jZlGbVWwhIcL5sWpDjZMoDxRxPbNckT7oHg/N0=; b=RmGRoSwGT0GZRQSLl7JFc5GfYrcz2pFu1ATV5wKHdmHNOes4adgeT4aG8KaLSe8kCw 3F5pag/dGxhY3IErKXhk2r2QMh9V9UQGAjYxufiLUJvIOhMo1A0rw6NcVoGKKQCjmbRa ERwNH10rZUBdEBn0QSd9NUnpZh4WEnAoYRZaoROEpQ+ieGf9q8fdFxLIseRp5QmROJRY zDkzMzfxtQ6rZcrt02JmHoMuwH2EoOhVp8j+I4jqbprhc4jKtRJXmRiOC7LjryIlS71p 2zRtXcFvBOuRIYM7BoMOqEClPARDjcrdA4yeNySVvsbN4rdk4Ay2hgOdJHyQ9VPjvBE+ vNAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692187944; x=1692792744; 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=e+K97jZlGbVWwhIcL5sWpDjZMoDxRxPbNckT7oHg/N0=; b=SY0LvVyJt27QSc+iE29FH16OkKJkugkkNk7h+Jk4gKzBuHBtxyjG5z1AmbRToXdZLQ tGytXLcTYCPzaTIsOtOhuSP785bno2J3wS1s+26qzWGB4PGAI/wSbVxo0eRu+PR/w4bv pktjpZNijNh4DfP94+A3sRBTl1/eRX2JGqkTtBgJ7L/qXwvEbvnLSWutB9uF94lLbEub xXYkfD+7Ux9MlEVwxWM3adz8aKgS+udQRMP6CR2g3tbsQahOXs8c9kLJI0xUc8b7VCzg aNYvRDG18rUV/OqyfIpsECsGgtpSqgLEWEg4bLoJU2IEqZ3XPoAbEGDczI9QJrQbUaEj XLeQ== X-Gm-Message-State: AOJu0YzB986lMKT91KRbGDaLYVREd0uHOoHluqOqaEitekmJShkuz0Lo 5KoTmsQRlIUt8Mc0vCItuoLfLA7Z6CY= X-Google-Smtp-Source: AGHT+IFGPezxc00eXcTzGbctBBsV0YRYu+MrSYm/UJpcyD1Upuwi+/jrdPh5KF/HVrN8P/wrBGOy3Q== X-Received: by 2002:a0c:da91:0:b0:649:bf3:6dca with SMTP id z17-20020a0cda91000000b006490bf36dcamr986919qvj.62.1692187944369; Wed, 16 Aug 2023 05:12:24 -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.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Aug 2023 05:12:23 -0700 (PDT) From: Maxim Cournoyer Date: Wed, 16 Aug 2023 08:10:18 -0400 Message-ID: <5f432f6aa1fc188fc69ac26f13fff03a2b318a5d.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 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 --- (no changes since v1) 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 1bf33377a4..f10fe292dc 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1732,6 +1732,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