all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Zheng Junjie <zhengjunjie@iscas.ac.cn>
To: 69628@debbugs.gnu.org
Cc: "Maxim Cournoyer" <maxim.cournoyer@gmail.com>, 宋文武 <iyzsong@envs.net>
Subject: [bug#69628] [PATCH qt-team v4 05/24] gnu: qtdeclarative: Update to 6.6.2.
Date: Wed, 13 Mar 2024 16:57:59 +0800	[thread overview]
Message-ID: <340c6adc68dd92785a826909b2ffb5a07b2c19b8.1710320156.git.zhengjunjie@iscas.ac.cn> (raw)
In-Reply-To: <cover.1710320156.git.zhengjunjie@iscas.ac.cn>

* 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 <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
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





  parent reply	other threads:[~2024-03-13  9:48 UTC|newest]

Thread overview: 59+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-03-08  6:06 [bug#69628] [PATCH WIP qt-team 00/21] Update some qt6 package Zheng Junjie via Guix-patches
2024-03-08  6:30 ` [bug#69628] [PATCH WIP qt-team 01/21] FIXME: gnu: qtbase: Update to 6.6.2 Zheng Junjie
2024-03-08  6:30 ` [bug#69628] [PATCH WIP qt-team 02/21] gnu: qtsvg: " Zheng Junjie
2024-03-08  6:30 ` [bug#69628] [PATCH WIP qt-team 03/21] gnu: qtshadertools: " Zheng Junjie
2024-03-08  6:30 ` [bug#69628] [PATCH WIP qt-team 04/21] gnu: qtnetworkauth: " Zheng Junjie
2024-03-08  6:30 ` [bug#69628] [PATCH WIP qt-team 05/21] gnu: qtimageformats: " Zheng Junjie
2024-03-08  6:30 ` [bug#69628] [PATCH WIP qt-team 06/21] gnu: qtlanguageserver: " Zheng Junjie
2024-03-08  6:30 ` [bug#69628] [PATCH WIP qt-team 07/21] gnu: qtpositioning: " Zheng Junjie
2024-03-08  6:30 ` [bug#69628] [PATCH WIP qt-team 08/21] FIXME: gnu: qtdeclarative: " Zheng Junjie
2024-03-08  6:30 ` [bug#69628] [PATCH WIP qt-team 09/21] gnu: qttools: " Zheng Junjie
2024-03-08  6:30 ` [bug#69628] [PATCH WIP qt-team 10/21] gnu: qt5compat: " Zheng Junjie
2024-03-08  6:30 ` [bug#69628] [PATCH WIP qt-team 11/21] gnu: qtlottie: " Zheng Junjie
2024-03-08  6:30 ` [bug#69628] [PATCH WIP qt-team 12/21] gnu: qtwebsockets: " Zheng Junjie
2024-03-08  6:30 ` [bug#69628] [PATCH WIP qt-team 13/21] gnu: qttranslations: " Zheng Junjie
2024-03-08  6:30 ` [bug#69628] [PATCH WIP qt-team 14/21] gnu: qtwebchannel: " Zheng Junjie
2024-03-08  6:30 ` [bug#69628] [PATCH WIP qt-team 15/21] gnu: qtwayland: " Zheng Junjie
2024-03-08  6:30 ` [bug#69628] [PATCH WIP qt-team 16/21] gnu: qtremoteobjects: " Zheng Junjie
2024-03-08  6:30 ` [bug#69628] [PATCH WIP qt-team 17/21] gnu: qtmultimedia: " Zheng Junjie
2024-03-08  6:30 ` [bug#69628] [PATCH WIP qt-team 18/21] gnu: qtspeech: Rename to qtspeech-5 Zheng Junjie
2024-03-08 19:12   ` Liliana Marie Prikler
2024-03-08  6:30 ` [bug#69628] [PATCH WIP qt-team 19/21] gnu: Add qtspeech Zheng Junjie
2024-03-08  6:30 ` [bug#69628] [PATCH WIP qt-team 20/21] gnu: qtsensors: Rename to qtsensors-5 Zheng Junjie
2024-03-08  6:30 ` [bug#69628] [PATCH WIP qt-team 21/21] gnu: Add qtsensors Zheng Junjie
2024-03-09 18:23 ` [bug#69628] [PATCH WIP qt-team 00/21] Update some qt6 package Maxim Cournoyer
2024-03-11  5:34 ` [bug#69628] [PATCH v2] gnu: qt: Update to 6.6.2 Zheng Junjie
2024-03-11 10:52 ` [bug#69628] [PATCH v3] " Zheng Junjie
2024-03-12 14:44   ` Maxim Cournoyer
2024-03-13  8:57 ` [bug#69628] [PATCH qt-team v4 00/24] " Zheng Junjie
2024-03-13  8:57   ` [bug#69628] [PATCH qt-team v4 01/24] gnu: qtbase: " Zheng Junjie
2024-03-13  8:57   ` [bug#69628] [PATCH qt-team v4 02/24] gnu: qt5compat: " Zheng Junjie
2024-03-13  8:57   ` [bug#69628] [PATCH qt-team v4 03/24] gnu: qtsvg: " Zheng Junjie
2024-03-13  8:57   ` [bug#69628] [PATCH qt-team v4 04/24] gnu: qtimageformats: " Zheng Junjie
2024-03-13  8:57   ` Zheng Junjie [this message]
2024-03-13  8:58   ` [bug#69628] [PATCH qt-team v4 06/24] gnu: qtwebsockets: " Zheng Junjie
2024-03-13  8:58   ` [bug#69628] [PATCH qt-team v4 07/24] gnu: qtshadertools: " Zheng Junjie
2024-03-13  8:58   ` [bug#69628] [PATCH qt-team v4 08/24] gnu: qtmultimedia: " Zheng Junjie
2024-03-13  8:58   ` [bug#69628] [PATCH qt-team v4 09/24] gnu: qtwayland: " Zheng Junjie
2024-03-13  8:58   ` [bug#69628] [PATCH qt-team v4 10/24] gnu: qtwebchannel: " Zheng Junjie
2024-03-13  8:58   ` [bug#69628] [PATCH qt-team v4 11/24] gnu: qtlanguageserver: " Zheng Junjie
2024-03-13  8:58   ` [bug#69628] [PATCH qt-team v4 12/24] gnu: qtlottie: " Zheng Junjie
2024-03-13  8:58   ` [bug#69628] [PATCH qt-team v4 13/24] gnu: qttools: " Zheng Junjie
2024-03-13  8:58   ` [bug#69628] [PATCH qt-team v4 14/24] gnu: qttranslations: " Zheng Junjie
2024-03-13  8:58   ` [bug#69628] [PATCH qt-team v4 15/24] gnu: qtpositioning: " Zheng Junjie
2024-03-13  8:58   ` [bug#69628] [PATCH qt-team v4 16/24] gnu: qtnetworkauth: " Zheng Junjie
2024-03-13  8:58   ` [bug#69628] [PATCH qt-team v4 17/24] gnu: qtremoteobjects: " Zheng Junjie
2024-03-13  8:58   ` [bug#69628] [PATCH qt-team v4 18/24] gnu: qtwebengine: " Zheng Junjie
2024-03-13  8:58   ` [bug#69628] [PATCH qt-team v4 19/24] gnu: python-{shiboken, pyside}-6: " Zheng Junjie
2024-03-13  8:58   ` [bug#69628] [PATCH qt-team v4 20/24] gnu: qtsensors: Rename package to qtsensors-5 Zheng Junjie
2024-03-13  9:01   ` [bug#69628] [PATCH qt-team v4 21/24] gnu: Add qtsensors Zheng Junjie
2024-03-13  9:01   ` [bug#69628] [PATCH qt-team v4 22/24] gnu: qtspeech: Rename package to qtspeech-5 Zheng Junjie
2024-03-13  9:01   ` [bug#69628] [PATCH qt-team v4 23/24] gnu: Add qtspeech Zheng Junjie
2024-03-13  9:01   ` [bug#69628] [PATCH qt-team v4 24/24] gnu: qt-creator: Update to 12.0.2 Zheng Junjie
2024-03-25 15:21   ` [bug#69628] [PATCH qt-team v4 00/24] qt: Update to 6.6.2 Maxim Cournoyer
2024-03-26  3:10   ` Maxim Cournoyer
     [not found]     ` <87il194k0v.fsf@iscas.ac.cn>
2024-03-26 10:12       ` 宋文武 via Guix-patches via
2024-03-26 14:17         ` Maxim Cournoyer
2024-03-27 13:07 ` [bug#69628] [PATCH 1/2] gnu: python-sip: Update to 6.8.3 Zheng Junjie
2024-03-27 13:07   ` [bug#69628] [PATCH 2/2] gnu: python-pyqt-6: Update to 6.6.1 Zheng Junjie
2024-03-30  2:34     ` bug#69628: " Maxim Cournoyer

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=340c6adc68dd92785a826909b2ffb5a07b2c19b8.1710320156.git.zhengjunjie@iscas.ac.cn \
    --to=zhengjunjie@iscas.ac.cn \
    --cc=69628@debbugs.gnu.org \
    --cc=iyzsong@envs.net \
    --cc=maxim.cournoyer@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.