iyzsong pushed a commit to branch qt-team
in repository guix.
commit 83c915b784961bbcfdedafa36d6be058c19fd2be
Author: 宋文武 <[email protected]>
AuthorDate: Tue Feb 4 14:55:28 2025 +0800
gnu: qtdeclarative: Update to 6.8.2.
* gnu/packages/patches/qtdeclarative-disable-qmlcache.patch: Adjust for
6.8.2.
* gnu/packages/qt.scm (qtdeclarative): Update to 6.8.2.
[arguments]: Skip failing test.
Change-Id: I665d373498814c30001138629fba4ab826b7f643
---
gnu/packages/patches/qtdeclarative-disable-qmlcache.patch | 10 ++++------
gnu/packages/qt.scm | 9 ++++++---
2 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/gnu/packages/patches/qtdeclarative-disable-qmlcache.patch
b/gnu/packages/patches/qtdeclarative-disable-qmlcache.patch
index df76fab910..f6c3756a81 100644
--- a/gnu/packages/patches/qtdeclarative-disable-qmlcache.patch
+++ b/gnu/packages/patches/qtdeclarative-disable-qmlcache.patch
@@ -14,7 +14,7 @@ diff --git a/src/qml/jsruntime/qv4engine.cpp
b/src/qml/jsruntime/qv4engine.cpp
index d1b4c4fff6..50f8a07420 100644
--- a/src/qml/jsruntime/qv4engine.cpp
+++ b/src/qml/jsruntime/qv4engine.cpp
-@@ -2232,11 +2232,7 @@ ExecutionEngine::DiskCacheOptions
ExecutionEngine::diskCacheOptions() const
+@@ -2246,11 +2246,5 @@ ExecutionEngine::DiskCacheOptions Execut
{
if (forceDiskCache())
return DiskCache::Enabled;
@@ -22,10 +22,8 @@ index d1b4c4fff6..50f8a07420 100644
- return DiskCache::Disabled;
- static const DiskCacheOptions options = qmlGetConfigOption<
- DiskCacheOptions, transFormDiskCache>("QML_DISK_CACHE");
-- return options;
+- return hasPreview.loadAcquire()
+- ? (options & ~DiskCacheOptions(DiskCache::Aot)) // Disable AOT if
preview enabled
+- : 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 76e09e283e..cad66e7d03 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1594,14 +1594,14 @@ with JavaScript and C++.")))
(define-public qtdeclarative
(package
(name "qtdeclarative")
- (version "6.7.2")
+ (version "6.8.2")
;; TODO: Package 'masm' and unbundle from sources.
(source (origin
(method url-fetch)
(uri (qt-url name version))
(sha256
(base32
- "16drp7yjsm50cvsyww9xk15hzf2csax02vpbv0jx8hlcmyhwnaac"))
+ "0mkd6hqvg21dg63022iq1b6sskp2s5wfchsifc4mkdcbvim8fk8l"))
(patches (search-patches
"qtdeclarative-disable-qmlcache.patch"))))
(outputs '("out" "debug"))
(build-system cmake-build-system)
@@ -1717,7 +1717,10 @@ with JavaScript and C++.")))
"tst_dom_all"
"tst_qmlls"
"tst_qmllscompletions"
-
+ ;; This test fails with comparing 'importPaths' between:
+ ;; /tmp/guix-build-.../lib/qt6/qml
+ ;; /gnu/store/......../lib/qt6/qml
+ "test_generate_qmlls_ini"
;; This test fails starting with 6.6.3 (see:
;; https://bugreports.qt.io/browse/QTBUG-123748), for
;; unknown reasons.
