diff options
| author | Zheng Junjie <zhengjunjie@iscas.ac.cn> | 2024-03-13 16:57:59 +0800 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2024-04-03 18:05:07 -0400 |
| commit | 2202f440e6aa3e96fe49f5fa0e67f3d30ea4f843 (patch) | |
| tree | c8c616e8072017278ff03f09e9eafd38dff89c21 /gnu/packages/patches | |
| parent | 4605bc67d3df7b9e5942498d1c196664daaaef79 (diff) | |
| download | guix-2202f440e6aa3e96fe49f5fa0e67f3d30ea4f843.tar guix-2202f440e6aa3e96fe49f5fa0e67f3d30ea4f843.tar.gz | |
gnu: qtdeclarative: Update to 6.6.2.
* gnu/packages/qt.scm (qtdeclarative): Update to 6.6.2.
[arguments]<#:phases>: Disable flaky tst_qmltyperegistrar test. Disable
failing tst_qquickiconimage test.
* gnu/packages/patches/qtdeclarative-disable-qmlcache.patch: Adjust it.
Change-Id: Ic7ddb603524ff07916d57b2ce92b7ffa407a5004
Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Diffstat (limited to 'gnu/packages/patches')
| -rw-r--r-- | gnu/packages/patches/qtdeclarative-disable-qmlcache.patch | 27 |
1 files changed, 21 insertions, 6 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 <nickcao@nichi.co> +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 |