GNU bug report logs - #69628
[PATCH WIP qt-team 00/21] Update some qt6 package.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 69628 in the body.
You can then email your comments to 69628 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Zheng Junjie <zhengjunjie <at> iscas.ac.cn>
To: guix-patches <at> gnu.org
Subject: [PATCH WIP qt-team 00/21] Update some qt6 package.
Date: Fri,  8 Mar 2024 14:06:54 +0800

Hello! This is some qt6 package update, is part of plasma 6 update,
I'm not very familiar with qt6, So if there is any problem, it must be my problem.
Commits prefixed with FIXME are packages that may need to be fix.

Missing qtwebengine, pyqt and many packages. 

plasma 6 work is in https://github.com/Z572/guix/commits/kde6-rebase2/


Zheng Junjie (21):
  FIXME: gnu: qtbase: Update to 6.6.2.
  gnu: qtsvg: Update to 6.6.2.
  gnu: qtshadertools: Update to 6.6.2.
  gnu: qtnetworkauth: Update to 6.6.2.
  gnu: qtimageformats: Update to 6.6.2.
  gnu: qtlanguageserver: Update to 6.6.2.
  gnu: qtpositioning: Update to 6.6.2.
  FIXME: gnu: qtdeclarative: Update to 6.6.2.
  gnu: qttools: Update to 6.6.2.
  gnu: qt5compat: Update to 6.6.2.
  gnu: qtlottie: Update to 6.6.2.
  gnu: qtwebsockets: Update to 6.6.2.
  gnu: qttranslations: Update to 6.6.2.
  gnu: qtwebchannel: Update to 6.6.2.
  gnu: qtwayland: Update to 6.6.2.
  gnu: qtremoteobjects: Update to 6.6.2.
  gnu: qtmultimedia: Update to 6.6.2.
  gnu: qtspeech: Rename to qtspeech-5.
  gnu: Add qtspeech.
  gnu: qtsensors: Rename to qtsensors-5.
  gnu: Add qtsensors.

 gnu/local.mk                                  |   1 -
 gnu/packages/education.scm                    |   2 +-
 gnu/packages/games.scm                        |   2 +-
 gnu/packages/geo.scm                          |   2 +-
 gnu/packages/kde-frameworks.scm               |   2 +-
 gnu/packages/kde-pim.scm                      |   4 +-
 gnu/packages/kde-plasma.scm                   |   2 +-
 gnu/packages/kde-utils.scm                    |   2 +-
 gnu/packages/kde.scm                          |   2 +-
 gnu/packages/patches/qtbase-use-TZDIR.patch   | 141 ----------------
 .../qtdeclarative-disable-qmlcache.patch      |  27 +++-
 gnu/packages/qt.scm                           | 151 ++++++++++++------
 gnu/packages/radio.scm                        |   2 +-
 13 files changed, 136 insertions(+), 204 deletions(-)
 delete mode 100644 gnu/packages/patches/qtbase-use-TZDIR.patch


base-commit: 0b5cbca689b2f91949e191ca256ffc9bb48c1141
-- 
2.41.0

Message #8 received at 69628 <at> debbugs.gnu.org (full text, mbox):

From: Zheng Junjie <zhengjunjie <at> iscas.ac.cn>
To: 69628 <at> debbugs.gnu.org
Subject: [PATCH WIP qt-team 02/21] gnu: qtsvg: Update to 6.6.2.
Date: Fri,  8 Mar 2024 14:30:02 +0800

* gnu/packages/qt.scm (qtsvg): Update to 6.6.2.

Change-Id: Ic24e80df3a52a918b97cc2b226ca98f2677287c2
---
 gnu/packages/qt.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 13008154c4..2b860f0e68 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1174,13 +1174,13 @@ (define-public qtsvg-5
 (define-public qtsvg
   (package
     (name "qtsvg")
-    (version "6.5.2")
+    (version "6.6.2")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "18v337lfk8krg0hff5jx6fi7gn6x3djn03x3psrhlbmgjc8crd28"))))
+                "10c1dmbv5d39n1q4m67gf2h4n6wfkzrlyk8plnxbyhhvxxcis8ss"))))
     (build-system cmake-build-system)
     (arguments
      (list
-- 
2.41.0

Message #11 received at 69628 <at> debbugs.gnu.org (full text, mbox):

From: Zheng Junjie <zhengjunjie <at> iscas.ac.cn>
To: 69628 <at> debbugs.gnu.org
Subject: [PATCH WIP qt-team 03/21] gnu: qtshadertools: Update to 6.6.2.
Date: Fri,  8 Mar 2024 14:30:03 +0800

* gnu/packages/qt.scm (qtshadertools): Update to 6.6.2.

Change-Id: I640701c1449cca0438d209932c8ce6de785a7a63
---
 gnu/packages/qt.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 2b860f0e68..f192b52048 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1717,7 +1717,7 @@ (define-public qtmultimedia-5
 (define-public qtshadertools
   (package
     (name "qtshadertools")
-    (version "6.5.2")
+    (version "6.6.2")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
@@ -1725,7 +1725,7 @@ (define-public qtshadertools
               ;; sources.
               (sha256
                (base32
-                "0g8aziqhds2fkx11y4p2akmyn2p1qqf2fjxv72f9pibnhpdv0gya"))))
+                "0bxrczs9nw6az2p4n8x0f660vsmxxynx4iqgj75l4zsfzzbym2v2"))))
     (build-system cmake-build-system)
     (arguments
      (list
-- 
2.41.0

Message #14 received at 69628 <at> debbugs.gnu.org (full text, mbox):

From: Zheng Junjie <zhengjunjie <at> iscas.ac.cn>
To: 69628 <at> debbugs.gnu.org
Subject: [PATCH WIP qt-team 01/21] FIXME: gnu: qtbase: Update to 6.6.2.
Date: Fri,  8 Mar 2024 14:30:01 +0800

* gnu/packages/qt.scm (qtbase): Update to 6.6.2.
[source]: unbundle pcre2, md4c, remove qtbase-use-TZDIR.patch
[arguments]<#:phase>: skip tst_qt_cmake_create,tst_selftests test.
[inputs]: add libb2.

* gnu/packages/patches/qtbase-use-TZDIR.patch: remove this.
* gnu/local.mk(dist_patch_DATA): remove patch.
Change-Id: I650d1b3380095fdae269adcdbf014c7d918080a6

Change-Id: Ief788d0da5be0e9772ca1f35695f17cd658bd8f7
---
 gnu/local.mk                                |   1 -
 gnu/packages/patches/qtbase-use-TZDIR.patch | 141 --------------------
 gnu/packages/qt.scm                         |  18 +--
 3 files changed, 10 insertions(+), 150 deletions(-)
 delete mode 100644 gnu/packages/patches/qtbase-use-TZDIR.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 83937db4c8..0a0ef49719 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1950,7 +1950,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/qtbase-moc-ignore-gcc-macro.patch	\
   %D%/packages/patches/qtbase-qmake-use-libname.patch		\
   %D%/packages/patches/qtbase-5-use-TZDIR.patch			\
-  %D%/packages/patches/qtbase-use-TZDIR.patch			\
   %D%/packages/patches/qtscript-disable-tests.patch		\
   %D%/packages/patches/quagga-reproducible-build.patch          \
   %D%/packages/patches/quickswitch-fix-dmenu-check.patch	\
diff --git a/gnu/packages/patches/qtbase-use-TZDIR.patch b/gnu/packages/patches/qtbase-use-TZDIR.patch
deleted file mode 100644
index 98bf7493e9..0000000000
--- a/gnu/packages/patches/qtbase-use-TZDIR.patch
+++ /dev/null
@@ -1,141 +0,0 @@
-From 1075606f8b2f9e153c82f8e50cbd69cea9c72e87 Mon Sep 17 00:00:00 2001
-From: Edward Welbourne <edward.welbourne <at> qt.io>
-Date: Mon, 11 Sep 2023 11:41:39 +0200
-Subject: [PATCH] Support the TZDIR environment variable
-
-On Linux / glibc, this overrides the default system location for the
-zone info. So check for files there first. Break out a function to
-manage the trying of (now three) zoneinfo directories when opening a
-file by name relative to there.
-
-Pick-to: 6.6 6.5
-Task-number: QTBUG-116017
-Change-Id: I1f97107aabd9015c0a5543639870f1d70654ca67
----
-* Rebased on top of v6.5.2.
-
- src/corelib/time/qtimezoneprivate_tz.cpp | 73 ++++++++++++++++--------
- 1 file changed, 49 insertions(+), 24 deletions(-)
-
-diff --git a/src/corelib/time/qtimezoneprivate_tz.cpp b/src/corelib/time/qtimezoneprivate_tz.cpp
-index 067191d816..a8b2fc894e 100644
---- a/src/corelib/time/qtimezoneprivate_tz.cpp
-+++ b/src/corelib/time/qtimezoneprivate_tz.cpp
-@@ -51,17 +51,41 @@ typedef QHash<QByteArray, QTzTimeZone> QTzTimeZoneHash;
- 
- static bool isTzFile(const QString &name);
- 
-+// Open a named file under the zone info directory:
-+static bool openZoneInfo(QString name, QFile *file)
-+{
-+    // At least on Linux / glibc (see man 3 tzset), $TZDIR overrides the system
-+    // default location for zone info:
-+    const QString tzdir = qEnvironmentVariable("TZDIR");
-+    if (!tzdir.isEmpty()) {
-+        file->setFileName(QDir(tzdir).filePath(name));
-+        if (file->open(QIODevice::ReadOnly))
-+            return true;
-+    }
-+    // Try modern system path first:
-+    constexpr auto zoneShare = "/usr/share/zoneinfo/"_L1;
-+    if (tzdir != zoneShare && tzdir != zoneShare.chopped(1)) {
-+        file->setFileName(zoneShare + name);
-+        if (file->open(QIODevice::ReadOnly))
-+            return true;
-+    }
-+    // Fall back to legacy system path:
-+    constexpr auto zoneLib = "/usr/lib/zoneinfo/"_L1;
-+    if (tzdir != zoneLib && tzdir != zoneLib.chopped(1)) {
-+        file->setFileName(zoneShare + name);
-+        if (file->open(QIODevice::ReadOnly))
-+            return true;
-+    }
-+    return false;
-+}
-+
- // Parse zone.tab table for territory information, read directories to ensure we
- // find all installed zones (many are omitted from zone.tab; even more from
- // zone1970.tab).
- static QTzTimeZoneHash loadTzTimeZones()
- {
--    QString path = QStringLiteral("/usr/share/zoneinfo/zone.tab");
--    if (!QFile::exists(path))
--        path = QStringLiteral("/usr/lib/zoneinfo/zone.tab");
--
--    QFile tzif(path);
--    if (!tzif.open(QIODevice::ReadOnly))
-+    QFile tzif;
-+    if (!openZoneInfo("zone.tab"_L1, &tzif))
-         return QTzTimeZoneHash();
- 
-     QTzTimeZoneHash zonesHash;
-@@ -91,6 +115,7 @@ static QTzTimeZoneHash loadTzTimeZones()
-         }
-     }
- 
-+    const QString path = tzif.fileName();
-     const qsizetype cut = path.lastIndexOf(u'/');
-     Q_ASSERT(cut > 0);
-     const QDir zoneDir = QDir(path.first(cut));
-@@ -761,20 +786,13 @@ QTzTimeZoneCacheEntry QTzTimeZoneCache::findEntry(const QByteArray &ianaId)
-         tzif.setFileName(QStringLiteral("/etc/localtime"));
-         if (!tzif.open(QIODevice::ReadOnly))
-             return ret;
--    } else {
--        // Open named tz, try modern path first, if fails try legacy path
--        tzif.setFileName("/usr/share/zoneinfo/"_L1 + QString::fromLocal8Bit(ianaId));
--        if (!tzif.open(QIODevice::ReadOnly)) {
--            tzif.setFileName("/usr/lib/zoneinfo/"_L1 + QString::fromLocal8Bit(ianaId));
--            if (!tzif.open(QIODevice::ReadOnly)) {
--                // ianaId may be a POSIX rule, taken from $TZ or /etc/TZ
--                auto check = validatePosixRule(ianaId);
--                if (check.isValid) {
--                    ret.m_hasDst = check.hasDst;
--                    ret.m_posixRule = ianaId;
--                }
--                return ret;
--            }
-+    } else if (!openZoneInfo(QString::fromLocal8Bit(ianaId), &tzif)) {
-+        // ianaId may be a POSIX rule, taken from $TZ or /etc/TZ
-+        auto check = validatePosixRule(ianaId);
-+        if (check.isValid) {
-+            ret.m_hasDst = check.hasDst;
-+            ret.m_posixRule = ianaId;
-+            return ret;
-         }
-     }
- 
-@@ -1317,7 +1335,8 @@ private:
-     {
-         // On most distros /etc/localtime is a symlink to a real file so extract
-         // name from the path
--        const auto zoneinfo = "/zoneinfo/"_L1;
-+        const QString tzdir = qEnvironmentVariable("TZDIR");
-+        constexpr auto zoneinfo = "/zoneinfo/"_L1;
-         QString path = QStringLiteral("/etc/localtime");
-         long iteration = getSymloopMax();
-         // Symlink may point to another symlink etc. before being under zoneinfo/
-@@ -1325,9 +1344,15 @@ private:
-         // symlink, like America/Montreal pointing to America/Toronto
-         do {
-             path = QFile::symLinkTarget(path);
--            int index = path.indexOf(zoneinfo);
--            if (index >= 0) // Found zoneinfo file; extract zone name from path:
--                return QStringView{ path }.mid(index + zoneinfo.size()).toUtf8();
-+            // If it's a zoneinfo file, extract the zone name from its path:
-+            int index = tzdir.isEmpty() ? -1 : path.indexOf(tzdir);
-+            if (index >= 0) {
-+                const auto tail = QStringView{ path }.sliced(index + tzdir.size()).toUtf8();
-+                return tail.startsWith(u'/') ? tail.sliced(1) : tail;
-+            }
-+            index = path.indexOf(zoneinfo);
-+            if (index >= 0)
-+                return QStringView{ path }.sliced(index + zoneinfo.size()).toUtf8();
-         } while (!path.isEmpty() && --iteration > 0);
- 
-         return QByteArray();
-
-base-commit: af457a9f0f7eb1a2a7d11f495da508faab91a442
--- 
-2.41.0
-
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 761d12e31f..13008154c4 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -67,6 +67,7 @@ (define-module (gnu packages qt)
   #:use-module (gnu packages bash)
   #:use-module (gnu packages base)
   #:use-module (gnu packages bison)
+  #:use-module (gnu packages crypto)
   #:use-module (gnu packages check)
   #:use-module (gnu packages cmake)
   #:use-module (gnu packages compression)
@@ -654,25 +655,22 @@ (define-public qtbase
   (package
     (inherit qtbase-5)
     (name "qtbase")
-    (version "6.5.2")
+    (version "6.6.2")
     (source (origin
               (inherit (package-source qtbase-5))
               (uri (qt-url name version))
               (sha256
                (base32
-                "0s8jwzdcv97dfy8n3jjm8zzvllv380l73mwdva7rs2nqnhlwgd1x"))
+                "0yv78bwqzy975854h53rbiilsms62f3v02i3jqz7v8ajk1ml56xq"))
               (modules '((guix build utils)))
               (snippet
                ;; corelib uses bundled harfbuzz, md4, md5, sha3
                '(with-directory-excursion "src/3rdparty"
                   (for-each delete-file-recursively
-                            ;; The bundled pcre2 copy is kept, as its headers
-                            ;; are required by some internal bootstrap target
-                            ;; used for the tools.
                             (list "double-conversion" "freetype" "harfbuzz-ng"
-                                  "libpng" "libjpeg" "sqlite" "xcb" "zlib"))))
-              (patches (search-patches "qtbase-use-TZDIR.patch"
-                                       "qtbase-moc-ignore-gcc-macro.patch"
+                                  "pcre2" "md4c" "libpng" "libjpeg"
+                                  "sqlite" "xcb" "zlib"))))
+              (patches (search-patches "qtbase-moc-ignore-gcc-macro.patch"
                                        "qtbase-absolute-runpath.patch"
                                        "qtbase-qmake-use-libname.patch"))))
     (build-system cmake-build-system)
@@ -814,6 +812,9 @@ (define-public qtbase
                     (string-join
                      (append
                       (list
+                       ;; FIXME
+                       "tst_qt_cmake_create"
+                       "tst_selftests"
                        ;; The 'tst_moc' test fails with "'fi.exists()' returned FALSE".
                        "tst_moc"
 
@@ -984,6 +985,7 @@ (define-public qtbase
                 bash-minimal
                 coreutils-minimal
                 md4c
+                libb2
                 libice
                 libsm
                 libxcb
-- 
2.41.0

Message #17 received at 69628 <at> debbugs.gnu.org (full text, mbox):

From: Zheng Junjie <zhengjunjie <at> iscas.ac.cn>
To: 69628 <at> debbugs.gnu.org
Subject: [PATCH WIP qt-team 05/21] gnu: qtimageformats: Update to 6.6.2.
Date: Fri,  8 Mar 2024 14:30:05 +0800

* gnu/packages/qt.scm (qtimageformats): Update to 6.6.2.

Change-Id: Ie4490b88eb50e2f8eb78f94d9feedf6ac61ed18c
---
 gnu/packages/qt.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index c5a27dfbd0..4bbf2ca552 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1233,14 +1233,14 @@ (define-public qtimageformats-5
 (define-public qtimageformats
   (package
     (name "qtimageformats")
-    (version "6.5.2")
+    (version "6.6.2")
     (source (origin
               (inherit (package-source qtimageformats-5))
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "0hv7mkn72126rkhy5gmjmbvzy7v17mkk3q2pkmzy99f64j4w1q5a"))))
+                "1cvwm0hnspglydms6qhcp5g0ayz5pamigl52kz8km66l6s8lqn3i"))))
     (build-system cmake-build-system)
     (arguments
      (list
-- 
2.41.0

Message #20 received at 69628 <at> debbugs.gnu.org (full text, mbox):

From: Zheng Junjie <zhengjunjie <at> iscas.ac.cn>
To: 69628 <at> debbugs.gnu.org
Subject: [PATCH WIP qt-team 04/21] gnu: qtnetworkauth: Update to 6.6.2.
Date: Fri,  8 Mar 2024 14:30:04 +0800

* gnu/packages/qt.scm (qtnetworkauth): Update to 6.6.2.

Change-Id: Idd7e9a92aa37e079e380f3831bd16057916da072
---
 gnu/packages/qt.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index f192b52048..c5a27dfbd0 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -2495,13 +2495,13 @@ (define-public qtnetworkauth-5
 (define-public qtnetworkauth
   (package
     (name "qtnetworkauth")
-    (version "6.5.2")
+    (version "6.6.2")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "0g18kh3zhcfi9ni8cqbbjdc1l6jf99ijv5shcl42jk6219b4pk2f"))))
+                "1lijsdwbj8gscfllmp358n5ysa8pvhx2msh7gpxvb4x81daxbg9j"))))
     (build-system cmake-build-system)
     (arguments (list #:configure-flags #~(list "-DQT_BUILD_TESTS=ON")))
     (native-inputs (list perl))
-- 
2.41.0

Message #23 received at 69628 <at> debbugs.gnu.org (full text, mbox):

From: Zheng Junjie <zhengjunjie <at> iscas.ac.cn>
To: 69628 <at> debbugs.gnu.org
Subject: [PATCH WIP qt-team 07/21] gnu: qtpositioning: Update to 6.6.2.
Date: Fri,  8 Mar 2024 14:30:07 +0800

* gnu/packages/qt.scm (qtpositioning): Update to 6.6.2.

Change-Id: Ief9c719aab9361c95723abbc1c01a05fddec22c0
---
 gnu/packages/qt.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 5e22bc6455..2f2c08a582 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -2382,13 +2382,13 @@ (define-public qtscxml
 (define-public qtpositioning
   (package
     (name "qtpositioning")
-    (version "6.5.2")
+    (version "6.6.2")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "1yhlfs8izc054qv1krf5qv6zzjlvmz013h74fwamn74dfh1kyjbh"))))
+                "1qn31vps9dj4g8m7d195qlsyj3p4dfqqszdc6yqq097dq5y5d9sd"))))
     (build-system cmake-build-system)
     (arguments
      (list
-- 
2.41.0

Message #26 received at 69628 <at> debbugs.gnu.org (full text, mbox):

From: Zheng Junjie <zhengjunjie <at> iscas.ac.cn>
To: 69628 <at> debbugs.gnu.org
Subject: [PATCH WIP qt-team 06/21] gnu: qtlanguageserver: Update to 6.6.2.
Date: Fri,  8 Mar 2024 14:30:06 +0800

* gnu/packages/qt.scm (qtlanguageserver): Update to 6.6.2.

Change-Id: Ieaff26120a1fae9194923d7f193b7267bbc2928e
---
 gnu/packages/qt.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 4bbf2ca552..5e22bc6455 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -2082,13 +2082,13 @@ (define-public qtwebview
 (define-public qtlanguageserver
   (package
     (name "qtlanguageserver")
-    (version "6.5.2")
+    (version "6.6.2")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "196iicwpqca2ydpca41qs6aqxxq8ycknw6lm2v00h1w3m86frdbk"))))
+                "1bgazi44mwac20biybhp21icgwa8k7jd295j8jsfgzxbw12lq7y3"))))
     (build-system cmake-build-system)
     (arguments
      (list #:phases #~(modify-phases %standard-phases
-- 
2.41.0

Message #29 received at 69628 <at> debbugs.gnu.org (full text, mbox):

From: Zheng Junjie <zhengjunjie <at> iscas.ac.cn>
To: 69628 <at> debbugs.gnu.org
Subject: [PATCH WIP qt-team 08/21] FIXME: gnu: qtdeclarative: Update to 6.6.2.
Date: Fri,  8 Mar 2024 14:30:08 +0800

* gnu/packages/qt.scm (qtdeclarative): Update to 6.6.2.
* gnu/packages/patches/qtdeclarative-disable-qmlcache.patch: adjust.

Change-Id: If86771a66eca5014b4a30478eac5dba5940dbd7c
---
 .../qtdeclarative-disable-qmlcache.patch      | 27 ++++++++++++++-----
 gnu/packages/qt.scm                           |  6 +++--
 2 files changed, 25 insertions(+), 8 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 <at> 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 2f2c08a582..889b5c29c5 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1408,14 +1408,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)
@@ -1485,6 +1485,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"
-- 
2.41.0

Message #32 received at 69628 <at> debbugs.gnu.org (full text, mbox):

From: Zheng Junjie <zhengjunjie <at> iscas.ac.cn>
To: 69628 <at> debbugs.gnu.org
Subject: [PATCH WIP qt-team 09/21] gnu: qttools: Update to 6.6.2.
Date: Fri,  8 Mar 2024 14:30:09 +0800

* gnu/packages/qt.scm (qttools): Update to 6.6.2.
[inputs]: add zstd:lib.

Change-Id: Iaa1912a3663bb4e7966044d6e051b3346119ceaf
---
 gnu/packages/qt.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 889b5c29c5..163b2000d9 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -2186,13 +2186,13 @@ (define-public qttools-5
 (define-public qttools
   (package
     (name "qttools")
-    (version "6.5.2")
+    (version "6.6.2")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "0ha3v488vnm4pgdpyjgf859sak0z2fwmbgcyivcd93qxflign7sm"))))
+                "0ij7djy06xi4v5v29fh31gqq5rnc12vviv3qg3vqf4hiaagrxm76"))))
     (build-system cmake-build-system)
     (arguments
      (list
@@ -2213,7 +2213,7 @@ (define-public qttools
     (native-inputs (list perl qtdeclarative vulkan-headers))
     ;; Use clang-15, which is built using as a single shared library, which is
     ;; what the build system of qttools expects.
-    (inputs (list clang-15 libxkbcommon mesa qtbase))
+    (inputs (list clang-15 libxkbcommon mesa qtbase `(,zstd "lib")))
     (home-page (package-home-page qtbase))
     (synopsis "Qt Tools and Designer modules")
     (description "The Qt Tools module provides a set of applications to browse
-- 
2.41.0

Message #35 received at 69628 <at> debbugs.gnu.org (full text, mbox):

From: Zheng Junjie <zhengjunjie <at> iscas.ac.cn>
To: 69628 <at> debbugs.gnu.org
Subject: [PATCH WIP qt-team 10/21] gnu: qt5compat: Update to 6.6.2.
Date: Fri,  8 Mar 2024 14:30:10 +0800

* gnu/packages/qt.scm (qt5compat): Update to 6.6.2.

Change-Id: Id4be1c4a1e1dc7e7fd09eb32f50ea55c24a0cd7c
---
 gnu/packages/qt.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 163b2000d9..723b63ad51 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1076,13 +1076,13 @@ (define-public qt3d-5
 (define-public qt5compat
   (package
     (name "qt5compat")
-    (version "6.5.2")
+    (version "6.6.2")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "1i4izabbmf1dayzlj1miz7hsm4cy0qb7i72pwyl2fp05w8pf9axr"))))
+                "0rqr34lqf4mjdgjj09wzlvkxfknz8arjl9p30xpqbr2qfsmhhyz0"))))
     (build-system cmake-build-system)
     (arguments
      (list
-- 
2.41.0

Message #38 received at 69628 <at> debbugs.gnu.org (full text, mbox):

From: Zheng Junjie <zhengjunjie <at> iscas.ac.cn>
To: 69628 <at> debbugs.gnu.org
Subject: [PATCH WIP qt-team 15/21] gnu: qtwayland: Update to 6.6.2.
Date: Fri,  8 Mar 2024 14:30:15 +0800

* gnu/packages/qt.scm (qtwayland): Update to 6.6.2.
[arguments]<#:phases>: Adjust set-test-environment phase.

Change-Id: I6e7194df614d18fb9937a66cad7b6a1527c06a4b
---
 gnu/packages/qt.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 040c289e25..85cdf252e6 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1869,13 +1869,13 @@ (define-public qtwayland-5
 (define-public qtwayland
   (package
     (name "qtwayland")
-    (version "6.5.2")
+    (version "6.6.2")
     (source
      (origin
        (method url-fetch)
        (uri (qt-url name version))
        (sha256
-        (base32 "16iwar19sgjvxgmbr6hmd3hsxp6ahdjwl1lra2wapl3zzf3bw81h"))))
+        (base32 "0y6x84ckcc53ddclnrlzs08b1kvw6saw9nim0hz4wc5fyz7dbkcv"))))
     (build-system cmake-build-system)
     (arguments
      (list #:configure-flags #~(list "-DQT_BUILD_TESTS=ON")
@@ -1892,6 +1892,7 @@ (define-public qtwayland
                      (("QTRY_COMPARE\\(bufferSpy\\.size\\(\\), 1\\);") ""))))
                (add-before 'check 'set-test-environment
                  (lambda _
+                   (setenv "XDG_RUNTIME_DIR" (getcwd))
                    ;; Do not fail just because /etc/machine-id is missing.
                    (setenv "DBUS_FATAL_WARNINGS" "0")
                    ;; Make Qt render "offscreen", required for tests.
-- 
2.41.0

Message #41 received at 69628 <at> debbugs.gnu.org (full text, mbox):

From: Zheng Junjie <zhengjunjie <at> iscas.ac.cn>
To: 69628 <at> debbugs.gnu.org
Subject: [PATCH WIP qt-team 12/21] gnu: qtwebsockets: Update to 6.6.2.
Date: Fri,  8 Mar 2024 14:30:12 +0800

* gnu/packages/qt.scm (qtwebsockets): Update to 6.6.2.

Change-Id: Ic34b9a381edbb00f97acc7d269bbedb33415fd8c
---
 gnu/packages/qt.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index d4db8e2ee8..c3728635fa 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1603,13 +1603,13 @@ (define-public qtwebsockets-5
 (define-public qtwebsockets
   (package
     (name "qtwebsockets")
-    (version "6.5.2")
+    (version "6.6.2")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "0xjwifxj2ssshys6f6kjr6ri2vq1wfshxky6mcscjm7vvyqdfjr0"))))
+                "1y9q8jmspxbfxf07jdcg4n8zwmchccyzp0z68fxr0hnvr2dymrn0"))))
     (build-system cmake-build-system)
     (arguments
      (list
-- 
2.41.0

Message #44 received at 69628 <at> debbugs.gnu.org (full text, mbox):

From: Zheng Junjie <zhengjunjie <at> iscas.ac.cn>
To: 69628 <at> debbugs.gnu.org
Subject: [PATCH WIP qt-team 13/21] gnu: qttranslations: Update to 6.6.2.
Date: Fri,  8 Mar 2024 14:30:13 +0800

* gnu/packages/qt.scm (qttranslations): Update to 6.6.2.

Change-Id: Iff2a08a486cfb0574dd33345a5689ad719b487b2
---
 gnu/packages/qt.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index c3728635fa..c490619c8d 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -2226,13 +2226,13 @@ (define-public qttools
 (define-public qttranslations
   (package
     (name "qttranslations")
-    (version "6.5.2")
+    (version "6.6.2")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "1sxy2ljn5ajvn4yjb8fx86l56viyvqh5r9hf5x67azkmgrilaz1k"))))
+                "0xqcad8aa9lp6wzh1rs46id6r60zdw82qj3bq9k2b89sxy8c0fna"))))
     (build-system cmake-build-system)
     (arguments (list #:tests? #f))
     (native-inputs (list qtbase qttools))
-- 
2.41.0

Message #47 received at 69628 <at> debbugs.gnu.org (full text, mbox):

From: Zheng Junjie <zhengjunjie <at> iscas.ac.cn>
To: 69628 <at> debbugs.gnu.org
Subject: [PATCH WIP qt-team 14/21] gnu: qtwebchannel: Update to 6.6.2.
Date: Fri,  8 Mar 2024 14:30:14 +0800

* gnu/packages/qt.scm (qtwebchannel): Update to 6.6.2.

Change-Id: Id534496d96628d6af66772842f0a1a9525292b9d
---
 gnu/packages/qt.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index c490619c8d..040c289e25 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -2000,13 +2000,13 @@ (define-public qtwebchannel-5
 (define-public qtwebchannel
   (package
     (name "qtwebchannel")
-    (version "6.5.2")
+    (version "6.6.2")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "0qwfnwva7v5f2g5is17yy66mnmc9c1yf9aagaw5qanskdvxdk261"))))
+                "1incvisc3j758b4k82vnwci8j1bba8zf6xgmgcrsm553k4wpsz1x"))))
     (build-system cmake-build-system)
     (arguments
      (list
-- 
2.41.0

Message #50 received at 69628 <at> debbugs.gnu.org (full text, mbox):

From: Zheng Junjie <zhengjunjie <at> iscas.ac.cn>
To: 69628 <at> debbugs.gnu.org
Subject: [PATCH WIP qt-team 11/21] gnu: qtlottie: Update to 6.6.2.
Date: Fri,  8 Mar 2024 14:30:11 +0800

* gnu/packages/qt.scm (qtlottie): Update to 6.6.2.

Change-Id: I68e4725203684646b1e746cf31e183b9a7de668e
---
 gnu/packages/qt.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 723b63ad51..d4db8e2ee8 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -2133,13 +2133,13 @@ (define-public qtlocation
 (define-public qtlottie
   (package
     (name "qtlottie")
-    (version "6.5.2")
+    (version "6.6.2")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "16z8fhaa40ig0cggb689zf8j3cid6fk6pmh91b8342ymy1fdqfh0"))))
+                "1hqhp55jfasavk7p8xb0srbc6lnk70w2q0x4iwn28z5s5kd1cvi7"))))
     (build-system cmake-build-system)
     (arguments
      (list
-- 
2.41.0

Message #53 received at 69628 <at> debbugs.gnu.org (full text, mbox):

From: Zheng Junjie <zhengjunjie <at> iscas.ac.cn>
To: 69628 <at> debbugs.gnu.org
Subject: [PATCH WIP qt-team 16/21] gnu: qtremoteobjects: Update to 6.6.2.
Date: Fri,  8 Mar 2024 14:30:16 +0800

* gnu/packages/qt.scm (qtremoteobjects): Update to 6.6.2.

Change-Id: Ic5728e1703ec3334b472c1a8b8841a913528834b
---
 gnu/packages/qt.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 85cdf252e6..00ff9a62e3 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -2518,13 +2518,13 @@ (define-public qtnetworkauth
 (define-public qtremoteobjects
   (package
     (name "qtremoteobjects")
-    (version "6.5.2")
+    (version "6.6.2")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "0k29sk02n54vj1w6vh6xycsjpyfqlijc13fnxh1q7wpgg4gizx60"))))
+                "0fbkjzykxpkz8myr6dy588gcmhyy3lar17v78zfam8kyxq7s5qxa"))))
     (build-system cmake-build-system)
     (arguments
      (list
-- 
2.41.0

Message #56 received at 69628 <at> debbugs.gnu.org (full text, mbox):

From: Zheng Junjie <zhengjunjie <at> iscas.ac.cn>
To: 69628 <at> debbugs.gnu.org
Subject: [PATCH WIP qt-team 17/21] gnu: qtmultimedia: Update to 6.6.2.
Date: Fri,  8 Mar 2024 14:30:17 +0800

* gnu/packages/qt.scm (qtmultimedia): Update to 6.6.2.
[arguments]<#:phases>: adjust 'disable-integration-tests phase.

Change-Id: I34c74de856566ae815c90e62aedf29e3b5990d83
---
 gnu/packages/qt.scm | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 00ff9a62e3..79e59a0e74 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1748,13 +1748,13 @@ (define-public qtshadertools
 (define-public qtmultimedia
   (package
     (name "qtmultimedia")
-    (version "6.5.2")
+    (version "6.6.2")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "0xc9k4mlncscxqbp8q46yjd89k4jb8j0ggbi5ad874lycym013wl"))
+                "1v0430jnv97ws6cizn9mi8zr9hcg7rixd0jg7smhdq8apacjb572"))
               (modules '((guix build utils)))
               (snippet
                '(begin
@@ -1779,7 +1779,10 @@ (define-public qtmultimedia
               ;; session bus, which requires an X11 server, and then is still
               ;; unhappy).
               (substitute* "tests/auto/CMakeLists.txt"
-                (("add_subdirectory\\(integration)") ""))))
+                (("add_subdirectory\\(integration)") ""))
+              ;; fail on offscreen rendering
+              (substitute* "tests/auto/unit/multimedia/CMakeLists.txt"
+                (("add_subdirectory\\(qvideoframecolormanagement\\)") ""))))
           (add-before 'check 'prepare-for-tests
             (lambda _
               (setenv "QT_QPA_PLATFORM" "offscreen")))
-- 
2.41.0

Message #59 received at 69628 <at> debbugs.gnu.org (full text, mbox):

From: Zheng Junjie <zhengjunjie <at> iscas.ac.cn>
To: 69628 <at> debbugs.gnu.org
Subject: [PATCH WIP qt-team 19/21] gnu: Add qtspeech.
Date: Fri,  8 Mar 2024 14:30:19 +0800

* gnu/packages/qt.scm (qtspeech): New variable.

Change-Id: Iba3277b2774b80366960b57207ed179979e54215
---
 gnu/packages/qt.scm | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index cf4baee99b..4fb07e1a36 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -2580,6 +2580,38 @@ (define-public qtspeech-5
 In such a scenario, the messaging application can read out the incoming
 message.")))
 
+(define-public qtspeech
+  (package
+    (inherit qtspeech-5)
+    (name "qtspeech")
+    (version "6.6.2")
+    (source (origin
+              (method url-fetch)
+              (uri (qt-url name version))
+              (sha256
+               (base32
+                "1qvf3p2p1pc5fw40d8zq0iawaaqkc0dp5yx85b1dnw1j809bn8y0"))))
+    (build-system qt-build-system)
+    (arguments
+     (list #:phases
+           #~(modify-phases %standard-phases
+               (delete 'check)               ;move after the install phase
+               (add-after 'install 'check
+                 (assoc-ref %standard-phases 'check))
+               (add-before 'check 'prepare-for-tests
+                 (lambda* (#:key outputs #:allow-other-keys)
+                   (setenv "QML2_IMPORT_PATH"
+                           (string-append (assoc-ref outputs "out")
+                                          "/lib/qt6/qml:"
+                                          (getenv "QML2_IMPORT_PATH")))))
+               (add-after 'install 'delete-installed-tests
+                 (lambda _
+                   (delete-file-recursively
+                    (string-append #$output "/tests")))))))
+    (native-inputs '())
+    (propagated-inputs (list qtmultimedia))
+    (inputs (list qtbase qtdeclarative))))
+
 (define-public qtvirtualkeyboard-5
   (package
     (inherit qtsvg-5)
-- 
2.41.0

Message #62 received at 69628 <at> debbugs.gnu.org (full text, mbox):

From: Zheng Junjie <zhengjunjie <at> iscas.ac.cn>
To: 69628 <at> debbugs.gnu.org
Subject: [PATCH WIP qt-team 20/21] gnu: qtsensors: Rename to qtsensors-5.
Date: Fri,  8 Mar 2024 14:30:20 +0800

* gnu/packages/qt.scm(qtsensors): Rename to qtsensors-5.
(python-pyqt,python-pyside-2): Adjust inputs.
* gnu/packages/education.scm(gcompris-qt): Adjust inputs.
* gnu/packages/kde-plasma.scm(kscreen): Adjust inputs.
* gnu/packages/geo.scm(openorienteering-mapper): Adjust inputs.

Change-Id: Id19408579f6c765cb4d28504a2ce90e6727615b4
---
 gnu/packages/education.scm  | 2 +-
 gnu/packages/geo.scm        | 2 +-
 gnu/packages/kde-plasma.scm | 2 +-
 gnu/packages/qt.scm         | 6 +++---
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm
index 698f15678b..50d4b332ee 100644
--- a/gnu/packages/education.scm
+++ b/gnu/packages/education.scm
@@ -192,7 +192,7 @@ (define-public gcompris-qt
            qtgraphicaleffects
            qtmultimedia-5
            qtquickcontrols2-5
-           qtsensors
+           qtsensors-5
            qtsvg-5))
     (home-page "https://gcompris.net/index-en.html")
     (synopsis "Educational games for small children")
diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm
index 687effcace..63e66afdb8 100644
--- a/gnu/packages/geo.scm
+++ b/gnu/packages/geo.scm
@@ -2575,7 +2575,7 @@ (define-public openorienteering-mapper
            qtbase-5
            qtimageformats-5
            qtlocation
-           qtsensors
+           qtsensors-5
            zlib))
     (native-inputs
      (list doxygen
diff --git a/gnu/packages/kde-plasma.scm b/gnu/packages/kde-plasma.scm
index 331ab28cd1..5594136f12 100644
--- a/gnu/packages/kde-plasma.scm
+++ b/gnu/packages/kde-plasma.scm
@@ -793,7 +793,7 @@ (define-public kscreen
                   libkscreen
                   libxi
                   plasma-wayland-protocols
-                  qtsensors
+                  qtsensors-5
                   qtbase-5
                   qtx11extras
                   xcb-util))
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 4fb07e1a36..064f9e0576 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1639,7 +1639,7 @@ (define-public qtwebsockets
     (home-page (package-home-page qtbase))
     (license (package-license qtbase))))
 
-(define-public qtsensors
+(define-public qtsensors-5
   (package
     (inherit qtsvg-5)
     (name "qtsensors")
@@ -3713,7 +3713,7 @@ (define-public python-pyqt
        ("qtdeclarative-5" ,qtdeclarative-5)
        ("qtlocation" ,qtlocation)
        ("qtmultimedia-5" ,qtmultimedia-5)
-       ("qtsensors" ,qtsensors)
+       ("qtsensors" ,qtsensors-5)
        ("qtserialport" ,qtserialport)
        ("qtsvg-5" ,qtsvg-5)
        ("qttools-5" ,qttools-5)
@@ -4527,7 +4527,7 @@ (define-public python-pyside-2
            qtquickcontrols2-5
            qtscript
            qtscxml
-           qtsensors
+           qtsensors-5
            qtspeech-5
            qtsvg-5
            qttools-5
-- 
2.41.0

Message #65 received at 69628 <at> debbugs.gnu.org (full text, mbox):

From: Zheng Junjie <zhengjunjie <at> iscas.ac.cn>
To: 69628 <at> debbugs.gnu.org
Subject: [PATCH WIP qt-team 18/21] gnu: qtspeech: Rename to qtspeech-5.
Date: Fri,  8 Mar 2024 14:30:18 +0800

* gnu/packages/qt.scm(qtspeech): Rename to qtspeech-5.
  python-pyside-2:
* gnu/packages/games.scm (chessx):
* gnu/packages/kde-frameworks.scm(ktextwidgets):
* gnu/packages/kde-pim.scm(kdepim-runtime,kpimtextedit):
* gnu/packages/kde-utils.scm(kmouth):
* gnu/packages/kde.scm(okular):
* gnu/packages/radio.scm(sdrangel):
Adjust inputs.

Change-Id: I64cc893edbb1f5dbe0ada3ffb361513de0884b8b
---
 gnu/packages/games.scm          | 2 +-
 gnu/packages/kde-frameworks.scm | 2 +-
 gnu/packages/kde-pim.scm        | 4 ++--
 gnu/packages/kde-utils.scm      | 2 +-
 gnu/packages/kde.scm            | 2 +-
 gnu/packages/qt.scm             | 4 ++--
 gnu/packages/radio.scm          | 2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 9ff08e5e74..fdc2d53a77 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -10475,7 +10475,7 @@ (define-public chessx
     (native-inputs
      (list qttools-5))
     (inputs
-     (list qtbase-5 qtmultimedia-5 qtspeech qtsvg-5 zlib))
+     (list qtbase-5 qtmultimedia-5 qtspeech-5 qtsvg-5 zlib))
     (arguments
      `(#:tests? #f
        #:phases
diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index 64e41b510d..227f9a28b1 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -3249,7 +3249,7 @@ (define-public ktextwidgets
            kwidgetsaddons
            kwindowsystem
            qtbase-5
-           qtspeech))
+           qtspeech-5))
     (home-page "https://community.kde.org/Frameworks")
     (synopsis "Text editing widgets")
     (description "KTextWidgets provides widgets for displaying and editing text.
diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm
index e95eac4e2f..9a1c0b8d8e 100644
--- a/gnu/packages/kde-pim.scm
+++ b/gnu/packages/kde-pim.scm
@@ -848,7 +848,7 @@ (define-public kdepim-runtime
            qtdeclarative-5
            qtkeychain
            qtnetworkauth-5
-           qtspeech
+           qtspeech-5
            qtwebchannel-5
            qtwebengine-5
            qtxmlpatterns))
@@ -1993,7 +1993,7 @@ (define-public kpimtextedit
            kwidgetsaddons
            kxmlgui
            qtbase-5
-           qtspeech
+           qtspeech-5
            sonnet))
     (arguments
      `(#:tests? #f)) ;; TODO - test suite hangs
diff --git a/gnu/packages/kde-utils.scm b/gnu/packages/kde-utils.scm
index 4e665da599..6c6a669597 100644
--- a/gnu/packages/kde-utils.scm
+++ b/gnu/packages/kde-utils.scm
@@ -874,7 +874,7 @@ (define-public kmouth
            kxmlgui
            breeze-icons ;; default icon set
            qtbase-5
-           qtspeech))
+           qtspeech-5))
     (home-page "https://apps.kde.org/kmouth/")
     (synopsis "Type-and-say frontend for speech synthesizers")
     (description "KMouth is a program which enables persons that cannot speak
diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm
index 8e8bb32fda..385bb42926 100644
--- a/gnu/packages/kde.scm
+++ b/gnu/packages/kde.scm
@@ -1557,7 +1557,7 @@ (define-public okular
            kio
            kparts
            kpty
-           qtspeech
+           qtspeech-5
            kwallet
            kwindowsystem
            libkexiv2
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 79e59a0e74..cf4baee99b 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -2555,7 +2555,7 @@ (define-public qtremoteobjects
     (home-page (package-home-page qtbase))
     (license (package-license qtbase))))
 
-(define-public qtspeech
+(define-public qtspeech-5
   (package
     (inherit qtsvg-5)
     (name "qtspeech")
@@ -4496,7 +4496,7 @@ (define-public python-pyside-2
            qtscript
            qtscxml
            qtsensors
-           qtspeech
+           qtspeech-5
            qtsvg-5
            qttools-5
            qtwebchannel-5
diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm
index caa8b61ee3..cc020bc669 100644
--- a/gnu/packages/radio.scm
+++ b/gnu/packages/radio.scm
@@ -2671,7 +2671,7 @@ (define-public sdrangel
            qtmultimedia-5
            qtquickcontrols2-5
            qtserialport
-           qtspeech
+           qtspeech-5
            qtwebchannel-5
            qtwebengine-5
            qtwebsockets-5
-- 
2.41.0

Message #68 received at 69628 <at> debbugs.gnu.org (full text, mbox):

From: Zheng Junjie <zhengjunjie <at> iscas.ac.cn>
To: 69628 <at> debbugs.gnu.org
Subject: [PATCH WIP qt-team 21/21] gnu: Add qtsensors.
Date: Fri,  8 Mar 2024 14:30:21 +0800

* gnu/packages/qt.scm (qtsensors): New variable.

Change-Id: I87f57a31b51b653ed55db47bfe120c270aa7c44f
---
 gnu/packages/qt.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 064f9e0576..4b00020c72 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1639,6 +1639,25 @@ (define-public qtwebsockets
     (home-page (package-home-page qtbase))
     (license (package-license qtbase))))
 
+(define-public qtsensors
+  (package
+    (inherit qtsvg)
+    (name "qtsensors")
+    (version "6.6.1")
+    (source (origin
+              (method url-fetch)
+              (uri (qt-url name version))
+              (sha256
+               (base32
+                "1lwr6xw4flzcqvb017wl9g8p5yamf0z4zqx2wp4rmhrgbj0yw4xx"))))
+    (native-inputs
+     (list qtdeclarative))
+    (inputs (list qtbase))
+    (synopsis "Qt Sensors module")
+    (description "The Qt Sensors API provides access to sensor hardware via QML
+and C++ interfaces.  The Qt Sensors API also provides a motion gesture
+recognition API for devices.")))
+
 (define-public qtsensors-5
   (package
     (inherit qtsvg-5)
-- 
2.41.0

Message #71 received at 69628 <at> debbugs.gnu.org (full text, mbox):

From: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
To: Zheng Junjie <zhengjunjie <at> iscas.ac.cn>, 69628 <at> debbugs.gnu.org
Cc: Andreas Enge <andreas <at> enge.fr>,
 宋文武 <iyzsong <at> envs.net>,
 Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
Subject: Re: [bug#69628] [PATCH WIP qt-team 18/21] gnu: qtspeech: Rename to
 qtspeech-5.
Date: Fri, 08 Mar 2024 20:12:08 +0100

Am Freitag, dem 08.03.2024 um 14:30 +0800 schrieb Zheng Junjie:
> * gnu/packages/qt.scm(qtspeech): Rename to qtspeech-5.
>   python-pyside-2:
> * gnu/packages/games.scm (chessx):
> * gnu/packages/kde-frameworks.scm(ktextwidgets):
> * gnu/packages/kde-pim.scm(kdepim-runtime,kpimtextedit):
> * gnu/packages/kde-utils.scm(kmouth):
> * gnu/packages/kde.scm(okular):
> * gnu/packages/radio.scm(sdrangel):
> Adjust inputs.
> 
> Change-Id: I64cc893edbb1f5dbe0ada3ffb361513de0884b8b
> ---
Got this mail from the games team, I don't think it'll be an issue.

Cheers

Message #74 received at 69628 <at> debbugs.gnu.org (full text, mbox):

From: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
To: Zheng Junjie <zhengjunjie <at> iscas.ac.cn>
Cc: 69628 <at> debbugs.gnu.org, Andreas Enge <andreas <at> enge.fr>,
 宋文武 <iyzsong <at> envs.net>
Subject: Re: [bug#69628] [PATCH WIP qt-team 00/21] Update some qt6 package.
Date: Sat, 09 Mar 2024 13:23:23 -0500

Hi Zheng,

Zheng Junjie <zhengjunjie <at> iscas.ac.cn> writes:

> Hello! This is some qt6 package update, is part of plasma 6 update,
> I'm not very familiar with qt6, So if there is any problem, it must be my problem.
> Commits prefixed with FIXME are packages that may need to be fix.
>
> Missing qtwebengine, pyqt and many packages. 
>
> plasma 6 work is in https://github.com/Z572/guix/commits/kde6-rebase2/

I don't mind updating qt 6 to a more recent version than the LTS it's
currently tracking (Jami wants a newer version as well), but I think we
should update all the packages at the same time.  This can be done via
the manifests found under etc/teams/qt/.

Would you like to try it?  Then we could push the series as the
'qt-team' and have it built by Cuirass on Berlin to see if there are any
problems with it.

-- 
Thanks,
Maxim

Message #77 received at 69628 <at> debbugs.gnu.org (full text, mbox):

From: Zheng Junjie <zhengjunjie <at> iscas.ac.cn>
To: 69628 <at> debbugs.gnu.org
Subject: [PATCH v2] gnu: qt: Update to 6.6.2.
Date: Mon, 11 Mar 2024 13:34:02 +0800

* gnu/packages/qt.scm (qtbase, qtsvg, qtshadertools, qtnetworkauth,
qtimageformats, qtlanguageserver, qtpositioning, qtdeclarative, qttools,
qt5compat, qtlottie, qtwebsockets, qttranslations, qtwebchannel, qtwayland,
qtremoteobjects, qtmultimedia, qtspeech, qtsensors, qt-creator, qtwebengine): Update to 6.6.2.
(qtbase)[source]: unbundle pcre2, md4c, remove qtbase-use-TZDIR.patch. Add
qtbase-find-tools-in-PATH.patch,
qtbase-pass-to-qmlimportscanner-the-QML2_IMPORT_PATH.patch,
qtbase-qmake-fix-includedir-in-generated-pkg-config.patch,
qtbase-check-in-the-QML-folder-of-this-library-does-.patch.
(qtbase)[arguments]<#:phase>: adjust 'patch-more-paths phase, skip tst_selftests test.
(qtbase)[inputs]: add libb2.

* gnu/packages/patches/qtbase-use-TZDIR.patch: remove this.
* gnu/packages/patches/qtbase-find-tools-in-PATH.patch: New file
* gnu/packages/patches/qtbase-pass-to-qmlimportscanner-the-QML2_IMPORT_PATH.patch: New file
* gnu/packages/patches/qtbase-qmake-fix-includedir-in-generated-pkg-config.patch: New file
* gnu/packages/patches/qtbase-check-in-the-QML-folder-of-this-library-does-.patch: New file

* gnu/local.mk(dist_patch_DATA): remove qtbase-use-TZDIR.patch.
Add qtbase-find-tools-in-PATH.patch,
Regist qtbase-pass-to-qmlimportscanner-the-QML2_IMPORT_PATH.patch,
qtbase-qmake-fix-includedir-in-generated-pkg-config.patch,
qtbase-check-in-the-QML-folder-of-this-library-does-.patch.

* gnu/packages/patches/qtdeclarative-disable-qmlcache.patch: adjust it.

(qttools)[inputs]: add zstd:lib.
(qtwayland)[arguments]<#:phases>: Adjust set-test-environment phase.
(qtmultimedia)[arguments]<#:phases>: adjust 'disable-integration-tests phase.

gnu: Add qtspeech-5.
* gnu/packages/qt.scm(python-pyside-2):
* gnu/packages/games.scm (chessx):
* gnu/packages/kde-frameworks.scm(ktextwidgets):
* gnu/packages/kde-pim.scm(kdepim-runtime,kpimtextedit):
* gnu/packages/kde-utils.scm(kmouth):
* gnu/packages/kde.scm(okular):
* gnu/packages/radio.scm(sdrangel):
Adjust inputs.

gnu: Add qtsensors-5.
* gnu/packages/qt.scm(python-pyqt,python-pyside-2):
* gnu/packages/education.scm(gcompris-qt):
* gnu/packages/kde-plasma.scm(kscreen):
* gnu/packages/geo.scm(openorienteering-mapper):
Adjust inputs.

(qtwebengine)[source]: Adjust snippet.
[arguments]<#:configure-flags>: Adjust it.
<#:phases>: Add delete-installed-tests phase.

Change-Id: Ibb30850de615c85dca2cc4d6fd55b18a228e0fc9
---
 gnu/local.mk                                  |   5 +-
 gnu/packages/education.scm                    |   2 +-
 gnu/packages/games.scm                        |   2 +-
 gnu/packages/geo.scm                          |   2 +-
 gnu/packages/kde-frameworks.scm               |   2 +-
 gnu/packages/kde-pim.scm                      |   4 +-
 gnu/packages/kde-plasma.scm                   |   2 +-
 gnu/packages/kde-utils.scm                    |   2 +-
 gnu/packages/kde.scm                          |   2 +-
 ...the-QML-folder-of-this-library-does-.patch |  35 +++
 .../patches/qtbase-find-tools-in-PATH.patch   |  45 ++++
 ...mlimportscanner-the-QML2_IMPORT_PATH.patch |  30 +++
 ...x-includedir-in-generated-pkg-config.patch |  26 +++
 gnu/packages/patches/qtbase-use-TZDIR.patch   | 141 ------------
 .../qtdeclarative-disable-qmlcache.patch      |  27 ++-
 gnu/packages/qt.scm                           | 208 ++++++++++++------
 gnu/packages/radio.scm                        |   2 +-
 17 files changed, 316 insertions(+), 221 deletions(-)
 create mode 100644 gnu/packages/patches/qtbase-check-in-the-QML-folder-of-this-library-does-.patch
 create mode 100644 gnu/packages/patches/qtbase-find-tools-in-PATH.patch
 create mode 100644 gnu/packages/patches/qtbase-pass-to-qmlimportscanner-the-QML2_IMPORT_PATH.patch
 create mode 100644 gnu/packages/patches/qtbase-qmake-fix-includedir-in-generated-pkg-config.patch
 delete mode 100644 gnu/packages/patches/qtbase-use-TZDIR.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 1aa413ebbe..3741cb9cd5 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1951,10 +1951,13 @@ dist_patch_DATA =						\
   %D%/packages/patches/qemu-fix-agent-paths.patch 		\
   %D%/packages/patches/qrcodegen-cpp-make-install.patch		\
   %D%/packages/patches/qtbase-absolute-runpath.patch		\
+  %D%/packages/patches/qtbase-find-tools-in-PATH.patch		\
+  %D%/packages/patches/qtbase-pass-to-qmlimportscanner-the-QML2_IMPORT_PATH.patch \
+  %D%/packages/patches/qtbase-qmake-fix-includedir-in-generated-pkg-config.patch \
+  %D%/packages/patches/qtbase-check-in-the-QML-folder-of-this-library-does-.patch \
   %D%/packages/patches/qtbase-moc-ignore-gcc-macro.patch	\
   %D%/packages/patches/qtbase-qmake-use-libname.patch		\
   %D%/packages/patches/qtbase-5-use-TZDIR.patch			\
-  %D%/packages/patches/qtbase-use-TZDIR.patch			\
   %D%/packages/patches/qtscript-disable-tests.patch		\
   %D%/packages/patches/quagga-reproducible-build.patch          \
   %D%/packages/patches/quickswitch-fix-dmenu-check.patch	\
diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm
index 698f15678b..50d4b332ee 100644
--- a/gnu/packages/education.scm
+++ b/gnu/packages/education.scm
@@ -192,7 +192,7 @@ (define-public gcompris-qt
            qtgraphicaleffects
            qtmultimedia-5
            qtquickcontrols2-5
-           qtsensors
+           qtsensors-5
            qtsvg-5))
     (home-page "https://gcompris.net/index-en.html")
     (synopsis "Educational games for small children")
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 9ff08e5e74..fdc2d53a77 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -10475,7 +10475,7 @@ (define-public chessx
     (native-inputs
      (list qttools-5))
     (inputs
-     (list qtbase-5 qtmultimedia-5 qtspeech qtsvg-5 zlib))
+     (list qtbase-5 qtmultimedia-5 qtspeech-5 qtsvg-5 zlib))
     (arguments
      `(#:tests? #f
        #:phases
diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm
index 687effcace..63e66afdb8 100644
--- a/gnu/packages/geo.scm
+++ b/gnu/packages/geo.scm
@@ -2575,7 +2575,7 @@ (define-public openorienteering-mapper
            qtbase-5
            qtimageformats-5
            qtlocation
-           qtsensors
+           qtsensors-5
            zlib))
     (native-inputs
      (list doxygen
diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index 64e41b510d..227f9a28b1 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -3249,7 +3249,7 @@ (define-public ktextwidgets
            kwidgetsaddons
            kwindowsystem
            qtbase-5
-           qtspeech))
+           qtspeech-5))
     (home-page "https://community.kde.org/Frameworks")
     (synopsis "Text editing widgets")
     (description "KTextWidgets provides widgets for displaying and editing text.
diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm
index e95eac4e2f..9a1c0b8d8e 100644
--- a/gnu/packages/kde-pim.scm
+++ b/gnu/packages/kde-pim.scm
@@ -848,7 +848,7 @@ (define-public kdepim-runtime
            qtdeclarative-5
            qtkeychain
            qtnetworkauth-5
-           qtspeech
+           qtspeech-5
            qtwebchannel-5
            qtwebengine-5
            qtxmlpatterns))
@@ -1993,7 +1993,7 @@ (define-public kpimtextedit
            kwidgetsaddons
            kxmlgui
            qtbase-5
-           qtspeech
+           qtspeech-5
            sonnet))
     (arguments
      `(#:tests? #f)) ;; TODO - test suite hangs
diff --git a/gnu/packages/kde-plasma.scm b/gnu/packages/kde-plasma.scm
index cf45fa59f7..1d41d35a56 100644
--- a/gnu/packages/kde-plasma.scm
+++ b/gnu/packages/kde-plasma.scm
@@ -793,7 +793,7 @@ (define-public kscreen
                   libkscreen
                   libxi
                   plasma-wayland-protocols
-                  qtsensors
+                  qtsensors-5
                   qtbase-5
                   qtx11extras
                   xcb-util))
diff --git a/gnu/packages/kde-utils.scm b/gnu/packages/kde-utils.scm
index 4e665da599..6c6a669597 100644
--- a/gnu/packages/kde-utils.scm
+++ b/gnu/packages/kde-utils.scm
@@ -874,7 +874,7 @@ (define-public kmouth
            kxmlgui
            breeze-icons ;; default icon set
            qtbase-5
-           qtspeech))
+           qtspeech-5))
     (home-page "https://apps.kde.org/kmouth/")
     (synopsis "Type-and-say frontend for speech synthesizers")
     (description "KMouth is a program which enables persons that cannot speak
diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm
index 8e8bb32fda..385bb42926 100644
--- a/gnu/packages/kde.scm
+++ b/gnu/packages/kde.scm
@@ -1557,7 +1557,7 @@ (define-public okular
            kio
            kparts
            kpty
-           qtspeech
+           qtspeech-5
            kwallet
            kwindowsystem
            libkexiv2
diff --git a/gnu/packages/patches/qtbase-check-in-the-QML-folder-of-this-library-does-.patch b/gnu/packages/patches/qtbase-check-in-the-QML-folder-of-this-library-does-.patch
new file mode 100644
index 0000000000..ed749cb238
--- /dev/null
+++ b/gnu/packages/patches/qtbase-check-in-the-QML-folder-of-this-library-does-.patch
@@ -0,0 +1,35 @@
+From c00e310092d9aeb48adf21dd22f1ee4dbdbf5ebb Mon Sep 17 00:00:00 2001
+From: Nick Cao <nickcao <at> nichi.co>
+Date: Tue, 10 Oct 2023 10:17:00 -0400
+Subject: [PATCH 10/11] qtbase: check in the QML folder of this library does
+ actually exist
+
+In a modularized installation, this folder will be the location where
+`qtbase` itself is installed, but `qtbase` does not have any QML
+code, and `qmlimportscanner` will complain that it does not exist.
+---
+ src/tools/macdeployqt/shared/shared.cpp | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/src/tools/macdeployqt/shared/shared.cpp b/src/tools/macdeployqt/shared/shared.cpp
+index 320095a972d..87ba0d4e24b 100644
+--- a/src/tools/macdeployqt/shared/shared.cpp
++++ b/src/tools/macdeployqt/shared/shared.cpp
+@@ -1297,9 +1297,12 @@ bool deployQmlImports(const QString &appBundlePath, DeploymentInfo deploymentInf
+     }
+     for (const QString &importPath : qmlImportPaths)
+         argumentList << "-importPath" << importPath;
++
+     QString qmlImportsPath = QLibraryInfo::path(QLibraryInfo::QmlImportsPath);
+-    argumentList.append( "-importPath");
+-    argumentList.append(qmlImportsPath);
++    if (QFile::exists(qmlImportsPath)) {
++        argumentList.append( "-importPath");
++        argumentList.append(qmlImportsPath);
++    }
+ 
+     // In a modularized installation of qt as we have in Nix, instead, we will
+     // read the paths from the environment, as they are spread in multiple
+-- 
+2.42.0
+
diff --git a/gnu/packages/patches/qtbase-find-tools-in-PATH.patch b/gnu/packages/patches/qtbase-find-tools-in-PATH.patch
new file mode 100644
index 0000000000..1d60684e07
--- /dev/null
+++ b/gnu/packages/patches/qtbase-find-tools-in-PATH.patch
@@ -0,0 +1,45 @@
+From a8b9fae710a2bd5e743f5e16364eaa8c38dbd784 Mon Sep 17 00:00:00 2001
+From: rewine <luhongxu <at> deepin.org>
+Date: Wed, 29 Mar 2023 11:51:33 +0800
+Subject: [PATCH 06/11] qtbase-find-tools-in-PATH
+
+1. find qt's tools in `QTTOOLSPATH` env
+   qt assumes that all components use the same install prefix
+   we can't get the real prefix for qttools when build qtbase
+   we will add /libexec to `QTTOOLSPATH` in qtToolsHook
+   find_path will also search in 'PATH' by default
+   see `CMAKE_FIND_USE_SYSTEM_ENVIRONMENT_PATH`
+
+2. disable tool_dependencies_enabled
+   We can guarantee the build order of qt components in nixpkgs
+   tools in qttools always build before qtdoc
+   qdoc_bin is not a build target now, since we find it in `QTTOOLSPATH`
+---
+ cmake/QtDocsHelpers.cmake | 11 ++++++++---
+ 1 file changed, 8 insertions(+), 3 deletions(-)
+
+diff --git a/cmake/QtDocsHelpers.cmake b/cmake/QtDocsHelpers.cmake
+index 48ed5a324bf..91d8d41fb1f 100644
+--- a/cmake/QtDocsHelpers.cmake
++++ b/cmake/QtDocsHelpers.cmake
+@@ -47,9 +47,14 @@ function(qt_internal_add_docs)
+         set(doc_tools_libexec "${QT_BUILD_INTERNALS_RELOCATABLE_INSTALL_PREFIX}/${INSTALL_LIBEXECDIR}")
+     endif()
+ 
+-    set(qdoc_bin "${doc_tools_bin}/qdoc${CMAKE_EXECUTABLE_SUFFIX}")
+-    set(qtattributionsscanner_bin "${doc_tools_libexec}/qtattributionsscanner${CMAKE_EXECUTABLE_SUFFIX}")
+-    set(qhelpgenerator_bin "${doc_tools_libexec}/qhelpgenerator${CMAKE_EXECUTABLE_SUFFIX}")
++    set(tool_dependencies_enabled FALSE)
++
++    find_path(qdoc_path name qdoc PATHS ENV QTTOOLSPATH)
++    find_path(qtattributionsscanner_path name qtattributionsscanner PATHS ENV QTTOOLSPATH)
++    find_path(qhelpgenerator_path name qhelpgenerator PATHS ENV QTTOOLSPATH)
++    set(qdoc_bin "${qdoc_path}/qdoc${CMAKE_EXECUTABLE_SUFFIX}")
++    set(qtattributionsscanner_bin "${qtattributionsscanner_path}/qtattributionsscanner${CMAKE_EXECUTABLE_SUFFIX}")
++    set(qhelpgenerator_bin "${qhelpgenerator_path}/qhelpgenerator${CMAKE_EXECUTABLE_SUFFIX}")
+ 
+     get_target_property(target_type ${target} TYPE)
+     if (NOT target_type STREQUAL "INTERFACE_LIBRARY")
+-- 
+2.42.0
+
diff --git a/gnu/packages/patches/qtbase-pass-to-qmlimportscanner-the-QML2_IMPORT_PATH.patch b/gnu/packages/patches/qtbase-pass-to-qmlimportscanner-the-QML2_IMPORT_PATH.patch
new file mode 100644
index 0000000000..7bf2193bc2
--- /dev/null
+++ b/gnu/packages/patches/qtbase-pass-to-qmlimportscanner-the-QML2_IMPORT_PATH.patch
@@ -0,0 +1,30 @@
+From d7a9a3b0ecdbb1b5829f25954d763d767f1c8794 Mon Sep 17 00:00:00 2001
+From: Nick Cao <nickcao <at> nichi.co>
+Date: Tue, 10 Oct 2023 10:12:56 -0400
+Subject: [PATCH 07/11] qtbase: pass to qmlimportscanner the QML2_IMPORT_PATH
+
+---
+ src/tools/macdeployqt/shared/shared.cpp | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/src/tools/macdeployqt/shared/shared.cpp b/src/tools/macdeployqt/shared/shared.cpp
+index 2ae4f998944..ba10ae02bcd 100644
+--- a/src/tools/macdeployqt/shared/shared.cpp
++++ b/src/tools/macdeployqt/shared/shared.cpp
+@@ -1297,6 +1297,13 @@ bool deployQmlImports(const QString &appBundlePath, DeploymentInfo deploymentInf
+     argumentList.append( "-importPath");
+     argumentList.append(qmlImportsPath);
+ 
++    // In a modularized installation of qt as we have in Nix, instead, we will
++    // read the paths from the environment, as they are spread in multiple
++    // locations and normally set in the environment like this
++    auto envQmlImportPaths = ::qgetenv("QML2_IMPORT_PATH").split(':');
++    for (const QString &importPath : envQmlImportPaths)
++        argumentList << "-importPath" << importPath;
++
+     // run qmlimportscanner
+     QProcess qmlImportScanner;
+     qmlImportScanner.start(qmlImportScannerPath, argumentList);
+-- 
+2.42.0
+
diff --git a/gnu/packages/patches/qtbase-qmake-fix-includedir-in-generated-pkg-config.patch b/gnu/packages/patches/qtbase-qmake-fix-includedir-in-generated-pkg-config.patch
new file mode 100644
index 0000000000..53f226254a
--- /dev/null
+++ b/gnu/packages/patches/qtbase-qmake-fix-includedir-in-generated-pkg-config.patch
@@ -0,0 +1,26 @@
+From 6088085d3074316dd74639fc6c1233e5862aff11 Mon Sep 17 00:00:00 2001
+From: Nick Cao <nickcao <at> nichi.co>
+Date: Fri, 14 Apr 2023 09:34:46 +0800
+Subject: [PATCH 03/11] qtbase: qmake: fix includedir in generated pkg-config
+
+---
+ qmake/generators/makefile.cpp | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
+index 11d2f0ff7df..c78ed0d3485 100644
+--- a/qmake/generators/makefile.cpp
++++ b/qmake/generators/makefile.cpp
+@@ -3412,8 +3412,7 @@ MakefileGenerator::writePkgConfigFile()
+       << varGlue("QMAKE_PKGCONFIG_CFLAGS", "", " ", " ")
+         //      << varGlue("DEFINES","-D"," -D"," ")
+          ;
+-    if (!project->values("QMAKE_DEFAULT_INCDIRS").contains(includeDir))
+-        t << "-I${includedir}";
++    t << "-I${includedir}";
+     if (target_mode == TARG_MAC_MODE && project->isActiveConfig("lib_bundle")
+         && libDir != QLatin1String("/Library/Frameworks")) {
+             t << " -F${libdir}";
+-- 
+2.42.0
+
diff --git a/gnu/packages/patches/qtbase-use-TZDIR.patch b/gnu/packages/patches/qtbase-use-TZDIR.patch
deleted file mode 100644
index 98bf7493e9..0000000000
--- a/gnu/packages/patches/qtbase-use-TZDIR.patch
+++ /dev/null
@@ -1,141 +0,0 @@
-From 1075606f8b2f9e153c82f8e50cbd69cea9c72e87 Mon Sep 17 00:00:00 2001
-From: Edward Welbourne <edward.welbourne <at> qt.io>
-Date: Mon, 11 Sep 2023 11:41:39 +0200
-Subject: [PATCH] Support the TZDIR environment variable
-
-On Linux / glibc, this overrides the default system location for the
-zone info. So check for files there first. Break out a function to
-manage the trying of (now three) zoneinfo directories when opening a
-file by name relative to there.
-
-Pick-to: 6.6 6.5
-Task-number: QTBUG-116017
-Change-Id: I1f97107aabd9015c0a5543639870f1d70654ca67
----
-* Rebased on top of v6.5.2.
-
- src/corelib/time/qtimezoneprivate_tz.cpp | 73 ++++++++++++++++--------
- 1 file changed, 49 insertions(+), 24 deletions(-)
-
-diff --git a/src/corelib/time/qtimezoneprivate_tz.cpp b/src/corelib/time/qtimezoneprivate_tz.cpp
-index 067191d816..a8b2fc894e 100644
---- a/src/corelib/time/qtimezoneprivate_tz.cpp
-+++ b/src/corelib/time/qtimezoneprivate_tz.cpp
-@@ -51,17 +51,41 @@ typedef QHash<QByteArray, QTzTimeZone> QTzTimeZoneHash;
- 
- static bool isTzFile(const QString &name);
- 
-+// Open a named file under the zone info directory:
-+static bool openZoneInfo(QString name, QFile *file)
-+{
-+    // At least on Linux / glibc (see man 3 tzset), $TZDIR overrides the system
-+    // default location for zone info:
-+    const QString tzdir = qEnvironmentVariable("TZDIR");
-+    if (!tzdir.isEmpty()) {
-+        file->setFileName(QDir(tzdir).filePath(name));
-+        if (file->open(QIODevice::ReadOnly))
-+            return true;
-+    }
-+    // Try modern system path first:
-+    constexpr auto zoneShare = "/usr/share/zoneinfo/"_L1;
-+    if (tzdir != zoneShare && tzdir != zoneShare.chopped(1)) {
-+        file->setFileName(zoneShare + name);
-+        if (file->open(QIODevice::ReadOnly))
-+            return true;
-+    }
-+    // Fall back to legacy system path:
-+    constexpr auto zoneLib = "/usr/lib/zoneinfo/"_L1;
-+    if (tzdir != zoneLib && tzdir != zoneLib.chopped(1)) {
-+        file->setFileName(zoneShare + name);
-+        if (file->open(QIODevice::ReadOnly))
-+            return true;
-+    }
-+    return false;
-+}
-+
- // Parse zone.tab table for territory information, read directories to ensure we
- // find all installed zones (many are omitted from zone.tab; even more from
- // zone1970.tab).
- static QTzTimeZoneHash loadTzTimeZones()
- {
--    QString path = QStringLiteral("/usr/share/zoneinfo/zone.tab");
--    if (!QFile::exists(path))
--        path = QStringLiteral("/usr/lib/zoneinfo/zone.tab");
--
--    QFile tzif(path);
--    if (!tzif.open(QIODevice::ReadOnly))
-+    QFile tzif;
-+    if (!openZoneInfo("zone.tab"_L1, &tzif))
-         return QTzTimeZoneHash();
- 
-     QTzTimeZoneHash zonesHash;
-@@ -91,6 +115,7 @@ static QTzTimeZoneHash loadTzTimeZones()
-         }
-     }
- 
-+    const QString path = tzif.fileName();
-     const qsizetype cut = path.lastIndexOf(u'/');
-     Q_ASSERT(cut > 0);
-     const QDir zoneDir = QDir(path.first(cut));
-@@ -761,20 +786,13 @@ QTzTimeZoneCacheEntry QTzTimeZoneCache::findEntry(const QByteArray &ianaId)
-         tzif.setFileName(QStringLiteral("/etc/localtime"));
-         if (!tzif.open(QIODevice::ReadOnly))
-             return ret;
--    } else {
--        // Open named tz, try modern path first, if fails try legacy path
--        tzif.setFileName("/usr/share/zoneinfo/"_L1 + QString::fromLocal8Bit(ianaId));
--        if (!tzif.open(QIODevice::ReadOnly)) {
--            tzif.setFileName("/usr/lib/zoneinfo/"_L1 + QString::fromLocal8Bit(ianaId));
--            if (!tzif.open(QIODevice::ReadOnly)) {
--                // ianaId may be a POSIX rule, taken from $TZ or /etc/TZ
--                auto check = validatePosixRule(ianaId);
--                if (check.isValid) {
--                    ret.m_hasDst = check.hasDst;
--                    ret.m_posixRule = ianaId;
--                }
--                return ret;
--            }
-+    } else if (!openZoneInfo(QString::fromLocal8Bit(ianaId), &tzif)) {
-+        // ianaId may be a POSIX rule, taken from $TZ or /etc/TZ
-+        auto check = validatePosixRule(ianaId);
-+        if (check.isValid) {
-+            ret.m_hasDst = check.hasDst;
-+            ret.m_posixRule = ianaId;
-+            return ret;
-         }
-     }
- 
-@@ -1317,7 +1335,8 @@ private:
-     {
-         // On most distros /etc/localtime is a symlink to a real file so extract
-         // name from the path
--        const auto zoneinfo = "/zoneinfo/"_L1;
-+        const QString tzdir = qEnvironmentVariable("TZDIR");
-+        constexpr auto zoneinfo = "/zoneinfo/"_L1;
-         QString path = QStringLiteral("/etc/localtime");
-         long iteration = getSymloopMax();
-         // Symlink may point to another symlink etc. before being under zoneinfo/
-@@ -1325,9 +1344,15 @@ private:
-         // symlink, like America/Montreal pointing to America/Toronto
-         do {
-             path = QFile::symLinkTarget(path);
--            int index = path.indexOf(zoneinfo);
--            if (index >= 0) // Found zoneinfo file; extract zone name from path:
--                return QStringView{ path }.mid(index + zoneinfo.size()).toUtf8();
-+            // If it's a zoneinfo file, extract the zone name from its path:
-+            int index = tzdir.isEmpty() ? -1 : path.indexOf(tzdir);
-+            if (index >= 0) {
-+                const auto tail = QStringView{ path }.sliced(index + tzdir.size()).toUtf8();
-+                return tail.startsWith(u'/') ? tail.sliced(1) : tail;
-+            }
-+            index = path.indexOf(zoneinfo);
-+            if (index >= 0)
-+                return QStringView{ path }.sliced(index + zoneinfo.size()).toUtf8();
-         } while (!path.isEmpty() && --iteration > 0);
- 
-         return QByteArray();
-
-base-commit: af457a9f0f7eb1a2a7d11f495da508faab91a442
--- 
-2.41.0
-
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 <at> 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 9df49d7fb3..a4f6d34a42 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -67,6 +67,7 @@ (define-module (gnu packages qt)
   #:use-module (gnu packages bash)
   #:use-module (gnu packages base)
   #:use-module (gnu packages bison)
+  #:use-module (gnu packages crypto)
   #:use-module (gnu packages check)
   #:use-module (gnu packages cmake)
   #:use-module (gnu packages compression)
@@ -654,27 +655,28 @@ (define-public qtbase
   (package
     (inherit qtbase-5)
     (name "qtbase")
-    (version "6.5.2")
+    (version "6.6.2")
     (source (origin
               (inherit (package-source qtbase-5))
               (uri (qt-url name version))
               (sha256
                (base32
-                "0s8jwzdcv97dfy8n3jjm8zzvllv380l73mwdva7rs2nqnhlwgd1x"))
+                "0yv78bwqzy975854h53rbiilsms62f3v02i3jqz7v8ajk1ml56xq"))
               (modules '((guix build utils)))
               (snippet
                ;; corelib uses bundled harfbuzz, md4, md5, sha3
                '(with-directory-excursion "src/3rdparty"
                   (for-each delete-file-recursively
-                            ;; The bundled pcre2 copy is kept, as its headers
-                            ;; are required by some internal bootstrap target
-                            ;; used for the tools.
                             (list "double-conversion" "freetype" "harfbuzz-ng"
-                                  "libpng" "libjpeg" "sqlite" "xcb" "zlib"))))
-              (patches (search-patches "qtbase-use-TZDIR.patch"
-                                       "qtbase-moc-ignore-gcc-macro.patch"
+                                  "pcre2" "md4c" "libpng" "libjpeg"
+                                  "sqlite" "xcb" "zlib"))))
+              (patches (search-patches "qtbase-moc-ignore-gcc-macro.patch"
                                        "qtbase-absolute-runpath.patch"
-                                       "qtbase-qmake-use-libname.patch"))))
+                                       "qtbase-qmake-use-libname.patch"
+                                       "qtbase-find-tools-in-PATH.patch"
+                                       "qtbase-pass-to-qmlimportscanner-the-QML2_IMPORT_PATH.patch"
+                                       "qtbase-qmake-fix-includedir-in-generated-pkg-config.patch"
+                                       "qtbase-check-in-the-QML-folder-of-this-library-does-.patch"))))
     (build-system cmake-build-system)
     (arguments
      (substitute-keyword-arguments (package-arguments qtbase-5)
@@ -749,7 +751,8 @@ (define-public qtbase
                   (("\"xdg-open\"")
                    (format #f "~s" (search-input-file inputs "bin/xdg-open"))))
                 (substitute* '("mkspecs/features/qt_functions.prf"
-                               "qmake/library/qmakebuiltins.cpp")
+                               "qmake/library/qmakebuiltins.cpp"
+                               "tests/auto/tools/qt_cmake_create/tst_qt_cmake_create.cpp")
                   (("/bin/sh")
                    (search-input-file inputs "bin/bash")))
                 (substitute* "src/corelib/CMakeLists.txt"
@@ -814,6 +817,16 @@ (define-public qtbase
                     (string-join
                      (append
                       (list
+                       ;; with expansion:
+                       ;; false
+                       ;; with messages:
+                       ;; test := "keyboard"
+                       ;; arguments := QList("-o", "-,tap")
+                       ;; Detected locale "C" with character encoding "ANSI_X3.4-1968", which is not UTF-8.
+                       ;; Qt depends on a UTF-8 locale, but has failed to switch to one.
+                       ;; If this causes problems, reconfigure your locale. See the locale(1) manual
+                       ;; for more information.
+                       "tst_selftests"
                        ;; The 'tst_moc' test fails with "'fi.exists()' returned FALSE".
                        "tst_moc"
 
@@ -984,6 +997,7 @@ (define-public qtbase
                 bash-minimal
                 coreutils-minimal
                 md4c
+                libb2
                 libice
                 libsm
                 libxcb
@@ -1074,13 +1088,13 @@ (define-public qt3d-5
 (define-public qt5compat
   (package
     (name "qt5compat")
-    (version "6.5.2")
+    (version "6.6.2")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "1i4izabbmf1dayzlj1miz7hsm4cy0qb7i72pwyl2fp05w8pf9axr"))))
+                "0rqr34lqf4mjdgjj09wzlvkxfknz8arjl9p30xpqbr2qfsmhhyz0"))))
     (build-system cmake-build-system)
     (arguments
      (list
@@ -1172,13 +1186,13 @@ (define-public qtsvg-5
 (define-public qtsvg
   (package
     (name "qtsvg")
-    (version "6.5.2")
+    (version "6.6.2")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "18v337lfk8krg0hff5jx6fi7gn6x3djn03x3psrhlbmgjc8crd28"))))
+                "10c1dmbv5d39n1q4m67gf2h4n6wfkzrlyk8plnxbyhhvxxcis8ss"))))
     (build-system cmake-build-system)
     (arguments
      (list
@@ -1231,14 +1245,14 @@ (define-public qtimageformats-5
 (define-public qtimageformats
   (package
     (name "qtimageformats")
-    (version "6.5.2")
+    (version "6.6.2")
     (source (origin
               (inherit (package-source qtimageformats-5))
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "0hv7mkn72126rkhy5gmjmbvzy7v17mkk3q2pkmzy99f64j4w1q5a"))))
+                "1cvwm0hnspglydms6qhcp5g0ayz5pamigl52kz8km66l6s8lqn3i"))))
     (build-system cmake-build-system)
     (arguments
      (list
@@ -1406,14 +1420,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)
@@ -1483,6 +1497,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"
@@ -1599,13 +1615,13 @@ (define-public qtwebsockets-5
 (define-public qtwebsockets
   (package
     (name "qtwebsockets")
-    (version "6.5.2")
+    (version "6.6.2")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "0xjwifxj2ssshys6f6kjr6ri2vq1wfshxky6mcscjm7vvyqdfjr0"))))
+                "1y9q8jmspxbfxf07jdcg4n8zwmchccyzp0z68fxr0hnvr2dymrn0"))))
     (build-system cmake-build-system)
     (arguments
      (list
@@ -1636,6 +1652,25 @@ (define-public qtwebsockets
     (license (package-license qtbase))))
 
 (define-public qtsensors
+  (package
+    (inherit qtsvg)
+    (name "qtsensors")
+    (version "6.6.2")
+    (source (origin
+              (method url-fetch)
+              (uri (qt-url name version))
+              (sha256
+               (base32
+                "0a3w50bfnmxndyxnn9lsy1wxffhm2am0yjxqx3vx0gfjwv79yvsa"))))
+    (native-inputs
+     (list qtdeclarative))
+    (inputs (list qtbase))
+    (synopsis "Qt Sensors module")
+    (description "The Qt Sensors API provides access to sensor hardware via QML
+and C++ interfaces.  The Qt Sensors API also provides a motion gesture
+recognition API for devices.")))
+
+(define-public qtsensors-5
   (package
     (inherit qtsvg-5)
     (name "qtsensors")
@@ -1715,7 +1750,7 @@ (define-public qtmultimedia-5
 (define-public qtshadertools
   (package
     (name "qtshadertools")
-    (version "6.5.2")
+    (version "6.6.2")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
@@ -1723,7 +1758,7 @@ (define-public qtshadertools
               ;; sources.
               (sha256
                (base32
-                "0g8aziqhds2fkx11y4p2akmyn2p1qqf2fjxv72f9pibnhpdv0gya"))))
+                "0bxrczs9nw6az2p4n8x0f660vsmxxynx4iqgj75l4zsfzzbym2v2"))))
     (build-system cmake-build-system)
     (arguments
      (list
@@ -1744,13 +1779,13 @@ (define-public qtshadertools
 (define-public qtmultimedia
   (package
     (name "qtmultimedia")
-    (version "6.5.2")
+    (version "6.6.2")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "0xc9k4mlncscxqbp8q46yjd89k4jb8j0ggbi5ad874lycym013wl"))
+                "1v0430jnv97ws6cizn9mi8zr9hcg7rixd0jg7smhdq8apacjb572"))
               (modules '((guix build utils)))
               (snippet
                '(begin
@@ -1775,7 +1810,10 @@ (define-public qtmultimedia
               ;; session bus, which requires an X11 server, and then is still
               ;; unhappy).
               (substitute* "tests/auto/CMakeLists.txt"
-                (("add_subdirectory\\(integration)") ""))))
+                (("add_subdirectory\\(integration)") ""))
+              ;; fail on offscreen rendering
+              (substitute* "tests/auto/unit/multimedia/CMakeLists.txt"
+                (("add_subdirectory\\(qvideoframecolormanagement\\)") ""))))
           (add-before 'check 'prepare-for-tests
             (lambda _
               (setenv "QT_QPA_PLATFORM" "offscreen")))
@@ -1865,13 +1903,13 @@ (define-public qtwayland-5
 (define-public qtwayland
   (package
     (name "qtwayland")
-    (version "6.5.2")
+    (version "6.6.2")
     (source
      (origin
        (method url-fetch)
        (uri (qt-url name version))
        (sha256
-        (base32 "16iwar19sgjvxgmbr6hmd3hsxp6ahdjwl1lra2wapl3zzf3bw81h"))))
+        (base32 "0y6x84ckcc53ddclnrlzs08b1kvw6saw9nim0hz4wc5fyz7dbkcv"))))
     (build-system cmake-build-system)
     (arguments
      (list #:configure-flags #~(list "-DQT_BUILD_TESTS=ON")
@@ -1888,6 +1926,7 @@ (define-public qtwayland
                      (("QTRY_COMPARE\\(bufferSpy\\.size\\(\\), 1\\);") ""))))
                (add-before 'check 'set-test-environment
                  (lambda _
+                   (setenv "XDG_RUNTIME_DIR" (getcwd))
                    ;; Do not fail just because /etc/machine-id is missing.
                    (setenv "DBUS_FATAL_WARNINGS" "0")
                    ;; Make Qt render "offscreen", required for tests.
@@ -1996,13 +2035,13 @@ (define-public qtwebchannel-5
 (define-public qtwebchannel
   (package
     (name "qtwebchannel")
-    (version "6.5.2")
+    (version "6.6.2")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "0qwfnwva7v5f2g5is17yy66mnmc9c1yf9aagaw5qanskdvxdk261"))))
+                "1incvisc3j758b4k82vnwci8j1bba8zf6xgmgcrsm553k4wpsz1x"))))
     (build-system cmake-build-system)
     (arguments
      (list
@@ -2080,13 +2119,13 @@ (define-public qtwebview
 (define-public qtlanguageserver
   (package
     (name "qtlanguageserver")
-    (version "6.5.2")
+    (version "6.6.2")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "196iicwpqca2ydpca41qs6aqxxq8ycknw6lm2v00h1w3m86frdbk"))))
+                "1bgazi44mwac20biybhp21icgwa8k7jd295j8jsfgzxbw12lq7y3"))))
     (build-system cmake-build-system)
     (arguments
      (list #:phases #~(modify-phases %standard-phases
@@ -2129,13 +2168,13 @@ (define-public qtlocation
 (define-public qtlottie
   (package
     (name "qtlottie")
-    (version "6.5.2")
+    (version "6.6.2")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "16z8fhaa40ig0cggb689zf8j3cid6fk6pmh91b8342ymy1fdqfh0"))))
+                "1hqhp55jfasavk7p8xb0srbc6lnk70w2q0x4iwn28z5s5kd1cvi7"))))
     (build-system cmake-build-system)
     (arguments
      (list
@@ -2193,13 +2232,13 @@ (define-public qttools-5
 (define-public qttools
   (package
     (name "qttools")
-    (version "6.5.2")
+    (version "6.6.2")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "0ha3v488vnm4pgdpyjgf859sak0z2fwmbgcyivcd93qxflign7sm"))))
+                "0ij7djy06xi4v5v29fh31gqq5rnc12vviv3qg3vqf4hiaagrxm76"))))
     (build-system cmake-build-system)
     (arguments
      (list
@@ -2220,7 +2259,7 @@ (define-public qttools
     (native-inputs (list perl qtdeclarative vulkan-headers))
     ;; Use clang-15, which is built using as a single shared library, which is
     ;; what the build system of qttools expects.
-    (inputs (list clang-15 libxkbcommon mesa qtbase))
+    (inputs (list clang-15 libxkbcommon mesa qtbase `(,zstd "lib")))
     (home-page (package-home-page qtbase))
     (synopsis "Qt Tools and Designer modules")
     (description "The Qt Tools module provides a set of applications to browse
@@ -2233,13 +2272,13 @@ (define-public qttools
 (define-public qttranslations
   (package
     (name "qttranslations")
-    (version "6.5.2")
+    (version "6.6.2")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "1sxy2ljn5ajvn4yjb8fx86l56viyvqh5r9hf5x67azkmgrilaz1k"))))
+                "0xqcad8aa9lp6wzh1rs46id6r60zdw82qj3bq9k2b89sxy8c0fna"))))
     (build-system cmake-build-system)
     (arguments (list #:tests? #f))
     (native-inputs (list qtbase qttools))
@@ -2391,13 +2430,13 @@ (define-public qtscxml
 (define-public qtpositioning
   (package
     (name "qtpositioning")
-    (version "6.5.2")
+    (version "6.6.2")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "1yhlfs8izc054qv1krf5qv6zzjlvmz013h74fwamn74dfh1kyjbh"))))
+                "1qn31vps9dj4g8m7d195qlsyj3p4dfqqszdc6yqq097dq5y5d9sd"))))
     (build-system cmake-build-system)
     (arguments
      (list
@@ -2504,13 +2543,13 @@ (define-public qtnetworkauth-5
 (define-public qtnetworkauth
   (package
     (name "qtnetworkauth")
-    (version "6.5.2")
+    (version "6.6.2")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "0g18kh3zhcfi9ni8cqbbjdc1l6jf99ijv5shcl42jk6219b4pk2f"))))
+                "1lijsdwbj8gscfllmp358n5ysa8pvhx2msh7gpxvb4x81daxbg9j"))))
     (build-system cmake-build-system)
     (arguments (list #:configure-flags #~(list "-DQT_BUILD_TESTS=ON")))
     (native-inputs (list perl))
@@ -2524,13 +2563,13 @@ (define-public qtnetworkauth
 (define-public qtremoteobjects
   (package
     (name "qtremoteobjects")
-    (version "6.5.2")
+    (version "6.6.2")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "0k29sk02n54vj1w6vh6xycsjpyfqlijc13fnxh1q7wpgg4gizx60"))))
+                "0fbkjzykxpkz8myr6dy588gcmhyy3lar17v78zfam8kyxq7s5qxa"))))
     (build-system cmake-build-system)
     (arguments
      (list
@@ -2558,7 +2597,7 @@ (define-public qtremoteobjects
     (home-page (package-home-page qtbase))
     (license (package-license qtbase))))
 
-(define-public qtspeech
+(define-public qtspeech-5
   (package
     (inherit qtsvg-5)
     (name "qtspeech")
@@ -2583,6 +2622,38 @@ (define-public qtspeech
 In such a scenario, the messaging application can read out the incoming
 message.")))
 
+(define-public qtspeech
+  (package
+    (inherit qtspeech-5)
+    (name "qtspeech")
+    (version "6.6.2")
+    (source (origin
+              (method url-fetch)
+              (uri (qt-url name version))
+              (sha256
+               (base32
+                "1qvf3p2p1pc5fw40d8zq0iawaaqkc0dp5yx85b1dnw1j809bn8y0"))))
+    (build-system qt-build-system)
+    (arguments
+     (list #:phases
+           #~(modify-phases %standard-phases
+               (delete 'check)               ;move after the install phase
+               (add-after 'install 'check
+                 (assoc-ref %standard-phases 'check))
+               (add-before 'check 'prepare-for-tests
+                 (lambda* (#:key outputs #:allow-other-keys)
+                   (setenv "QML2_IMPORT_PATH"
+                           (string-append (assoc-ref outputs "out")
+                                          "/lib/qt6/qml:"
+                                          (getenv "QML2_IMPORT_PATH")))))
+               (add-after 'install 'delete-installed-tests
+                 (lambda _
+                   (delete-file-recursively
+                    (string-append #$output "/tests")))))))
+    (native-inputs '())
+    (propagated-inputs (list qtmultimedia))
+    (inputs (list qtbase qtdeclarative))))
+
 (define-public qtvirtualkeyboard-5
   (package
     (inherit qtsvg-5)
@@ -3042,14 +3113,14 @@ (define-public qtwebengine-5
 (define-public qtwebengine
   (package
     (name "qtwebengine")
-    (version "6.5.3")
+    (version "6.6.2")
     (source
      (origin
        (method url-fetch)
        (uri (qt-url name version))
        (sha256
         (base32
-         "1ra5hyyg4vymp8pgzv08smjc3fl1axdavnkpj1i5zxym1ndww513"))
+         "15h3hniszfkxv2vnn3fnbgbar8wb41ypgn4b4iz4iy6csar8f7fn"))
        (modules '((ice-9 ftw)
                   (ice-9 match)
                   (srfi srfi-1)
@@ -3081,12 +3152,11 @@ (define-public qtwebengine
                     "net/third_party/uri_template"
                     "third_party/abseil-cpp"
                     "third_party/angle"
-                    "third_party/angle/src/common/third_party/base"
-                    "third_party/angle/src/common/third_party/smhasher"
                     "third_party/angle/src/common/third_party/xxhash"
                     "third_party/angle/src/third_party/libXNVCtrl" ;Expat
-                    "third_party/angle/src/third_party/trace_event"
                     "third_party/angle/src/third_party/volk"
+                    "third_party/angle/src/third_party/systeminfo"
+                    "third_party/angle/src/third_party/ceval"
                     "third_party/axe-core"
                     "third_party/blink"
                     "third_party/boringssl"
@@ -3118,8 +3188,6 @@ (define-public qtwebengine
                     "third_party/dawn/third_party/khronos"
                     "third_party/devtools-frontend"
                     "third_party/devtools-frontend/src/front_end/third_party/i18n"
-                    "third_party/devtools-frontend/src/front_end/third_party/acorn"
-                    "third_party/devtools-frontend/src/front_end/third_party/acorn-loose"
                     "third_party/devtools-frontend/src/front_end/third_party/\
 additional_readme_paths.json"
                     "third_party/devtools-frontend/src/front_end/third_party/axe-core"
@@ -3130,11 +3198,17 @@ (define-public qtwebengine
                     "third_party/devtools-frontend/src/front_end/third_party/i18n"
                     "third_party/devtools-frontend/src/front_end/third_party/intl-messageformat"
                     "third_party/devtools-frontend/src/front_end/third_party/lighthouse"
-                    "third_party/devtools-frontend/src/front_end/third_party/lit-html"
+                    "third_party/devtools-frontend/src/front_end/third_party/lit"
+                    "third_party/devtools-frontend/src/front_end/third_party/acorn"
                     "third_party/devtools-frontend/src/front_end/third_party/marked"
                     "third_party/devtools-frontend/src/front_end/third_party/puppeteer"
+                    "third_party/devtools-frontend/src/front_end/third_party/\
+puppeteer/package/lib/esm/third_party/mitt"
+                    "third_party/devtools-frontend/src/front_end/third_party/vscode.web-custom-data"
+                    "third_party/devtools-frontend/src/third_party/pyjson5"
                     "third_party/devtools-frontend/src/front_end/third_party/wasmparser"
                     "third_party/devtools-frontend/src/third_party/typescript"
+                    "third_party/devtools-frontend/src/third_party/i18n"
                     "third_party/distributed_point_functions"
                     "third_party/dom_distiller_js"
                     "third_party/emoji-segmenter"
@@ -3177,7 +3251,6 @@ (define-public qtwebengine
                     "third_party/libgav1"
                     "third_party/libjingle_xmpp"
                     "third_party/libjpeg_turbo"
-                    "third_party/libjxl"
                     "third_party/libpng" ;TODO: make pdfium use system version
                     "third_party/libsecret" ;LGPL2.1+
                     "third_party/libsrtp"
@@ -3196,6 +3269,7 @@ (define-public qtwebengine
                     "third_party/lss"
                     "third_party/mako"
                     "third_party/markupsafe"
+                    "third_party/material_color_utilities" ;ASL2.0
                     "third_party/mesa_headers"
                     "third_party/metrics_proto"
                     "third_party/minigbm" ;BSD-3
@@ -3215,6 +3289,7 @@ (define-public qtwebengine
                     "third_party/opus/src/include/opus_multistream.h"
                     "third_party/opus/src/include/opus_types.h"
                     "third_party/ots"
+                    "third_party/flac"
                     "third_party/pdfium"
                     "third_party/pdfium/third_party/agg23"
                     "third_party/pdfium/third_party/base"
@@ -3222,7 +3297,6 @@ (define-public qtwebengine
                     "third_party/pdfium/third_party/freetype"
                     "third_party/pdfium/third_party/lcms"
                     "third_party/pdfium/third_party/libopenjpeg"
-                    "third_party/pdfium/third_party/libpng16"
                     "third_party/pdfium/third_party/libtiff"
                     "third_party/pdfium/third_party/skia_shared"
                     "third_party/pdfium/third_party/freetype/include/pstables.h" ;FreeType
@@ -3292,6 +3366,7 @@ (define-public qtwebengine
                     "v8/src/third_party/utf8-decoder"
                     "v8/src/third_party/valgrind"
                     "v8/third_party/inspector_protocol"
+                    "v8/third_party/glibc/src/sysdeps/ieee754/dbl-64"
                     "v8/third_party/v8/builtins")))
 
              (with-directory-excursion "src/3rdparty"
@@ -3359,14 +3434,17 @@ (define-public qtwebengine
               "-DQT_FEATURE_webengine_system_libjpeg=ON"
               "-DQT_FEATURE_webengine_system_libpci=ON"
               "-DQT_FEATURE_webengine_system_libpng=ON"
+              "-DQT_FEATURE_webengine_system_libtiff=ON"
               "-DQT_FEATURE_webengine_system_libwebp=ON"
               "-DQT_FEATURE_webengine_system_libxml=ON"
-              "-DQT_FEATURE_webengine_system_libxslt=ON"
               "-DQT_FEATURE_webengine_system_minizip=ON"
               "-DQT_FEATURE_webengine_system_opus=ON"
               "-DQT_FEATURE_webengine_system_pulseaudio=ON"
               "-DQT_FEATURE_webengine_system_re2=ON"
-              "-DQT_FEATURE_webengine_system_zlib=ON")
+              "-DQT_FEATURE_webengine_system_zlib=ON"
+              "-DQT_FEATURE_webengine_system_glib=ON"
+              "-DQT_FEATURE_webengine_system_libvpx=ON"
+              "-DQT_FEATURE_webengine_system_snappy=ON")
       #:phases
       #~(modify-phases %standard-phases
           (add-after 'unpack 'patch-paths
@@ -3416,7 +3494,11 @@ (define-public qtwebengine
                          '()))))
           (replace 'install
             (lambda _
-              (invoke "cmake" "--install" "."))))))
+              (invoke "cmake" "--install" ".")))
+          (add-after 'install 'delete-installed-tests
+                 (lambda _
+                   (delete-file-recursively
+                    (string-append #$output "/tests")))))))
     (native-inputs
      (modify-inputs (package-native-inputs qtwebengine-5)
        (delete "python2" "python2-six")
@@ -3684,7 +3766,7 @@ (define-public python-pyqt
        ("qtdeclarative-5" ,qtdeclarative-5)
        ("qtlocation" ,qtlocation)
        ("qtmultimedia-5" ,qtmultimedia-5)
-       ("qtsensors" ,qtsensors)
+       ("qtsensors" ,qtsensors-5)
        ("qtserialport" ,qtserialport)
        ("qtsvg-5" ,qtsvg-5)
        ("qttools-5" ,qttools-5)
@@ -4498,8 +4580,8 @@ (define-public python-pyside-2
            qtquickcontrols2-5
            qtscript
            qtscxml
-           qtsensors
-           qtspeech
+           qtsensors-5
+           qtspeech-5
            qtsvg-5
            qttools-5
            qtwebchannel-5
@@ -5086,7 +5168,7 @@ (define-public clazy
 (define-public qt-creator
   (package
     (name "qt-creator")
-    (version "12.0.1")
+    (version "12.0.2")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -5109,7 +5191,7 @@ (define-public qt-creator
                             ((".*marketplace/marketplace.qbs.*") ""))))
               (sha256
                (base32
-                "04h35za3gliai5djxwmzqrbih2g26lcv68pp4wvljkdwkcjsscvb"))))
+                "1lgk547pvg31zzqra7gn9gsszm5wrwxiw06crbr5n2kqfavk9r22"))))
     (build-system qt-build-system)
     (arguments
      (list
diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm
index 9c8225d22b..938b786ae2 100644
--- a/gnu/packages/radio.scm
+++ b/gnu/packages/radio.scm
@@ -2671,7 +2671,7 @@ (define-public sdrangel
            qtmultimedia-5
            qtquickcontrols2-5
            qtserialport
-           qtspeech
+           qtspeech-5
            qtwebchannel-5
            qtwebengine-5
            qtwebsockets-5

base-commit: b0b988c41c9e0e591274495a1b2d6f27fcdae15a
-- 
2.41.0

Message #80 received at 69628 <at> debbugs.gnu.org (full text, mbox):

From: Zheng Junjie <zhengjunjie <at> iscas.ac.cn>
To: 69628 <at> debbugs.gnu.org
Subject: [PATCH v3] gnu: qt: Update to 6.6.2.
Date: Mon, 11 Mar 2024 18:52:30 +0800

* gnu/packages/qt.scm (qtbase, qtsvg, qtshadertools, qtnetworkauth,
qtimageformats, qtlanguageserver, qtpositioning, qtdeclarative, qttools,
qt5compat, qtlottie, qtwebsockets, qttranslations, qtwebchannel, qtwayland,
qtremoteobjects, qtmultimedia, qtspeech, qtsensors, qtwebengine): Update to 6.6.2.
(qt-creator): Update to 12.0.2.
(qtbase)[source]: unbundle pcre2, md4c, remove qtbase-use-TZDIR.patch. Add
qtbase-find-tools-in-PATH.patch,
qtbase-pass-to-qmlimportscanner-the-QML2_IMPORT_PATH.patch,
qtbase-qmake-fix-includedir-in-generated-pkg-config.patch,
qtbase-check-in-the-QML-folder-of-this-library-does-.patch.
(qtbase)[arguments]<#:phase>: adjust 'patch-more-paths phase, skip tst_selftests test.
(qtbase)[inputs]: add libb2.
(qttools)[inputs]: add zstd:lib.
(qtwayland)[arguments]<#:phases>: Adjust set-test-environment phase.
(qtmultimedia)[arguments]<#:phases>: adjust 'disable-integration-tests phase.
(qtwebengine)[source]: Adjust snippet.
[arguments]<#:configure-flags>: Adjust it.
<#:phases>: Add delete-installed-tests phase.

* gnu/packages/patches/qtbase-use-TZDIR.patch: remove this.
* gnu/packages/patches/qtbase-find-tools-in-PATH.patch: New file
* gnu/packages/patches/qtbase-pass-to-qmlimportscanner-the-QML2_IMPORT_PATH.patch: New file
* gnu/packages/patches/qtbase-qmake-fix-includedir-in-generated-pkg-config.patch: New file
* gnu/packages/patches/qtbase-check-in-the-QML-folder-of-this-library-does-.patch: New file
* gnu/packages/patches/qtdeclarative-disable-qmlcache.patch: adjust it.

* gnu/local.mk(dist_patch_DATA): remove qtbase-use-TZDIR.patch.
Regist qtbase-find-tools-in-PATH.patch,
qtbase-pass-to-qmlimportscanner-the-QML2_IMPORT_PATH.patch,
qtbase-qmake-fix-includedir-in-generated-pkg-config.patch,
qtbase-check-in-the-QML-folder-of-this-library-does-.patch.

gnu: Add qtspeech-5.
* gnu/packages/qt.scm(qtspeech-5): New Variable.
(python-pyside-2):
* gnu/packages/games.scm (chessx):
* gnu/packages/kde-frameworks.scm(ktextwidgets):
* gnu/packages/kde-pim.scm(kdepim-runtime,kpimtextedit):
* gnu/packages/kde-utils.scm(kmouth):
* gnu/packages/kde.scm(okular):
* gnu/packages/radio.scm(sdrangel):
Adjust inputs.

gnu: Add qtsensors-5.
* gnu/packages/qt.scm(qtspeech-5): New Variable.
(python-pyqt,python-pyside-2):
* gnu/packages/education.scm(gcompris-qt):
* gnu/packages/kde-plasma.scm(kscreen):
* gnu/packages/geo.scm(openorienteering-mapper):
Adjust inputs.

Change-Id: Ibb30850de615c85dca2cc4d6fd55b18a228e0fc9
---
 gnu/local.mk                                  |   5 +-
 gnu/packages/education.scm                    |   2 +-
 gnu/packages/games.scm                        |   2 +-
 gnu/packages/geo.scm                          |   2 +-
 gnu/packages/kde-frameworks.scm               |   2 +-
 gnu/packages/kde-pim.scm                      |   4 +-
 gnu/packages/kde-plasma.scm                   |   2 +-
 gnu/packages/kde-utils.scm                    |   2 +-
 gnu/packages/kde.scm                          |   2 +-
 ...the-QML-folder-of-this-library-does-.patch |  35 +++
 .../patches/qtbase-find-tools-in-PATH.patch   |  45 ++++
 ...mlimportscanner-the-QML2_IMPORT_PATH.patch |  30 +++
 ...x-includedir-in-generated-pkg-config.patch |  26 +++
 gnu/packages/patches/qtbase-use-TZDIR.patch   | 141 ------------
 .../qtdeclarative-disable-qmlcache.patch      |  27 ++-
 gnu/packages/qt.scm                           | 210 ++++++++++++------
 gnu/packages/radio.scm                        |   2 +-
 17 files changed, 317 insertions(+), 222 deletions(-)
 create mode 100644 gnu/packages/patches/qtbase-check-in-the-QML-folder-of-this-library-does-.patch
 create mode 100644 gnu/packages/patches/qtbase-find-tools-in-PATH.patch
 create mode 100644 gnu/packages/patches/qtbase-pass-to-qmlimportscanner-the-QML2_IMPORT_PATH.patch
 create mode 100644 gnu/packages/patches/qtbase-qmake-fix-includedir-in-generated-pkg-config.patch
 delete mode 100644 gnu/packages/patches/qtbase-use-TZDIR.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 1aa413ebbe..3741cb9cd5 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1951,10 +1951,13 @@ dist_patch_DATA =						\
   %D%/packages/patches/qemu-fix-agent-paths.patch 		\
   %D%/packages/patches/qrcodegen-cpp-make-install.patch		\
   %D%/packages/patches/qtbase-absolute-runpath.patch		\
+  %D%/packages/patches/qtbase-find-tools-in-PATH.patch		\
+  %D%/packages/patches/qtbase-pass-to-qmlimportscanner-the-QML2_IMPORT_PATH.patch \
+  %D%/packages/patches/qtbase-qmake-fix-includedir-in-generated-pkg-config.patch \
+  %D%/packages/patches/qtbase-check-in-the-QML-folder-of-this-library-does-.patch \
   %D%/packages/patches/qtbase-moc-ignore-gcc-macro.patch	\
   %D%/packages/patches/qtbase-qmake-use-libname.patch		\
   %D%/packages/patches/qtbase-5-use-TZDIR.patch			\
-  %D%/packages/patches/qtbase-use-TZDIR.patch			\
   %D%/packages/patches/qtscript-disable-tests.patch		\
   %D%/packages/patches/quagga-reproducible-build.patch          \
   %D%/packages/patches/quickswitch-fix-dmenu-check.patch	\
diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm
index 698f15678b..50d4b332ee 100644
--- a/gnu/packages/education.scm
+++ b/gnu/packages/education.scm
@@ -192,7 +192,7 @@ (define-public gcompris-qt
            qtgraphicaleffects
            qtmultimedia-5
            qtquickcontrols2-5
-           qtsensors
+           qtsensors-5
            qtsvg-5))
     (home-page "https://gcompris.net/index-en.html")
     (synopsis "Educational games for small children")
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 9ff08e5e74..fdc2d53a77 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -10475,7 +10475,7 @@ (define-public chessx
     (native-inputs
      (list qttools-5))
     (inputs
-     (list qtbase-5 qtmultimedia-5 qtspeech qtsvg-5 zlib))
+     (list qtbase-5 qtmultimedia-5 qtspeech-5 qtsvg-5 zlib))
     (arguments
      `(#:tests? #f
        #:phases
diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm
index 687effcace..63e66afdb8 100644
--- a/gnu/packages/geo.scm
+++ b/gnu/packages/geo.scm
@@ -2575,7 +2575,7 @@ (define-public openorienteering-mapper
            qtbase-5
            qtimageformats-5
            qtlocation
-           qtsensors
+           qtsensors-5
            zlib))
     (native-inputs
      (list doxygen
diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index 64e41b510d..227f9a28b1 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -3249,7 +3249,7 @@ (define-public ktextwidgets
            kwidgetsaddons
            kwindowsystem
            qtbase-5
-           qtspeech))
+           qtspeech-5))
     (home-page "https://community.kde.org/Frameworks")
     (synopsis "Text editing widgets")
     (description "KTextWidgets provides widgets for displaying and editing text.
diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm
index e95eac4e2f..9a1c0b8d8e 100644
--- a/gnu/packages/kde-pim.scm
+++ b/gnu/packages/kde-pim.scm
@@ -848,7 +848,7 @@ (define-public kdepim-runtime
            qtdeclarative-5
            qtkeychain
            qtnetworkauth-5
-           qtspeech
+           qtspeech-5
            qtwebchannel-5
            qtwebengine-5
            qtxmlpatterns))
@@ -1993,7 +1993,7 @@ (define-public kpimtextedit
            kwidgetsaddons
            kxmlgui
            qtbase-5
-           qtspeech
+           qtspeech-5
            sonnet))
     (arguments
      `(#:tests? #f)) ;; TODO - test suite hangs
diff --git a/gnu/packages/kde-plasma.scm b/gnu/packages/kde-plasma.scm
index cf45fa59f7..1d41d35a56 100644
--- a/gnu/packages/kde-plasma.scm
+++ b/gnu/packages/kde-plasma.scm
@@ -793,7 +793,7 @@ (define-public kscreen
                   libkscreen
                   libxi
                   plasma-wayland-protocols
-                  qtsensors
+                  qtsensors-5
                   qtbase-5
                   qtx11extras
                   xcb-util))
diff --git a/gnu/packages/kde-utils.scm b/gnu/packages/kde-utils.scm
index 4e665da599..6c6a669597 100644
--- a/gnu/packages/kde-utils.scm
+++ b/gnu/packages/kde-utils.scm
@@ -874,7 +874,7 @@ (define-public kmouth
            kxmlgui
            breeze-icons ;; default icon set
            qtbase-5
-           qtspeech))
+           qtspeech-5))
     (home-page "https://apps.kde.org/kmouth/")
     (synopsis "Type-and-say frontend for speech synthesizers")
     (description "KMouth is a program which enables persons that cannot speak
diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm
index 8e8bb32fda..385bb42926 100644
--- a/gnu/packages/kde.scm
+++ b/gnu/packages/kde.scm
@@ -1557,7 +1557,7 @@ (define-public okular
            kio
            kparts
            kpty
-           qtspeech
+           qtspeech-5
            kwallet
            kwindowsystem
            libkexiv2
diff --git a/gnu/packages/patches/qtbase-check-in-the-QML-folder-of-this-library-does-.patch b/gnu/packages/patches/qtbase-check-in-the-QML-folder-of-this-library-does-.patch
new file mode 100644
index 0000000000..ed749cb238
--- /dev/null
+++ b/gnu/packages/patches/qtbase-check-in-the-QML-folder-of-this-library-does-.patch
@@ -0,0 +1,35 @@
+From c00e310092d9aeb48adf21dd22f1ee4dbdbf5ebb Mon Sep 17 00:00:00 2001
+From: Nick Cao <nickcao <at> nichi.co>
+Date: Tue, 10 Oct 2023 10:17:00 -0400
+Subject: [PATCH 10/11] qtbase: check in the QML folder of this library does
+ actually exist
+
+In a modularized installation, this folder will be the location where
+`qtbase` itself is installed, but `qtbase` does not have any QML
+code, and `qmlimportscanner` will complain that it does not exist.
+---
+ src/tools/macdeployqt/shared/shared.cpp | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/src/tools/macdeployqt/shared/shared.cpp b/src/tools/macdeployqt/shared/shared.cpp
+index 320095a972d..87ba0d4e24b 100644
+--- a/src/tools/macdeployqt/shared/shared.cpp
++++ b/src/tools/macdeployqt/shared/shared.cpp
+@@ -1297,9 +1297,12 @@ bool deployQmlImports(const QString &appBundlePath, DeploymentInfo deploymentInf
+     }
+     for (const QString &importPath : qmlImportPaths)
+         argumentList << "-importPath" << importPath;
++
+     QString qmlImportsPath = QLibraryInfo::path(QLibraryInfo::QmlImportsPath);
+-    argumentList.append( "-importPath");
+-    argumentList.append(qmlImportsPath);
++    if (QFile::exists(qmlImportsPath)) {
++        argumentList.append( "-importPath");
++        argumentList.append(qmlImportsPath);
++    }
+ 
+     // In a modularized installation of qt as we have in Nix, instead, we will
+     // read the paths from the environment, as they are spread in multiple
+-- 
+2.42.0
+
diff --git a/gnu/packages/patches/qtbase-find-tools-in-PATH.patch b/gnu/packages/patches/qtbase-find-tools-in-PATH.patch
new file mode 100644
index 0000000000..1d60684e07
--- /dev/null
+++ b/gnu/packages/patches/qtbase-find-tools-in-PATH.patch
@@ -0,0 +1,45 @@
+From a8b9fae710a2bd5e743f5e16364eaa8c38dbd784 Mon Sep 17 00:00:00 2001
+From: rewine <luhongxu <at> deepin.org>
+Date: Wed, 29 Mar 2023 11:51:33 +0800
+Subject: [PATCH 06/11] qtbase-find-tools-in-PATH
+
+1. find qt's tools in `QTTOOLSPATH` env
+   qt assumes that all components use the same install prefix
+   we can't get the real prefix for qttools when build qtbase
+   we will add /libexec to `QTTOOLSPATH` in qtToolsHook
+   find_path will also search in 'PATH' by default
+   see `CMAKE_FIND_USE_SYSTEM_ENVIRONMENT_PATH`
+
+2. disable tool_dependencies_enabled
+   We can guarantee the build order of qt components in nixpkgs
+   tools in qttools always build before qtdoc
+   qdoc_bin is not a build target now, since we find it in `QTTOOLSPATH`
+---
+ cmake/QtDocsHelpers.cmake | 11 ++++++++---
+ 1 file changed, 8 insertions(+), 3 deletions(-)
+
+diff --git a/cmake/QtDocsHelpers.cmake b/cmake/QtDocsHelpers.cmake
+index 48ed5a324bf..91d8d41fb1f 100644
+--- a/cmake/QtDocsHelpers.cmake
++++ b/cmake/QtDocsHelpers.cmake
+@@ -47,9 +47,14 @@ function(qt_internal_add_docs)
+         set(doc_tools_libexec "${QT_BUILD_INTERNALS_RELOCATABLE_INSTALL_PREFIX}/${INSTALL_LIBEXECDIR}")
+     endif()
+ 
+-    set(qdoc_bin "${doc_tools_bin}/qdoc${CMAKE_EXECUTABLE_SUFFIX}")
+-    set(qtattributionsscanner_bin "${doc_tools_libexec}/qtattributionsscanner${CMAKE_EXECUTABLE_SUFFIX}")
+-    set(qhelpgenerator_bin "${doc_tools_libexec}/qhelpgenerator${CMAKE_EXECUTABLE_SUFFIX}")
++    set(tool_dependencies_enabled FALSE)
++
++    find_path(qdoc_path name qdoc PATHS ENV QTTOOLSPATH)
++    find_path(qtattributionsscanner_path name qtattributionsscanner PATHS ENV QTTOOLSPATH)
++    find_path(qhelpgenerator_path name qhelpgenerator PATHS ENV QTTOOLSPATH)
++    set(qdoc_bin "${qdoc_path}/qdoc${CMAKE_EXECUTABLE_SUFFIX}")
++    set(qtattributionsscanner_bin "${qtattributionsscanner_path}/qtattributionsscanner${CMAKE_EXECUTABLE_SUFFIX}")
++    set(qhelpgenerator_bin "${qhelpgenerator_path}/qhelpgenerator${CMAKE_EXECUTABLE_SUFFIX}")
+ 
+     get_target_property(target_type ${target} TYPE)
+     if (NOT target_type STREQUAL "INTERFACE_LIBRARY")
+-- 
+2.42.0
+
diff --git a/gnu/packages/patches/qtbase-pass-to-qmlimportscanner-the-QML2_IMPORT_PATH.patch b/gnu/packages/patches/qtbase-pass-to-qmlimportscanner-the-QML2_IMPORT_PATH.patch
new file mode 100644
index 0000000000..7bf2193bc2
--- /dev/null
+++ b/gnu/packages/patches/qtbase-pass-to-qmlimportscanner-the-QML2_IMPORT_PATH.patch
@@ -0,0 +1,30 @@
+From d7a9a3b0ecdbb1b5829f25954d763d767f1c8794 Mon Sep 17 00:00:00 2001
+From: Nick Cao <nickcao <at> nichi.co>
+Date: Tue, 10 Oct 2023 10:12:56 -0400
+Subject: [PATCH 07/11] qtbase: pass to qmlimportscanner the QML2_IMPORT_PATH
+
+---
+ src/tools/macdeployqt/shared/shared.cpp | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/src/tools/macdeployqt/shared/shared.cpp b/src/tools/macdeployqt/shared/shared.cpp
+index 2ae4f998944..ba10ae02bcd 100644
+--- a/src/tools/macdeployqt/shared/shared.cpp
++++ b/src/tools/macdeployqt/shared/shared.cpp
+@@ -1297,6 +1297,13 @@ bool deployQmlImports(const QString &appBundlePath, DeploymentInfo deploymentInf
+     argumentList.append( "-importPath");
+     argumentList.append(qmlImportsPath);
+ 
++    // In a modularized installation of qt as we have in Nix, instead, we will
++    // read the paths from the environment, as they are spread in multiple
++    // locations and normally set in the environment like this
++    auto envQmlImportPaths = ::qgetenv("QML2_IMPORT_PATH").split(':');
++    for (const QString &importPath : envQmlImportPaths)
++        argumentList << "-importPath" << importPath;
++
+     // run qmlimportscanner
+     QProcess qmlImportScanner;
+     qmlImportScanner.start(qmlImportScannerPath, argumentList);
+-- 
+2.42.0
+
diff --git a/gnu/packages/patches/qtbase-qmake-fix-includedir-in-generated-pkg-config.patch b/gnu/packages/patches/qtbase-qmake-fix-includedir-in-generated-pkg-config.patch
new file mode 100644
index 0000000000..53f226254a
--- /dev/null
+++ b/gnu/packages/patches/qtbase-qmake-fix-includedir-in-generated-pkg-config.patch
@@ -0,0 +1,26 @@
+From 6088085d3074316dd74639fc6c1233e5862aff11 Mon Sep 17 00:00:00 2001
+From: Nick Cao <nickcao <at> nichi.co>
+Date: Fri, 14 Apr 2023 09:34:46 +0800
+Subject: [PATCH 03/11] qtbase: qmake: fix includedir in generated pkg-config
+
+---
+ qmake/generators/makefile.cpp | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
+index 11d2f0ff7df..c78ed0d3485 100644
+--- a/qmake/generators/makefile.cpp
++++ b/qmake/generators/makefile.cpp
+@@ -3412,8 +3412,7 @@ MakefileGenerator::writePkgConfigFile()
+       << varGlue("QMAKE_PKGCONFIG_CFLAGS", "", " ", " ")
+         //      << varGlue("DEFINES","-D"," -D"," ")
+          ;
+-    if (!project->values("QMAKE_DEFAULT_INCDIRS").contains(includeDir))
+-        t << "-I${includedir}";
++    t << "-I${includedir}";
+     if (target_mode == TARG_MAC_MODE && project->isActiveConfig("lib_bundle")
+         && libDir != QLatin1String("/Library/Frameworks")) {
+             t << " -F${libdir}";
+-- 
+2.42.0
+
diff --git a/gnu/packages/patches/qtbase-use-TZDIR.patch b/gnu/packages/patches/qtbase-use-TZDIR.patch
deleted file mode 100644
index 98bf7493e9..0000000000
--- a/gnu/packages/patches/qtbase-use-TZDIR.patch
+++ /dev/null
@@ -1,141 +0,0 @@
-From 1075606f8b2f9e153c82f8e50cbd69cea9c72e87 Mon Sep 17 00:00:00 2001
-From: Edward Welbourne <edward.welbourne <at> qt.io>
-Date: Mon, 11 Sep 2023 11:41:39 +0200
-Subject: [PATCH] Support the TZDIR environment variable
-
-On Linux / glibc, this overrides the default system location for the
-zone info. So check for files there first. Break out a function to
-manage the trying of (now three) zoneinfo directories when opening a
-file by name relative to there.
-
-Pick-to: 6.6 6.5
-Task-number: QTBUG-116017
-Change-Id: I1f97107aabd9015c0a5543639870f1d70654ca67
----
-* Rebased on top of v6.5.2.
-
- src/corelib/time/qtimezoneprivate_tz.cpp | 73 ++++++++++++++++--------
- 1 file changed, 49 insertions(+), 24 deletions(-)
-
-diff --git a/src/corelib/time/qtimezoneprivate_tz.cpp b/src/corelib/time/qtimezoneprivate_tz.cpp
-index 067191d816..a8b2fc894e 100644
---- a/src/corelib/time/qtimezoneprivate_tz.cpp
-+++ b/src/corelib/time/qtimezoneprivate_tz.cpp
-@@ -51,17 +51,41 @@ typedef QHash<QByteArray, QTzTimeZone> QTzTimeZoneHash;
- 
- static bool isTzFile(const QString &name);
- 
-+// Open a named file under the zone info directory:
-+static bool openZoneInfo(QString name, QFile *file)
-+{
-+    // At least on Linux / glibc (see man 3 tzset), $TZDIR overrides the system
-+    // default location for zone info:
-+    const QString tzdir = qEnvironmentVariable("TZDIR");
-+    if (!tzdir.isEmpty()) {
-+        file->setFileName(QDir(tzdir).filePath(name));
-+        if (file->open(QIODevice::ReadOnly))
-+            return true;
-+    }
-+    // Try modern system path first:
-+    constexpr auto zoneShare = "/usr/share/zoneinfo/"_L1;
-+    if (tzdir != zoneShare && tzdir != zoneShare.chopped(1)) {
-+        file->setFileName(zoneShare + name);
-+        if (file->open(QIODevice::ReadOnly))
-+            return true;
-+    }
-+    // Fall back to legacy system path:
-+    constexpr auto zoneLib = "/usr/lib/zoneinfo/"_L1;
-+    if (tzdir != zoneLib && tzdir != zoneLib.chopped(1)) {
-+        file->setFileName(zoneShare + name);
-+        if (file->open(QIODevice::ReadOnly))
-+            return true;
-+    }
-+    return false;
-+}
-+
- // Parse zone.tab table for territory information, read directories to ensure we
- // find all installed zones (many are omitted from zone.tab; even more from
- // zone1970.tab).
- static QTzTimeZoneHash loadTzTimeZones()
- {
--    QString path = QStringLiteral("/usr/share/zoneinfo/zone.tab");
--    if (!QFile::exists(path))
--        path = QStringLiteral("/usr/lib/zoneinfo/zone.tab");
--
--    QFile tzif(path);
--    if (!tzif.open(QIODevice::ReadOnly))
-+    QFile tzif;
-+    if (!openZoneInfo("zone.tab"_L1, &tzif))
-         return QTzTimeZoneHash();
- 
-     QTzTimeZoneHash zonesHash;
-@@ -91,6 +115,7 @@ static QTzTimeZoneHash loadTzTimeZones()
-         }
-     }
- 
-+    const QString path = tzif.fileName();
-     const qsizetype cut = path.lastIndexOf(u'/');
-     Q_ASSERT(cut > 0);
-     const QDir zoneDir = QDir(path.first(cut));
-@@ -761,20 +786,13 @@ QTzTimeZoneCacheEntry QTzTimeZoneCache::findEntry(const QByteArray &ianaId)
-         tzif.setFileName(QStringLiteral("/etc/localtime"));
-         if (!tzif.open(QIODevice::ReadOnly))
-             return ret;
--    } else {
--        // Open named tz, try modern path first, if fails try legacy path
--        tzif.setFileName("/usr/share/zoneinfo/"_L1 + QString::fromLocal8Bit(ianaId));
--        if (!tzif.open(QIODevice::ReadOnly)) {
--            tzif.setFileName("/usr/lib/zoneinfo/"_L1 + QString::fromLocal8Bit(ianaId));
--            if (!tzif.open(QIODevice::ReadOnly)) {
--                // ianaId may be a POSIX rule, taken from $TZ or /etc/TZ
--                auto check = validatePosixRule(ianaId);
--                if (check.isValid) {
--                    ret.m_hasDst = check.hasDst;
--                    ret.m_posixRule = ianaId;
--                }
--                return ret;
--            }
-+    } else if (!openZoneInfo(QString::fromLocal8Bit(ianaId), &tzif)) {
-+        // ianaId may be a POSIX rule, taken from $TZ or /etc/TZ
-+        auto check = validatePosixRule(ianaId);
-+        if (check.isValid) {
-+            ret.m_hasDst = check.hasDst;
-+            ret.m_posixRule = ianaId;
-+            return ret;
-         }
-     }
- 
-@@ -1317,7 +1335,8 @@ private:
-     {
-         // On most distros /etc/localtime is a symlink to a real file so extract
-         // name from the path
--        const auto zoneinfo = "/zoneinfo/"_L1;
-+        const QString tzdir = qEnvironmentVariable("TZDIR");
-+        constexpr auto zoneinfo = "/zoneinfo/"_L1;
-         QString path = QStringLiteral("/etc/localtime");
-         long iteration = getSymloopMax();
-         // Symlink may point to another symlink etc. before being under zoneinfo/
-@@ -1325,9 +1344,15 @@ private:
-         // symlink, like America/Montreal pointing to America/Toronto
-         do {
-             path = QFile::symLinkTarget(path);
--            int index = path.indexOf(zoneinfo);
--            if (index >= 0) // Found zoneinfo file; extract zone name from path:
--                return QStringView{ path }.mid(index + zoneinfo.size()).toUtf8();
-+            // If it's a zoneinfo file, extract the zone name from its path:
-+            int index = tzdir.isEmpty() ? -1 : path.indexOf(tzdir);
-+            if (index >= 0) {
-+                const auto tail = QStringView{ path }.sliced(index + tzdir.size()).toUtf8();
-+                return tail.startsWith(u'/') ? tail.sliced(1) : tail;
-+            }
-+            index = path.indexOf(zoneinfo);
-+            if (index >= 0)
-+                return QStringView{ path }.sliced(index + zoneinfo.size()).toUtf8();
-         } while (!path.isEmpty() && --iteration > 0);
- 
-         return QByteArray();
-
-base-commit: af457a9f0f7eb1a2a7d11f495da508faab91a442
--- 
-2.41.0
-
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 <at> 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 9df49d7fb3..9e6131f585 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -28,7 +28,7 @@
 ;;; Copyright © 2022 Petr Hodina <phodina <at> protonmail.com>
 ;;; Copyright © 2022 Yash Tiwari <yasht <at> mailbox.org>
 ;;; Copyright © 2023 Sharlatan Hellseher <sharlatanus <at> gmail.com>
-;;; Copyright © 2022 Zheng Junjie <873216071 <at> qq.com>
+;;; Copyright © 2022, 2024 Zheng Junjie <873216071 <at> qq.com>
 ;;; Copyright © 2023 Herman Rimm <herman <at> rimm.ee>
 ;;;
 ;;; This file is part of GNU Guix.
@@ -67,6 +67,7 @@ (define-module (gnu packages qt)
   #:use-module (gnu packages bash)
   #:use-module (gnu packages base)
   #:use-module (gnu packages bison)
+  #:use-module (gnu packages crypto)
   #:use-module (gnu packages check)
   #:use-module (gnu packages cmake)
   #:use-module (gnu packages compression)
@@ -654,27 +655,28 @@ (define-public qtbase
   (package
     (inherit qtbase-5)
     (name "qtbase")
-    (version "6.5.2")
+    (version "6.6.2")
     (source (origin
               (inherit (package-source qtbase-5))
               (uri (qt-url name version))
               (sha256
                (base32
-                "0s8jwzdcv97dfy8n3jjm8zzvllv380l73mwdva7rs2nqnhlwgd1x"))
+                "0yv78bwqzy975854h53rbiilsms62f3v02i3jqz7v8ajk1ml56xq"))
               (modules '((guix build utils)))
               (snippet
                ;; corelib uses bundled harfbuzz, md4, md5, sha3
                '(with-directory-excursion "src/3rdparty"
                   (for-each delete-file-recursively
-                            ;; The bundled pcre2 copy is kept, as its headers
-                            ;; are required by some internal bootstrap target
-                            ;; used for the tools.
                             (list "double-conversion" "freetype" "harfbuzz-ng"
-                                  "libpng" "libjpeg" "sqlite" "xcb" "zlib"))))
-              (patches (search-patches "qtbase-use-TZDIR.patch"
-                                       "qtbase-moc-ignore-gcc-macro.patch"
+                                  "pcre2" "md4c" "libpng" "libjpeg"
+                                  "sqlite" "xcb" "zlib"))))
+              (patches (search-patches "qtbase-moc-ignore-gcc-macro.patch"
                                        "qtbase-absolute-runpath.patch"
-                                       "qtbase-qmake-use-libname.patch"))))
+                                       "qtbase-qmake-use-libname.patch"
+                                       "qtbase-find-tools-in-PATH.patch"
+                                       "qtbase-pass-to-qmlimportscanner-the-QML2_IMPORT_PATH.patch"
+                                       "qtbase-qmake-fix-includedir-in-generated-pkg-config.patch"
+                                       "qtbase-check-in-the-QML-folder-of-this-library-does-.patch"))))
     (build-system cmake-build-system)
     (arguments
      (substitute-keyword-arguments (package-arguments qtbase-5)
@@ -749,7 +751,8 @@ (define-public qtbase
                   (("\"xdg-open\"")
                    (format #f "~s" (search-input-file inputs "bin/xdg-open"))))
                 (substitute* '("mkspecs/features/qt_functions.prf"
-                               "qmake/library/qmakebuiltins.cpp")
+                               "qmake/library/qmakebuiltins.cpp"
+                               "tests/auto/tools/qt_cmake_create/tst_qt_cmake_create.cpp")
                   (("/bin/sh")
                    (search-input-file inputs "bin/bash")))
                 (substitute* "src/corelib/CMakeLists.txt"
@@ -814,6 +817,16 @@ (define-public qtbase
                     (string-join
                      (append
                       (list
+                       ;; with expansion:
+                       ;; false
+                       ;; with messages:
+                       ;; test := "keyboard"
+                       ;; arguments := QList("-o", "-,tap")
+                       ;; Detected locale "C" with character encoding "ANSI_X3.4-1968", which is not UTF-8.
+                       ;; Qt depends on a UTF-8 locale, but has failed to switch to one.
+                       ;; If this causes problems, reconfigure your locale. See the locale(1) manual
+                       ;; for more information.
+                       "tst_selftests"
                        ;; The 'tst_moc' test fails with "'fi.exists()' returned FALSE".
                        "tst_moc"
 
@@ -984,6 +997,7 @@ (define-public qtbase
                 bash-minimal
                 coreutils-minimal
                 md4c
+                libb2
                 libice
                 libsm
                 libxcb
@@ -1074,13 +1088,13 @@ (define-public qt3d-5
 (define-public qt5compat
   (package
     (name "qt5compat")
-    (version "6.5.2")
+    (version "6.6.2")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "1i4izabbmf1dayzlj1miz7hsm4cy0qb7i72pwyl2fp05w8pf9axr"))))
+                "0rqr34lqf4mjdgjj09wzlvkxfknz8arjl9p30xpqbr2qfsmhhyz0"))))
     (build-system cmake-build-system)
     (arguments
      (list
@@ -1172,13 +1186,13 @@ (define-public qtsvg-5
 (define-public qtsvg
   (package
     (name "qtsvg")
-    (version "6.5.2")
+    (version "6.6.2")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "18v337lfk8krg0hff5jx6fi7gn6x3djn03x3psrhlbmgjc8crd28"))))
+                "10c1dmbv5d39n1q4m67gf2h4n6wfkzrlyk8plnxbyhhvxxcis8ss"))))
     (build-system cmake-build-system)
     (arguments
      (list
@@ -1231,14 +1245,14 @@ (define-public qtimageformats-5
 (define-public qtimageformats
   (package
     (name "qtimageformats")
-    (version "6.5.2")
+    (version "6.6.2")
     (source (origin
               (inherit (package-source qtimageformats-5))
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "0hv7mkn72126rkhy5gmjmbvzy7v17mkk3q2pkmzy99f64j4w1q5a"))))
+                "1cvwm0hnspglydms6qhcp5g0ayz5pamigl52kz8km66l6s8lqn3i"))))
     (build-system cmake-build-system)
     (arguments
      (list
@@ -1406,14 +1420,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)
@@ -1483,6 +1497,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"
@@ -1599,13 +1615,13 @@ (define-public qtwebsockets-5
 (define-public qtwebsockets
   (package
     (name "qtwebsockets")
-    (version "6.5.2")
+    (version "6.6.2")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "0xjwifxj2ssshys6f6kjr6ri2vq1wfshxky6mcscjm7vvyqdfjr0"))))
+                "1y9q8jmspxbfxf07jdcg4n8zwmchccyzp0z68fxr0hnvr2dymrn0"))))
     (build-system cmake-build-system)
     (arguments
      (list
@@ -1636,6 +1652,25 @@ (define-public qtwebsockets
     (license (package-license qtbase))))
 
 (define-public qtsensors
+  (package
+    (inherit qtsvg)
+    (name "qtsensors")
+    (version "6.6.2")
+    (source (origin
+              (method url-fetch)
+              (uri (qt-url name version))
+              (sha256
+               (base32
+                "0a3w50bfnmxndyxnn9lsy1wxffhm2am0yjxqx3vx0gfjwv79yvsa"))))
+    (native-inputs
+     (list qtdeclarative))
+    (inputs (list qtbase))
+    (synopsis "Qt Sensors module")
+    (description "The Qt Sensors API provides access to sensor hardware via QML
+and C++ interfaces.  The Qt Sensors API also provides a motion gesture
+recognition API for devices.")))
+
+(define-public qtsensors-5
   (package
     (inherit qtsvg-5)
     (name "qtsensors")
@@ -1715,7 +1750,7 @@ (define-public qtmultimedia-5
 (define-public qtshadertools
   (package
     (name "qtshadertools")
-    (version "6.5.2")
+    (version "6.6.2")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
@@ -1723,7 +1758,7 @@ (define-public qtshadertools
               ;; sources.
               (sha256
                (base32
-                "0g8aziqhds2fkx11y4p2akmyn2p1qqf2fjxv72f9pibnhpdv0gya"))))
+                "0bxrczs9nw6az2p4n8x0f660vsmxxynx4iqgj75l4zsfzzbym2v2"))))
     (build-system cmake-build-system)
     (arguments
      (list
@@ -1744,13 +1779,13 @@ (define-public qtshadertools
 (define-public qtmultimedia
   (package
     (name "qtmultimedia")
-    (version "6.5.2")
+    (version "6.6.2")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "0xc9k4mlncscxqbp8q46yjd89k4jb8j0ggbi5ad874lycym013wl"))
+                "1v0430jnv97ws6cizn9mi8zr9hcg7rixd0jg7smhdq8apacjb572"))
               (modules '((guix build utils)))
               (snippet
                '(begin
@@ -1775,7 +1810,10 @@ (define-public qtmultimedia
               ;; session bus, which requires an X11 server, and then is still
               ;; unhappy).
               (substitute* "tests/auto/CMakeLists.txt"
-                (("add_subdirectory\\(integration)") ""))))
+                (("add_subdirectory\\(integration)") ""))
+              ;; fail on offscreen rendering
+              (substitute* "tests/auto/unit/multimedia/CMakeLists.txt"
+                (("add_subdirectory\\(qvideoframecolormanagement\\)") ""))))
           (add-before 'check 'prepare-for-tests
             (lambda _
               (setenv "QT_QPA_PLATFORM" "offscreen")))
@@ -1865,13 +1903,13 @@ (define-public qtwayland-5
 (define-public qtwayland
   (package
     (name "qtwayland")
-    (version "6.5.2")
+    (version "6.6.2")
     (source
      (origin
        (method url-fetch)
        (uri (qt-url name version))
        (sha256
-        (base32 "16iwar19sgjvxgmbr6hmd3hsxp6ahdjwl1lra2wapl3zzf3bw81h"))))
+        (base32 "0y6x84ckcc53ddclnrlzs08b1kvw6saw9nim0hz4wc5fyz7dbkcv"))))
     (build-system cmake-build-system)
     (arguments
      (list #:configure-flags #~(list "-DQT_BUILD_TESTS=ON")
@@ -1888,6 +1926,7 @@ (define-public qtwayland
                      (("QTRY_COMPARE\\(bufferSpy\\.size\\(\\), 1\\);") ""))))
                (add-before 'check 'set-test-environment
                  (lambda _
+                   (setenv "XDG_RUNTIME_DIR" (getcwd))
                    ;; Do not fail just because /etc/machine-id is missing.
                    (setenv "DBUS_FATAL_WARNINGS" "0")
                    ;; Make Qt render "offscreen", required for tests.
@@ -1996,13 +2035,13 @@ (define-public qtwebchannel-5
 (define-public qtwebchannel
   (package
     (name "qtwebchannel")
-    (version "6.5.2")
+    (version "6.6.2")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "0qwfnwva7v5f2g5is17yy66mnmc9c1yf9aagaw5qanskdvxdk261"))))
+                "1incvisc3j758b4k82vnwci8j1bba8zf6xgmgcrsm553k4wpsz1x"))))
     (build-system cmake-build-system)
     (arguments
      (list
@@ -2080,13 +2119,13 @@ (define-public qtwebview
 (define-public qtlanguageserver
   (package
     (name "qtlanguageserver")
-    (version "6.5.2")
+    (version "6.6.2")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "196iicwpqca2ydpca41qs6aqxxq8ycknw6lm2v00h1w3m86frdbk"))))
+                "1bgazi44mwac20biybhp21icgwa8k7jd295j8jsfgzxbw12lq7y3"))))
     (build-system cmake-build-system)
     (arguments
      (list #:phases #~(modify-phases %standard-phases
@@ -2129,13 +2168,13 @@ (define-public qtlocation
 (define-public qtlottie
   (package
     (name "qtlottie")
-    (version "6.5.2")
+    (version "6.6.2")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "16z8fhaa40ig0cggb689zf8j3cid6fk6pmh91b8342ymy1fdqfh0"))))
+                "1hqhp55jfasavk7p8xb0srbc6lnk70w2q0x4iwn28z5s5kd1cvi7"))))
     (build-system cmake-build-system)
     (arguments
      (list
@@ -2193,13 +2232,13 @@ (define-public qttools-5
 (define-public qttools
   (package
     (name "qttools")
-    (version "6.5.2")
+    (version "6.6.2")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "0ha3v488vnm4pgdpyjgf859sak0z2fwmbgcyivcd93qxflign7sm"))))
+                "0ij7djy06xi4v5v29fh31gqq5rnc12vviv3qg3vqf4hiaagrxm76"))))
     (build-system cmake-build-system)
     (arguments
      (list
@@ -2220,7 +2259,7 @@ (define-public qttools
     (native-inputs (list perl qtdeclarative vulkan-headers))
     ;; Use clang-15, which is built using as a single shared library, which is
     ;; what the build system of qttools expects.
-    (inputs (list clang-15 libxkbcommon mesa qtbase))
+    (inputs (list clang-15 libxkbcommon mesa qtbase `(,zstd "lib")))
     (home-page (package-home-page qtbase))
     (synopsis "Qt Tools and Designer modules")
     (description "The Qt Tools module provides a set of applications to browse
@@ -2233,13 +2272,13 @@ (define-public qttools
 (define-public qttranslations
   (package
     (name "qttranslations")
-    (version "6.5.2")
+    (version "6.6.2")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "1sxy2ljn5ajvn4yjb8fx86l56viyvqh5r9hf5x67azkmgrilaz1k"))))
+                "0xqcad8aa9lp6wzh1rs46id6r60zdw82qj3bq9k2b89sxy8c0fna"))))
     (build-system cmake-build-system)
     (arguments (list #:tests? #f))
     (native-inputs (list qtbase qttools))
@@ -2391,13 +2430,13 @@ (define-public qtscxml
 (define-public qtpositioning
   (package
     (name "qtpositioning")
-    (version "6.5.2")
+    (version "6.6.2")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "1yhlfs8izc054qv1krf5qv6zzjlvmz013h74fwamn74dfh1kyjbh"))))
+                "1qn31vps9dj4g8m7d195qlsyj3p4dfqqszdc6yqq097dq5y5d9sd"))))
     (build-system cmake-build-system)
     (arguments
      (list
@@ -2504,13 +2543,13 @@ (define-public qtnetworkauth-5
 (define-public qtnetworkauth
   (package
     (name "qtnetworkauth")
-    (version "6.5.2")
+    (version "6.6.2")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "0g18kh3zhcfi9ni8cqbbjdc1l6jf99ijv5shcl42jk6219b4pk2f"))))
+                "1lijsdwbj8gscfllmp358n5ysa8pvhx2msh7gpxvb4x81daxbg9j"))))
     (build-system cmake-build-system)
     (arguments (list #:configure-flags #~(list "-DQT_BUILD_TESTS=ON")))
     (native-inputs (list perl))
@@ -2524,13 +2563,13 @@ (define-public qtnetworkauth
 (define-public qtremoteobjects
   (package
     (name "qtremoteobjects")
-    (version "6.5.2")
+    (version "6.6.2")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "0k29sk02n54vj1w6vh6xycsjpyfqlijc13fnxh1q7wpgg4gizx60"))))
+                "0fbkjzykxpkz8myr6dy588gcmhyy3lar17v78zfam8kyxq7s5qxa"))))
     (build-system cmake-build-system)
     (arguments
      (list
@@ -2558,7 +2597,7 @@ (define-public qtremoteobjects
     (home-page (package-home-page qtbase))
     (license (package-license qtbase))))
 
-(define-public qtspeech
+(define-public qtspeech-5
   (package
     (inherit qtsvg-5)
     (name "qtspeech")
@@ -2583,6 +2622,38 @@ (define-public qtspeech
 In such a scenario, the messaging application can read out the incoming
 message.")))
 
+(define-public qtspeech
+  (package
+    (inherit qtspeech-5)
+    (name "qtspeech")
+    (version "6.6.2")
+    (source (origin
+              (method url-fetch)
+              (uri (qt-url name version))
+              (sha256
+               (base32
+                "1qvf3p2p1pc5fw40d8zq0iawaaqkc0dp5yx85b1dnw1j809bn8y0"))))
+    (build-system qt-build-system)
+    (arguments
+     (list #:phases
+           #~(modify-phases %standard-phases
+               (delete 'check)               ;move after the install phase
+               (add-after 'install 'check
+                 (assoc-ref %standard-phases 'check))
+               (add-before 'check 'prepare-for-tests
+                 (lambda* (#:key outputs #:allow-other-keys)
+                   (setenv "QML2_IMPORT_PATH"
+                           (string-append (assoc-ref outputs "out")
+                                          "/lib/qt6/qml:"
+                                          (getenv "QML2_IMPORT_PATH")))))
+               (add-after 'install 'delete-installed-tests
+                 (lambda _
+                   (delete-file-recursively
+                    (string-append #$output "/tests")))))))
+    (native-inputs '())
+    (propagated-inputs (list qtmultimedia))
+    (inputs (list qtbase qtdeclarative))))
+
 (define-public qtvirtualkeyboard-5
   (package
     (inherit qtsvg-5)
@@ -3042,14 +3113,14 @@ (define-public qtwebengine-5
 (define-public qtwebengine
   (package
     (name "qtwebengine")
-    (version "6.5.3")
+    (version "6.6.2")
     (source
      (origin
        (method url-fetch)
        (uri (qt-url name version))
        (sha256
         (base32
-         "1ra5hyyg4vymp8pgzv08smjc3fl1axdavnkpj1i5zxym1ndww513"))
+         "15h3hniszfkxv2vnn3fnbgbar8wb41ypgn4b4iz4iy6csar8f7fn"))
        (modules '((ice-9 ftw)
                   (ice-9 match)
                   (srfi srfi-1)
@@ -3081,12 +3152,11 @@ (define-public qtwebengine
                     "net/third_party/uri_template"
                     "third_party/abseil-cpp"
                     "third_party/angle"
-                    "third_party/angle/src/common/third_party/base"
-                    "third_party/angle/src/common/third_party/smhasher"
                     "third_party/angle/src/common/third_party/xxhash"
                     "third_party/angle/src/third_party/libXNVCtrl" ;Expat
-                    "third_party/angle/src/third_party/trace_event"
                     "third_party/angle/src/third_party/volk"
+                    "third_party/angle/src/third_party/systeminfo"
+                    "third_party/angle/src/third_party/ceval"
                     "third_party/axe-core"
                     "third_party/blink"
                     "third_party/boringssl"
@@ -3118,8 +3188,6 @@ (define-public qtwebengine
                     "third_party/dawn/third_party/khronos"
                     "third_party/devtools-frontend"
                     "third_party/devtools-frontend/src/front_end/third_party/i18n"
-                    "third_party/devtools-frontend/src/front_end/third_party/acorn"
-                    "third_party/devtools-frontend/src/front_end/third_party/acorn-loose"
                     "third_party/devtools-frontend/src/front_end/third_party/\
 additional_readme_paths.json"
                     "third_party/devtools-frontend/src/front_end/third_party/axe-core"
@@ -3130,11 +3198,17 @@ (define-public qtwebengine
                     "third_party/devtools-frontend/src/front_end/third_party/i18n"
                     "third_party/devtools-frontend/src/front_end/third_party/intl-messageformat"
                     "third_party/devtools-frontend/src/front_end/third_party/lighthouse"
-                    "third_party/devtools-frontend/src/front_end/third_party/lit-html"
+                    "third_party/devtools-frontend/src/front_end/third_party/lit"
+                    "third_party/devtools-frontend/src/front_end/third_party/acorn"
                     "third_party/devtools-frontend/src/front_end/third_party/marked"
                     "third_party/devtools-frontend/src/front_end/third_party/puppeteer"
+                    "third_party/devtools-frontend/src/front_end/third_party/\
+puppeteer/package/lib/esm/third_party/mitt"
+                    "third_party/devtools-frontend/src/front_end/third_party/vscode.web-custom-data"
+                    "third_party/devtools-frontend/src/third_party/pyjson5"
                     "third_party/devtools-frontend/src/front_end/third_party/wasmparser"
                     "third_party/devtools-frontend/src/third_party/typescript"
+                    "third_party/devtools-frontend/src/third_party/i18n"
                     "third_party/distributed_point_functions"
                     "third_party/dom_distiller_js"
                     "third_party/emoji-segmenter"
@@ -3177,7 +3251,6 @@ (define-public qtwebengine
                     "third_party/libgav1"
                     "third_party/libjingle_xmpp"
                     "third_party/libjpeg_turbo"
-                    "third_party/libjxl"
                     "third_party/libpng" ;TODO: make pdfium use system version
                     "third_party/libsecret" ;LGPL2.1+
                     "third_party/libsrtp"
@@ -3196,6 +3269,7 @@ (define-public qtwebengine
                     "third_party/lss"
                     "third_party/mako"
                     "third_party/markupsafe"
+                    "third_party/material_color_utilities" ;ASL2.0
                     "third_party/mesa_headers"
                     "third_party/metrics_proto"
                     "third_party/minigbm" ;BSD-3
@@ -3215,6 +3289,7 @@ (define-public qtwebengine
                     "third_party/opus/src/include/opus_multistream.h"
                     "third_party/opus/src/include/opus_types.h"
                     "third_party/ots"
+                    "third_party/flac"
                     "third_party/pdfium"
                     "third_party/pdfium/third_party/agg23"
                     "third_party/pdfium/third_party/base"
@@ -3222,7 +3297,6 @@ (define-public qtwebengine
                     "third_party/pdfium/third_party/freetype"
                     "third_party/pdfium/third_party/lcms"
                     "third_party/pdfium/third_party/libopenjpeg"
-                    "third_party/pdfium/third_party/libpng16"
                     "third_party/pdfium/third_party/libtiff"
                     "third_party/pdfium/third_party/skia_shared"
                     "third_party/pdfium/third_party/freetype/include/pstables.h" ;FreeType
@@ -3292,6 +3366,7 @@ (define-public qtwebengine
                     "v8/src/third_party/utf8-decoder"
                     "v8/src/third_party/valgrind"
                     "v8/third_party/inspector_protocol"
+                    "v8/third_party/glibc/src/sysdeps/ieee754/dbl-64"
                     "v8/third_party/v8/builtins")))
 
              (with-directory-excursion "src/3rdparty"
@@ -3359,14 +3434,17 @@ (define-public qtwebengine
               "-DQT_FEATURE_webengine_system_libjpeg=ON"
               "-DQT_FEATURE_webengine_system_libpci=ON"
               "-DQT_FEATURE_webengine_system_libpng=ON"
+              "-DQT_FEATURE_webengine_system_libtiff=ON"
               "-DQT_FEATURE_webengine_system_libwebp=ON"
               "-DQT_FEATURE_webengine_system_libxml=ON"
-              "-DQT_FEATURE_webengine_system_libxslt=ON"
               "-DQT_FEATURE_webengine_system_minizip=ON"
               "-DQT_FEATURE_webengine_system_opus=ON"
               "-DQT_FEATURE_webengine_system_pulseaudio=ON"
               "-DQT_FEATURE_webengine_system_re2=ON"
-              "-DQT_FEATURE_webengine_system_zlib=ON")
+              "-DQT_FEATURE_webengine_system_zlib=ON"
+              "-DQT_FEATURE_webengine_system_glib=ON"
+              "-DQT_FEATURE_webengine_system_libvpx=ON"
+              "-DQT_FEATURE_webengine_system_snappy=ON")
       #:phases
       #~(modify-phases %standard-phases
           (add-after 'unpack 'patch-paths
@@ -3416,7 +3494,11 @@ (define-public qtwebengine
                          '()))))
           (replace 'install
             (lambda _
-              (invoke "cmake" "--install" "."))))))
+              (invoke "cmake" "--install" ".")))
+          (add-after 'install 'delete-installed-tests
+                 (lambda _
+                   (delete-file-recursively
+                    (string-append #$output "/tests")))))))
     (native-inputs
      (modify-inputs (package-native-inputs qtwebengine-5)
        (delete "python2" "python2-six")
@@ -3684,7 +3766,7 @@ (define-public python-pyqt
        ("qtdeclarative-5" ,qtdeclarative-5)
        ("qtlocation" ,qtlocation)
        ("qtmultimedia-5" ,qtmultimedia-5)
-       ("qtsensors" ,qtsensors)
+       ("qtsensors" ,qtsensors-5)
        ("qtserialport" ,qtserialport)
        ("qtsvg-5" ,qtsvg-5)
        ("qttools-5" ,qttools-5)
@@ -4498,8 +4580,8 @@ (define-public python-pyside-2
            qtquickcontrols2-5
            qtscript
            qtscxml
-           qtsensors
-           qtspeech
+           qtsensors-5
+           qtspeech-5
            qtsvg-5
            qttools-5
            qtwebchannel-5
@@ -5086,7 +5168,7 @@ (define-public clazy
 (define-public qt-creator
   (package
     (name "qt-creator")
-    (version "12.0.1")
+    (version "12.0.2")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -5109,7 +5191,7 @@ (define-public qt-creator
                             ((".*marketplace/marketplace.qbs.*") ""))))
               (sha256
                (base32
-                "04h35za3gliai5djxwmzqrbih2g26lcv68pp4wvljkdwkcjsscvb"))))
+                "1lgk547pvg31zzqra7gn9gsszm5wrwxiw06crbr5n2kqfavk9r22"))))
     (build-system qt-build-system)
     (arguments
      (list
diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm
index 9c8225d22b..938b786ae2 100644
--- a/gnu/packages/radio.scm
+++ b/gnu/packages/radio.scm
@@ -2671,7 +2671,7 @@ (define-public sdrangel
            qtmultimedia-5
            qtquickcontrols2-5
            qtserialport
-           qtspeech
+           qtspeech-5
            qtwebchannel-5
            qtwebengine-5
            qtwebsockets-5

base-commit: b0b988c41c9e0e591274495a1b2d6f27fcdae15a
-- 
2.41.0

Message #83 received at 69628 <at> debbugs.gnu.org (full text, mbox):

From: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
To: Zheng Junjie <zhengjunjie <at> iscas.ac.cn>
Cc: Sharlatan Hellseher <sharlatanus <at> gmail.com>,
 Adam Faiz <adam.faiz <at> disroot.org>, 69628 <at> debbugs.gnu.org,
 Liliana Marie Prikler <liliana.prikler <at> gmail.com>,
 宋文武 <iyzsong <at> envs.net>, Andreas Enge <andreas <at> enge.fr>,
 Eric Bavier <bavier <at> posteo.net>
Subject: Re: [bug#69628] [PATCH v3] gnu: qt: Update to 6.6.2.
Date: Tue, 12 Mar 2024 10:44:53 -0400

Hi Zheng,

Thanks for this effort!  One nitpick, which you can perhaps overlook for
this time, to spare the effort of splitting everything, is that it's
more customary to have one commit per package update.  It's also the
result you'll get if you use the following commands to do the update of
Qt 6:

--8<---------------cut here---------------start------------->8---
./pre-inst-env guix refresh -u -m etc/teams/qt/qt-manifest.scm
./etc/committer.scm
--8<---------------cut here---------------end--------------->8---

Zheng Junjie <zhengjunjie <at> iscas.ac.cn> writes:

> * gnu/packages/qt.scm (qtbase, qtsvg, qtshadertools, qtnetworkauth,
> qtimageformats, qtlanguageserver, qtpositioning, qtdeclarative, qttools,
> qt5compat, qtlottie, qtwebsockets, qttranslations, qtwebchannel, qtwayland,
> qtremoteobjects, qtmultimedia, qtspeech, qtsensors, qtwebengine):
> Update to 6.6.2.

nitpick: GNU ChangeLog (info '(standards) Style of Change Logs) says:

       Break long lists of function names by closing continued lines with
    `)', rather than `,', and opening the continuation with `(' as in this
    example:

         * keyboard.c (menu_bar_items, tool_bar_items)
         (Fexecute_extended_command): Deal with 'keymap' property.

> (qt-creator): Update to 12.0.2.

This could be definitely be in a separate commit.

> (qtbase)[source]: unbundle pcre2, md4c, remove qtbase-use-TZDIR.patch. Add
> qtbase-find-tools-in-PATH.patch,
> qtbase-pass-to-qmlimportscanner-the-QML2_IMPORT_PATH.patch,
> qtbase-qmake-fix-includedir-in-generated-pkg-config.patch,
> qtbase-check-in-the-QML-folder-of-this-library-does-.patch.
> (qtbase)[arguments]<#:phase>: adjust 'patch-more-paths phase, skip tst_selftests test.

nitpick: #:phaseS (plural); Adjust (capitalized).

> (qtbase)[inputs]: add libb2.
> (qttools)[inputs]: add zstd:lib.
> (qtwayland)[arguments]<#:phases>: Adjust set-test-environment phase.
> (qtmultimedia)[arguments]<#:phases>: adjust 'disable-integration-tests phase.

Please punctuate change logs (e.g.: "Add lib2." instead of "add libb2.")

> (qtwebengine)[source]: Adjust snippet.
> [arguments]<#:configure-flags>: Adjust it.
> <#:phases>: Add delete-installed-tests phase.
>
> * gnu/packages/patches/qtbase-use-TZDIR.patch: remove this.
> * gnu/packages/patches/qtbase-find-tools-in-PATH.patch: New file
> * gnu/packages/patches/qtbase-pass-to-qmlimportscanner-the-QML2_IMPORT_PATH.patch: New file
> * gnu/packages/patches/qtbase-qmake-fix-includedir-in-generated-pkg-config.patch: New file
> * gnu/packages/patches/qtbase-check-in-the-QML-folder-of-this-library-does-.patch: New file
> * gnu/packages/patches/qtdeclarative-disable-qmlcache.patch: adjust it.

Another nitpick (sorry, apparently I'm a nitpicky reviewer :-)). These
patches file names are a bit on the long side.  It's OK to capture just
the essentials, like 'qtbase-qmlimportscanner-fix.patch.  There used to
be a hard limit of patch file names length; I think 'guix lint' checks
them now.

Also, 'qtbase-check-in-the-QML-folder-of-this-library-does-.patch' is
a long but non-descriptive file name (it appears truncated).

> * gnu/local.mk(dist_patch_DATA): remove qtbase-use-TZDIR.patch.
> Regist qtbase-find-tools-in-PATH.patch,

RegistER

> qtbase-pass-to-qmlimportscanner-the-QML2_IMPORT_PATH.patch,
> qtbase-qmake-fix-includedir-in-generated-pkg-config.patch,
> qtbase-check-in-the-QML-folder-of-this-library-does-.patch.
>
> gnu: Add qtspeech-5.
> * gnu/packages/qt.scm(qtspeech-5): New Variable.
> (python-pyside-2):
> * gnu/packages/games.scm (chessx):
> * gnu/packages/kde-frameworks.scm(ktextwidgets):
> * gnu/packages/kde-pim.scm(kdepim-runtime,kpimtextedit):
> * gnu/packages/kde-utils.scm(kmouth):
> * gnu/packages/kde.scm(okular):
> * gnu/packages/radio.scm(sdrangel)xb

The above should go to its own commit.

There should be a space between the file name and the opening parens.
There does not need to be trailing colon (:) when there's no message.

> Adjust inputs.
>
> gnu: Add qtsensors-5.
> * gnu/packages/qt.scm(qtspeech-5): New Variable.
> (python-pyqt,python-pyside-2):
> * gnu/packages/education.scm(gcompris-qt):
> * gnu/packages/kde-plasma.scm(kscreen):
> * gnu/packages/geo.scm(openorienteering-mapper):
> Adjust inputs.

Same comment as above, and this change should go to its own commit as
well.

> Change-Id: Ibb30850de615c85dca2cc4d6fd55b18a228e0fc9
> ---
>  gnu/local.mk                                  |   5 +-
>  gnu/packages/education.scm                    |   2 +-
>  gnu/packages/games.scm                        |   2 +-
>  gnu/packages/geo.scm                          |   2 +-
>  gnu/packages/kde-frameworks.scm               |   2 +-
>  gnu/packages/kde-pim.scm                      |   4 +-
>  gnu/packages/kde-plasma.scm                   |   2 +-
>  gnu/packages/kde-utils.scm                    |   2 +-
>  gnu/packages/kde.scm                          |   2 +-
>  ...the-QML-folder-of-this-library-does-.patch |  35 +++
>  .../patches/qtbase-find-tools-in-PATH.patch   |  45 ++++
>  ...mlimportscanner-the-QML2_IMPORT_PATH.patch |  30 +++
>  ...x-includedir-in-generated-pkg-config.patch |  26 +++
>  gnu/packages/patches/qtbase-use-TZDIR.patch   | 141 ------------
>  .../qtdeclarative-disable-qmlcache.patch      |  27 ++-
>  gnu/packages/qt.scm                           | 210 ++++++++++++------
>  gnu/packages/radio.scm                        |   2 +-
>  17 files changed, 317 insertions(+), 222 deletions(-)
>  create mode 100644 gnu/packages/patches/qtbase-check-in-the-QML-folder-of-this-library-does-.patch
>  create mode 100644 gnu/packages/patches/qtbase-find-tools-in-PATH.patch
>  create mode 100644 gnu/packages/patches/qtbase-pass-to-qmlimportscanner-the-QML2_IMPORT_PATH.patch
>  create mode 100644 gnu/packages/patches/qtbase-qmake-fix-includedir-in-generated-pkg-config.patch
>  delete mode 100644 gnu/packages/patches/qtbase-use-TZDIR.patch
>
> diff --git a/gnu/local.mk b/gnu/local.mk
> index 1aa413ebbe..3741cb9cd5 100644
> --- a/gnu/local.mk
> +++ b/gnu/local.mk
> @@ -1951,10 +1951,13 @@ dist_patch_DATA =						\
>    %D%/packages/patches/qemu-fix-agent-paths.patch 		\
>    %D%/packages/patches/qrcodegen-cpp-make-install.patch		\
>    %D%/packages/patches/qtbase-absolute-runpath.patch		\
> +  %D%/packages/patches/qtbase-find-tools-in-PATH.patch		\
> +  %D%/packages/patches/qtbase-pass-to-qmlimportscanner-the-QML2_IMPORT_PATH.patch \
> +  %D%/packages/patches/qtbase-qmake-fix-includedir-in-generated-pkg-config.patch \
> +  %D%/packages/patches/qtbase-check-in-the-QML-folder-of-this-library-does-.patch \
>    %D%/packages/patches/qtbase-moc-ignore-gcc-macro.patch	\
>    %D%/packages/patches/qtbase-qmake-use-libname.patch		\
>    %D%/packages/patches/qtbase-5-use-TZDIR.patch			\
> -  %D%/packages/patches/qtbase-use-TZDIR.patch			\
>    %D%/packages/patches/qtscript-disable-tests.patch		\
>    %D%/packages/patches/quagga-reproducible-build.patch          \
>    %D%/packages/patches/quickswitch-fix-dmenu-check.patch	\
> diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm
> index 698f15678b..50d4b332ee 100644
> --- a/gnu/packages/education.scm
> +++ b/gnu/packages/education.scm
> @@ -192,7 +192,7 @@ (define-public gcompris-qt
>             qtgraphicaleffects
>             qtmultimedia-5
>             qtquickcontrols2-5
> -           qtsensors
> +           qtsensors-5
>             qtsvg-5))
>      (home-page "https://gcompris.net/index-en.html")
>      (synopsis "Educational games for small children")
> diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
> index 9ff08e5e74..fdc2d53a77 100644
> --- a/gnu/packages/games.scm
> +++ b/gnu/packages/games.scm
> @@ -10475,7 +10475,7 @@ (define-public chessx
>      (native-inputs
>       (list qttools-5))
>      (inputs
> -     (list qtbase-5 qtmultimedia-5 qtspeech qtsvg-5 zlib))
> +     (list qtbase-5 qtmultimedia-5 qtspeech-5 qtsvg-5 zlib))
>      (arguments
>       `(#:tests? #f
>         #:phases
> diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm
> index 687effcace..63e66afdb8 100644
> --- a/gnu/packages/geo.scm
> +++ b/gnu/packages/geo.scm
> @@ -2575,7 +2575,7 @@ (define-public openorienteering-mapper
>             qtbase-5
>             qtimageformats-5
>             qtlocation
> -           qtsensors
> +           qtsensors-5
>             zlib))
>      (native-inputs
>       (list doxygen
> diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
> index 64e41b510d..227f9a28b1 100644
> --- a/gnu/packages/kde-frameworks.scm
> +++ b/gnu/packages/kde-frameworks.scm
> @@ -3249,7 +3249,7 @@ (define-public ktextwidgets
>             kwidgetsaddons
>             kwindowsystem
>             qtbase-5
> -           qtspeech))
> +           qtspeech-5))
>      (home-page "https://community.kde.org/Frameworks")
>      (synopsis "Text editing widgets")
>      (description "KTextWidgets provides widgets for displaying and editing text.
> diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm
> index e95eac4e2f..9a1c0b8d8e 100644
> --- a/gnu/packages/kde-pim.scm
> +++ b/gnu/packages/kde-pim.scm
> @@ -848,7 +848,7 @@ (define-public kdepim-runtime
>             qtdeclarative-5
>             qtkeychain
>             qtnetworkauth-5
> -           qtspeech
> +           qtspeech-5
>             qtwebchannel-5
>             qtwebengine-5
>             qtxmlpatterns))
> @@ -1993,7 +1993,7 @@ (define-public kpimtextedit
>             kwidgetsaddons
>             kxmlgui
>             qtbase-5
> -           qtspeech
> +           qtspeech-5
>             sonnet))
>      (arguments
>       `(#:tests? #f)) ;; TODO - test suite hangs
> diff --git a/gnu/packages/kde-plasma.scm b/gnu/packages/kde-plasma.scm
> index cf45fa59f7..1d41d35a56 100644
> --- a/gnu/packages/kde-plasma.scm
> +++ b/gnu/packages/kde-plasma.scm
> @@ -793,7 +793,7 @@ (define-public kscreen
>                    libkscreen
>                    libxi
>                    plasma-wayland-protocols
> -                  qtsensors
> +                  qtsensors-5
>                    qtbase-5
>                    qtx11extras
>                    xcb-util))
> diff --git a/gnu/packages/kde-utils.scm b/gnu/packages/kde-utils.scm
> index 4e665da599..6c6a669597 100644
> --- a/gnu/packages/kde-utils.scm
> +++ b/gnu/packages/kde-utils.scm
> @@ -874,7 +874,7 @@ (define-public kmouth
>             kxmlgui
>             breeze-icons ;; default icon set
>             qtbase-5
> -           qtspeech))
> +           qtspeech-5))
>      (home-page "https://apps.kde.org/kmouth/")
>      (synopsis "Type-and-say frontend for speech synthesizers")
>      (description "KMouth is a program which enables persons that cannot speak
> diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm
> index 8e8bb32fda..385bb42926 100644
> --- a/gnu/packages/kde.scm
> +++ b/gnu/packages/kde.scm
> @@ -1557,7 +1557,7 @@ (define-public okular
>             kio
>             kparts
>             kpty
> -           qtspeech
> +           qtspeech-5
>             kwallet
>             kwindowsystem
>             libkexiv2
> diff --git a/gnu/packages/patches/qtbase-check-in-the-QML-folder-of-this-library-does-.patch b/gnu/packages/patches/qtbase-check-in-the-QML-folder-of-this-library-does-.patch
> new file mode 100644
> index 0000000000..ed749cb238
> --- /dev/null
> +++ b/gnu/packages/patches/qtbase-check-in-the-QML-folder-of-this-library-does-.patch
> @@ -0,0 +1,35 @@
> +From c00e310092d9aeb48adf21dd22f1ee4dbdbf5ebb Mon Sep 17 00:00:00 2001
> +From: Nick Cao <nickcao <at> nichi.co>
> +Date: Tue, 10 Oct 2023 10:17:00 -0400
> +Subject: [PATCH 10/11] qtbase: check in the QML folder of this library does
> + actually exist
> +
> +In a modularized installation, this folder will be the location where
> +`qtbase` itself is installed, but `qtbase` does not have any QML
> +code, and `qmlimportscanner` will complain that it does not exist.


This looks like a useful patch, but where does it originate from?  Has
it already been committed to Qt, but not yet released?  Was is taken
from Nix?  Something else?  A link to where it was retrieved would help.

> + src/tools/macdeployqt/shared/shared.cpp | 7 +++++--
> + 1 file changed, 5 insertions(+), 2 deletions(-)
> +
> +diff --git a/src/tools/macdeployqt/shared/shared.cpp b/src/tools/macdeployqt/shared/shared.cpp
> +index 320095a972d..87ba0d4e24b 100644
> +--- a/src/tools/macdeployqt/shared/shared.cpp
> ++++ b/src/tools/macdeployqt/shared/shared.cpp
> +@@ -1297,9 +1297,12 @@ bool deployQmlImports(const QString &appBundlePath, DeploymentInfo deploymentInf
> +     }
> +     for (const QString &importPath : qmlImportPaths)
> +         argumentList << "-importPath" << importPath;
> ++
> +     QString qmlImportsPath = QLibraryInfo::path(QLibraryInfo::QmlImportsPath);
> +-    argumentList.append( "-importPath");
> +-    argumentList.append(qmlImportsPath);
> ++    if (QFile::exists(qmlImportsPath)) {
> ++        argumentList.append( "-importPath");
> ++        argumentList.append(qmlImportsPath);
> ++    }
> +
> +     // In a modularized installation of qt as we have in Nix, instead, we will
> +     // read the paths from the environment, as they are spread in multiple

This patches a file under the source tree 'macdeployqt'.  Does Guix
benefit from that?  We don't support Mac, so it seems it shouldn't be
useful to carry it.

> diff --git a/gnu/packages/patches/qtbase-find-tools-in-PATH.patch b/gnu/packages/patches/qtbase-find-tools-in-PATH.patch
> new file mode 100644
> index 0000000000..1d60684e07
> --- /dev/null
> +++ b/gnu/packages/patches/qtbase-find-tools-in-PATH.patch
> @@ -0,0 +1,45 @@
> +From a8b9fae710a2bd5e743f5e16364eaa8c38dbd784 Mon Sep 17 00:00:00 2001
> +From: rewine <luhongxu <at> deepin.org>
> +Date: Wed, 29 Mar 2023 11:51:33 +0800
> +Subject: [PATCH 06/11] qtbase-find-tools-in-PATH
> +
> +1. find qt's tools in `QTTOOLSPATH` env
> +   qt assumes that all components use the same install prefix
> +   we can't get the real prefix for qttools when build qtbase
> +   we will add /libexec to `QTTOOLSPATH` in qtToolsHook
> +   find_path will also search in 'PATH' by default
> +   see `CMAKE_FIND_USE_SYSTEM_ENVIRONMENT_PATH`
> +
> +2. disable tool_dependencies_enabled
> +   We can guarantee the build order of qt components in nixpkgs
> +   tools in qttools always build before qtdoc
> +   qdoc_bin is not a build target now, since we find it in `QTTOOLSPATH`
> +---
> + cmake/QtDocsHelpers.cmake | 11 ++++++++---
> + 1 file changed, 8 insertions(+), 3 deletions(-)
> +
> +diff --git a/cmake/QtDocsHelpers.cmake b/cmake/QtDocsHelpers.cmake
> +index 48ed5a324bf..91d8d41fb1f 100644
> +--- a/cmake/QtDocsHelpers.cmake
> ++++ b/cmake/QtDocsHelpers.cmake
> +@@ -47,9 +47,14 @@ function(qt_internal_add_docs)
> +         set(doc_tools_libexec "${QT_BUILD_INTERNALS_RELOCATABLE_INSTALL_PREFIX}/${INSTALL_LIBEXECDIR}")
> +     endif()
> +
> +-    set(qdoc_bin "${doc_tools_bin}/qdoc${CMAKE_EXECUTABLE_SUFFIX}")
> +-    set(qtattributionsscanner_bin "${doc_tools_libexec}/qtattributionsscanner${CMAKE_EXECUTABLE_SUFFIX}")
> +-    set(qhelpgenerator_bin "${doc_tools_libexec}/qhelpgenerator${CMAKE_EXECUTABLE_SUFFIX}")
> ++    set(tool_dependencies_enabled FALSE)
> ++
> ++    find_path(qdoc_path name qdoc PATHS ENV QTTOOLSPATH)
> ++    find_path(qtattributionsscanner_path name qtattributionsscanner PATHS ENV QTTOOLSPATH)
> ++    find_path(qhelpgenerator_path name qhelpgenerator PATHS ENV QTTOOLSPATH)
> ++    set(qdoc_bin "${qdoc_path}/qdoc${CMAKE_EXECUTABLE_SUFFIX}")
> ++    set(qtattributionsscanner_bin "${qtattributionsscanner_path}/qtattributionsscanner${CMAKE_EXECUTABLE_SUFFIX}")
> ++    set(qhelpgenerator_bin "${qhelpgenerator_path}/qhelpgenerator${CMAKE_EXECUTABLE_SUFFIX}")
> +
> +     get_target_property(target_type ${target} TYPE)
> +     if (NOT target_type STREQUAL "INTERFACE_LIBRARY")
> +--
> +2.42.0
> +
> diff --git a/gnu/packages/patches/qtbase-pass-to-qmlimportscanner-the-QML2_IMPORT_PATH.patch b/gnu/packages/patches/qtbase-pass-to-qmlimportscanner-the-QML2_IMPORT_PATH.patch
> new file mode 100644
> index 0000000000..7bf2193bc2
> --- /dev/null
> +++ b/gnu/packages/patches/qtbase-pass-to-qmlimportscanner-the-QML2_IMPORT_PATH.patch
> @@ -0,0 +1,30 @@
> +From d7a9a3b0ecdbb1b5829f25954d763d767f1c8794 Mon Sep 17 00:00:00 2001
> +From: Nick Cao <nickcao <at> nichi.co>
> +Date: Tue, 10 Oct 2023 10:12:56 -0400
> +Subject: [PATCH 07/11] qtbase: pass to qmlimportscanner the QML2_IMPORT_PATH
> +
> +---
> + src/tools/macdeployqt/shared/shared.cpp | 7 +++++++
> + 1 file changed, 7 insertions(+)
> +
> +diff --git a/src/tools/macdeployqt/shared/shared.cpp b/src/tools/macdeployqt/shared/shared.cpp
> +index 2ae4f998944..ba10ae02bcd 100644
> +--- a/src/tools/macdeployqt/shared/shared.cpp
> ++++ b/src/tools/macdeployqt/shared/shared.cpp

That's also probably useless for Guix (macdeployqt), unless 'mac' here
has nothing to do with the fruit company computer.  Did it fix an actual problem
for you?

[...]

> diff --git a/gnu/packages/patches/qtbase-qmake-fix-includedir-in-generated-pkg-config.patch b/gnu/packages/patches/qtbase-qmake-fix-includedir-in-generated-pkg-config.patch
> new file mode 100644
> index 0000000000..53f226254a
> --- /dev/null
> +++ b/gnu/packages/patches/qtbase-qmake-fix-includedir-in-generated-pkg-config.patch
> @@ -0,0 +1,26 @@
> +From 6088085d3074316dd74639fc6c1233e5862aff11 Mon Sep 17 00:00:00 2001
> +From: Nick Cao <nickcao <at> nichi.co>
> +Date: Fri, 14 Apr 2023 09:34:46 +0800
> +Subject: [PATCH 03/11] qtbase: qmake: fix includedir in generated pkg-config
> +
> +---
> + qmake/generators/makefile.cpp | 3 +--
> + 1 file changed, 1 insertion(+), 2 deletions(-)
> +
> +diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
> +index 11d2f0ff7df..c78ed0d3485 100644
> +--- a/qmake/generators/makefile.cpp
> ++++ b/qmake/generators/makefile.cpp
> +@@ -3412,8 +3412,7 @@ MakefileGenerator::writePkgConfigFile()
> +       << varGlue("QMAKE_PKGCONFIG_CFLAGS", "", " ", " ")
> +         //      << varGlue("DEFINES","-D"," -D"," ")
> +          ;
> +-    if (!project->values("QMAKE_DEFAULT_INCDIRS").contains(includeDir))
> +-        t << "-I${includedir}";
> ++    t << "-I${includedir}";
> +     if (target_mode == TARG_MAC_MODE && project->isActiveConfig("lib_bundle")
> +         && libDir != QLatin1String("/Library/Frameworks")) {
> +             t << " -F${libdir}";

[...]

> 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 <at> 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 9df49d7fb3..9e6131f585 100644
> --- a/gnu/packages/qt.scm
> +++ b/gnu/packages/qt.scm
> @@ -28,7 +28,7 @@
>  ;;; Copyright © 2022 Petr Hodina <phodina <at> protonmail.com>
>  ;;; Copyright © 2022 Yash Tiwari <yasht <at> mailbox.org>
>  ;;; Copyright © 2023 Sharlatan Hellseher <sharlatanus <at> gmail.com>
> -;;; Copyright © 2022 Zheng Junjie <873216071 <at> qq.com>
> +;;; Copyright © 2022, 2024 Zheng Junjie <873216071 <at> qq.com>
>  ;;; Copyright © 2023 Herman Rimm <herman <at> rimm.ee>
>  ;;;
>  ;;; This file is part of GNU Guix.
> @@ -67,6 +67,7 @@ (define-module (gnu packages qt)
>    #:use-module (gnu packages bash)
>    #:use-module (gnu packages base)
>    #:use-module (gnu packages bison)
> +  #:use-module (gnu packages crypto)
>    #:use-module (gnu packages check)
>    #:use-module (gnu packages cmake)
>    #:use-module (gnu packages compression)
> @@ -654,27 +655,28 @@ (define-public qtbase
>    (package
>      (inherit qtbase-5)
>      (name "qtbase")
> -    (version "6.5.2")
> +    (version "6.6.2")
>      (source (origin
>                (inherit (package-source qtbase-5))
>                (uri (qt-url name version))
>                (sha256
>                 (base32
> -                "0s8jwzdcv97dfy8n3jjm8zzvllv380l73mwdva7rs2nqnhlwgd1x"))
> +                "0yv78bwqzy975854h53rbiilsms62f3v02i3jqz7v8ajk1ml56xq"))
>                (modules '((guix build utils)))
>                (snippet
>                 ;; corelib uses bundled harfbuzz, md4, md5, sha3
>                 '(with-directory-excursion "src/3rdparty"
>                    (for-each delete-file-recursively
> -                            ;; The bundled pcre2 copy is kept, as its headers
> -                            ;; are required by some internal bootstrap target
> -                            ;; used for the tools.
>                              (list "double-conversion" "freetype" "harfbuzz-ng"
> -                                  "libpng" "libjpeg" "sqlite" "xcb" "zlib"))))
> -              (patches (search-patches "qtbase-use-TZDIR.patch"
> -                                       "qtbase-moc-ignore-gcc-macro.patch"
> +                                  "pcre2" "md4c" "libpng" "libjpeg"
> +                                  "sqlite" "xcb" "zlib"))))
> +              (patches (search-patches "qtbase-moc-ignore-gcc-macro.patch"
>                                         "qtbase-absolute-runpath.patch"
> -                                       "qtbase-qmake-use-libname.patch"))))
> +                                       "qtbase-qmake-use-libname.patch"
> +                                       "qtbase-find-tools-in-PATH.patch"
> +                                       "qtbase-pass-to-qmlimportscanner-the-QML2_IMPORT_PATH.patch"
> +                                       "qtbase-qmake-fix-includedir-in-generated-pkg-config.patch"
> +                                       "qtbase-check-in-the-QML-folder-of-this-library-does-.patch"))))

To stick to the 80 chars limit, the '(origin ...' could be broken on its
own line below '(source ...', same for '(patches (search-patches ...'

>      (build-system cmake-build-system)
>      (arguments
>       (substitute-keyword-arguments (package-arguments qtbase-5)
> @@ -749,7 +751,8 @@ (define-public qtbase
>                    (("\"xdg-open\"")
>                     (format #f "~s" (search-input-file inputs "bin/xdg-open"))))
>                  (substitute* '("mkspecs/features/qt_functions.prf"
> -                               "qmake/library/qmakebuiltins.cpp")
> +                               "qmake/library/qmakebuiltins.cpp"
> +                               "tests/auto/tools/qt_cmake_create/tst_qt_cmake_create.cpp")
>                    (("/bin/sh")
>                     (search-input-file inputs "bin/bash")))

The patching of the tests/... file should be in a different substitute*
call which substitutes it to (which "bash"); this is because when cross
compiling, native-inputs are not merged into inputs and thus bash
wouldn't be found.

>                  (substitute* "src/corelib/CMakeLists.txt"
> @@ -814,6 +817,16 @@ (define-public qtbase
>                      (string-join
>                       (append
>                        (list

This would read better if you provided context, like so: "The
'tst_selftests' fails with the following error: "

> +                       ;; with expansion:
> +                       ;; false
> +                       ;; with messages:
> +                       ;; test := "keyboard"
> +                       ;; arguments := QList("-o", "-,tap")
> +                       ;; Detected locale "C" with character encoding "ANSI_X3.4-1968", which is not UTF-8.
> +                       ;; Qt depends on a UTF-8 locale, but has failed to switch to one.
> +                       ;; If this causes problems, reconfigure your locale. See the locale(1) manual
> +                       ;; for more information.

> +                       "tst_selftests"

This issue was reported here:
<https://bugreports.qt.io/browse/QTBUG-113371>, and it seems to have to
do with the environment lacking UTF-8 locale data in its environment.  I
suspect this may not happen anymore on core-updates, where a C.UTF-8
locale is always made available by glibc, but in the meantime, have you
checked if adding the 'glibc-utf8-locales' package to its native-inputs
helped?

>                         ;; The 'tst_moc' test fails with "'fi.exists()' returned FALSE".
>                         "tst_moc"
>
> @@ -984,6 +997,7 @@ (define-public qtbase
>                  bash-minimal
>                  coreutils-minimal
>                  md4c
> +                libb2
>                  libice
>                  libsm
>                  libxcb
> @@ -1074,13 +1088,13 @@ (define-public qt3d-5
>  (define-public qt5compat
>    (package
>      (name "qt5compat")
> -    (version "6.5.2")
> +    (version "6.6.2")
>      (source (origin
>                (method url-fetch)
>                (uri (qt-url name version))
>                (sha256
>                 (base32
> -                "1i4izabbmf1dayzlj1miz7hsm4cy0qb7i72pwyl2fp05w8pf9axr"))))
> +                "0rqr34lqf4mjdgjj09wzlvkxfknz8arjl9p30xpqbr2qfsmhhyz0"))))
>      (build-system cmake-build-system)
>      (arguments
>       (list
> @@ -1172,13 +1186,13 @@ (define-public qtsvg-5
>  (define-public qtsvg
>    (package
>      (name "qtsvg")
> -    (version "6.5.2")
> +    (version "6.6.2")
>      (source (origin
>                (method url-fetch)
>                (uri (qt-url name version))
>                (sha256
>                 (base32
> -                "18v337lfk8krg0hff5jx6fi7gn6x3djn03x3psrhlbmgjc8crd28"))))
> +                "10c1dmbv5d39n1q4m67gf2h4n6wfkzrlyk8plnxbyhhvxxcis8ss"))))
>      (build-system cmake-build-system)
>      (arguments
>       (list
> @@ -1231,14 +1245,14 @@ (define-public qtimageformats-5
>  (define-public qtimageformats
>    (package
>      (name "qtimageformats")
> -    (version "6.5.2")
> +    (version "6.6.2")
>      (source (origin
>                (inherit (package-source qtimageformats-5))
>                (method url-fetch)
>                (uri (qt-url name version))
>                (sha256
>                 (base32
> -                "0hv7mkn72126rkhy5gmjmbvzy7v17mkk3q2pkmzy99f64j4w1q5a"))))
> +                "1cvwm0hnspglydms6qhcp5g0ayz5pamigl52kz8km66l6s8lqn3i"))))
>      (build-system cmake-build-system)
>      (arguments
>       (list
> @@ -1406,14 +1420,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)
> @@ -1483,6 +1497,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"
> @@ -1599,13 +1615,13 @@ (define-public qtwebsockets-5
>  (define-public qtwebsockets
>    (package
>      (name "qtwebsockets")
> -    (version "6.5.2")
> +    (version "6.6.2")
>      (source (origin
>                (method url-fetch)
>                (uri (qt-url name version))
>                (sha256
>                 (base32
> -                "0xjwifxj2ssshys6f6kjr6ri2vq1wfshxky6mcscjm7vvyqdfjr0"))))
> +                "1y9q8jmspxbfxf07jdcg4n8zwmchccyzp0z68fxr0hnvr2dymrn0"))))
>      (build-system cmake-build-system)
>      (arguments
>       (list
> @@ -1636,6 +1652,25 @@ (define-public qtwebsockets
>      (license (package-license qtbase))))
>
>  (define-public qtsensors
> +  (package
> +    (inherit qtsvg)
> +    (name "qtsensors")
> +    (version "6.6.2")
> +    (source (origin
> +              (method url-fetch)
> +              (uri (qt-url name version))
> +              (sha256
> +               (base32
> +                "0a3w50bfnmxndyxnn9lsy1wxffhm2am0yjxqx3vx0gfjwv79yvsa"))))
> +    (native-inputs
> +     (list qtdeclarative))
> +    (inputs (list qtbase))
> +    (synopsis "Qt Sensors module")
> +    (description "The Qt Sensors API provides access to sensor hardware via QML
> +and C++ interfaces.  The Qt Sensors API also provides a motion gesture
> +recognition API for devices.")))
> +
> +(define-public qtsensors-5
>    (package
>      (inherit qtsvg-5)
>      (name "qtsensors")
> @@ -1715,7 +1750,7 @@ (define-public qtmultimedia-5
>  (define-public qtshadertools
>    (package
>      (name "qtshadertools")
> -    (version "6.5.2")
> +    (version "6.6.2")
>      (source (origin
>                (method url-fetch)
>                (uri (qt-url name version))
> @@ -1723,7 +1758,7 @@ (define-public qtshadertools
>                ;; sources.
>                (sha256
>                 (base32
> -                "0g8aziqhds2fkx11y4p2akmyn2p1qqf2fjxv72f9pibnhpdv0gya"))))
> +                "0bxrczs9nw6az2p4n8x0f660vsmxxynx4iqgj75l4zsfzzbym2v2"))))
>      (build-system cmake-build-system)
>      (arguments
>       (list
> @@ -1744,13 +1779,13 @@ (define-public qtshadertools
>  (define-public qtmultimedia
>    (package
>      (name "qtmultimedia")
> -    (version "6.5.2")
> +    (version "6.6.2")
>      (source (origin
>                (method url-fetch)
>                (uri (qt-url name version))
>                (sha256
>                 (base32
> -                "0xc9k4mlncscxqbp8q46yjd89k4jb8j0ggbi5ad874lycym013wl"))
> +                "1v0430jnv97ws6cizn9mi8zr9hcg7rixd0jg7smhdq8apacjb572"))
>                (modules '((guix build utils)))
>                (snippet
>                 '(begin
> @@ -1775,7 +1810,10 @@ (define-public qtmultimedia
>                ;; session bus, which requires an X11 server, and then is still
>                ;; unhappy).
>                (substitute* "tests/auto/CMakeLists.txt"
> -                (("add_subdirectory\\(integration)") ""))))
> +                (("add_subdirectory\\(integration)") ""))
> +              ;; fail on offscreen rendering

For long-term maintenance, I like to mention the name of the failing
test in the message, as when more such tests are skipped later, it
becomes unclear.  E.g.:  'The "qvideoframecolormanagement" tests fail
with an 'offscreen rendering' error.

> +              (substitute* "tests/auto/unit/multimedia/CMakeLists.txt"
> +                (("add_subdirectory\\(qvideoframecolormanagement\\)") ""))))
>            (add-before 'check 'prepare-for-tests
>              (lambda _
>                (setenv "QT_QPA_PLATFORM" "offscreen")))
> @@ -1865,13 +1903,13 @@ (define-public qtwayland-5
>  (define-public qtwayland
>    (package
>      (name "qtwayland")
> -    (version "6.5.2")
> +    (version "6.6.2")
>      (source
>       (origin
>         (method url-fetch)
>         (uri (qt-url name version))
>         (sha256
> -        (base32 "16iwar19sgjvxgmbr6hmd3hsxp6ahdjwl1lra2wapl3zzf3bw81h"))))
> +        (base32 "0y6x84ckcc53ddclnrlzs08b1kvw6saw9nim0hz4wc5fyz7dbkcv"))))
>      (build-system cmake-build-system)
>      (arguments
>       (list #:configure-flags #~(list "-DQT_BUILD_TESTS=ON")
> @@ -1888,6 +1926,7 @@ (define-public qtwayland
>                       (("QTRY_COMPARE\\(bufferSpy\\.size\\(\\), 1\\);") ""))))
>                 (add-before 'check 'set-test-environment
>                   (lambda _
> +                   (setenv "XDG_RUNTIME_DIR" (getcwd))
>                     ;; Do not fail just because /etc/machine-id is missing.
>                     (setenv "DBUS_FATAL_WARNINGS" "0")
>                     ;; Make Qt render "offscreen", required for tests.
> @@ -1996,13 +2035,13 @@ (define-public qtwebchannel-5
>  (define-public qtwebchannel
>    (package
>      (name "qtwebchannel")
> -    (version "6.5.2")
> +    (version "6.6.2")
>      (source (origin
>                (method url-fetch)
>                (uri (qt-url name version))
>                (sha256
>                 (base32
> -                "0qwfnwva7v5f2g5is17yy66mnmc9c1yf9aagaw5qanskdvxdk261"))))
> +                "1incvisc3j758b4k82vnwci8j1bba8zf6xgmgcrsm553k4wpsz1x"))))
>      (build-system cmake-build-system)
>      (arguments
>       (list
> @@ -2080,13 +2119,13 @@ (define-public qtwebview
>  (define-public qtlanguageserver
>    (package
>      (name "qtlanguageserver")
> -    (version "6.5.2")
> +    (version "6.6.2")
>      (source (origin
>                (method url-fetch)
>                (uri (qt-url name version))
>                (sha256
>                 (base32
> -                "196iicwpqca2ydpca41qs6aqxxq8ycknw6lm2v00h1w3m86frdbk"))))
> +                "1bgazi44mwac20biybhp21icgwa8k7jd295j8jsfgzxbw12lq7y3"))))
>      (build-system cmake-build-system)
>      (arguments
>       (list #:phases #~(modify-phases %standard-phases
> @@ -2129,13 +2168,13 @@ (define-public qtlocation
>  (define-public qtlottie
>    (package
>      (name "qtlottie")
> -    (version "6.5.2")
> +    (version "6.6.2")
>      (source (origin
>                (method url-fetch)
>                (uri (qt-url name version))
>                (sha256
>                 (base32
> -                "16z8fhaa40ig0cggb689zf8j3cid6fk6pmh91b8342ymy1fdqfh0"))))
> +                "1hqhp55jfasavk7p8xb0srbc6lnk70w2q0x4iwn28z5s5kd1cvi7"))))
>      (build-system cmake-build-system)
>      (arguments
>       (list
> @@ -2193,13 +2232,13 @@ (define-public qttools-5
>  (define-public qttools
>    (package
>      (name "qttools")
> -    (version "6.5.2")
> +    (version "6.6.2")
>      (source (origin
>                (method url-fetch)
>                (uri (qt-url name version))
>                (sha256
>                 (base32
> -                "0ha3v488vnm4pgdpyjgf859sak0z2fwmbgcyivcd93qxflign7sm"))))
> +                "0ij7djy06xi4v5v29fh31gqq5rnc12vviv3qg3vqf4hiaagrxm76"))))
>      (build-system cmake-build-system)
>      (arguments
>       (list
> @@ -2220,7 +2259,7 @@ (define-public qttools
>      (native-inputs (list perl qtdeclarative vulkan-headers))
>      ;; Use clang-15, which is built using as a single shared library, which is
>      ;; what the build system of qttools expects.
> -    (inputs (list clang-15 libxkbcommon mesa qtbase))
> +    (inputs (list clang-15 libxkbcommon mesa qtbase `(,zstd "lib")))
>      (home-page (package-home-page qtbase))
>      (synopsis "Qt Tools and Designer modules")
>      (description "The Qt Tools module provides a set of applications to browse
> @@ -2233,13 +2272,13 @@ (define-public qttools
>  (define-public qttranslations
>    (package
>      (name "qttranslations")
> -    (version "6.5.2")
> +    (version "6.6.2")
>      (source (origin
>                (method url-fetch)
>                (uri (qt-url name version))
>                (sha256
>                 (base32
> -                "1sxy2ljn5ajvn4yjb8fx86l56viyvqh5r9hf5x67azkmgrilaz1k"))))
> +                "0xqcad8aa9lp6wzh1rs46id6r60zdw82qj3bq9k2b89sxy8c0fna"))))
>      (build-system cmake-build-system)
>      (arguments (list #:tests? #f))
>      (native-inputs (list qtbase qttools))
> @@ -2391,13 +2430,13 @@ (define-public qtscxml
>  (define-public qtpositioning
>    (package
>      (name "qtpositioning")
> -    (version "6.5.2")
> +    (version "6.6.2")
>      (source (origin
>                (method url-fetch)
>                (uri (qt-url name version))
>                (sha256
>                 (base32
> -                "1yhlfs8izc054qv1krf5qv6zzjlvmz013h74fwamn74dfh1kyjbh"))))
> +                "1qn31vps9dj4g8m7d195qlsyj3p4dfqqszdc6yqq097dq5y5d9sd"))))
>      (build-system cmake-build-system)
>      (arguments
>       (list
> @@ -2504,13 +2543,13 @@ (define-public qtnetworkauth-5
>  (define-public qtnetworkauth
>    (package
>      (name "qtnetworkauth")
> -    (version "6.5.2")
> +    (version "6.6.2")
>      (source (origin
>                (method url-fetch)
>                (uri (qt-url name version))
>                (sha256
>                 (base32
> -                "0g18kh3zhcfi9ni8cqbbjdc1l6jf99ijv5shcl42jk6219b4pk2f"))))
> +                "1lijsdwbj8gscfllmp358n5ysa8pvhx2msh7gpxvb4x81daxbg9j"))))
>      (build-system cmake-build-system)
>      (arguments (list #:configure-flags #~(list "-DQT_BUILD_TESTS=ON")))
>      (native-inputs (list perl))
> @@ -2524,13 +2563,13 @@ (define-public qtnetworkauth
>  (define-public qtremoteobjects
>    (package
>      (name "qtremoteobjects")
> -    (version "6.5.2")
> +    (version "6.6.2")
>      (source (origin
>                (method url-fetch)
>                (uri (qt-url name version))
>                (sha256
>                 (base32
> -                "0k29sk02n54vj1w6vh6xycsjpyfqlijc13fnxh1q7wpgg4gizx60"))))
> +                "0fbkjzykxpkz8myr6dy588gcmhyy3lar17v78zfam8kyxq7s5qxa"))))
>      (build-system cmake-build-system)
>      (arguments
>       (list
> @@ -2558,7 +2597,7 @@ (define-public qtremoteobjects
>      (home-page (package-home-page qtbase))
>      (license (package-license qtbase))))


The above LGTM.

> -(define-public qtspeech
> +(define-public qtspeech-5
>    (package
>      (inherit qtsvg-5)
>      (name "qtspeech")
> @@ -2583,6 +2622,38 @@ (define-public qtspeech
>  In such a scenario, the messaging application can read out the incoming
>  message.")))
>
> +(define-public qtspeech
> +  (package
> +    (inherit qtspeech-5)
> +    (name "qtspeech")
> +    (version "6.6.2")
> +    (source (origin
> +              (method url-fetch)
> +              (uri (qt-url name version))
> +              (sha256
> +               (base32
> +                "1qvf3p2p1pc5fw40d8zq0iawaaqkc0dp5yx85b1dnw1j809bn8y0"))))
> +    (build-system qt-build-system)
> +    (arguments
> +     (list #:phases
> +           #~(modify-phases %standard-phases
> +               (delete 'check)               ;move after the install phase
> +               (add-after 'install 'check
> +                 (assoc-ref %standard-phases 'check))
> +               (add-before 'check 'prepare-for-tests
> +                 (lambda* (#:key outputs #:allow-other-keys)
> +                   (setenv "QML2_IMPORT_PATH"
> +                           (string-append (assoc-ref outputs "out")
> +                                          "/lib/qt6/qml:"
> +                                          (getenv "QML2_IMPORT_PATH")))))
> +               (add-after 'install 'delete-installed-tests
> +                 (lambda _
> +                   (delete-file-recursively
> +                    (string-append #$output "/tests")))))))
> +    (native-inputs '())
> +    (propagated-inputs (list qtmultimedia))
> +    (inputs (list qtbase qtdeclarative))))

This Qt 6 package inherits from its Qt 5 variant.  I think it should be
the other way around, so that when the time comes, Qt 5 packages can be
simply removed without further complications.

>  (define-public qtvirtualkeyboard-5
>    (package
>      (inherit qtsvg-5)
> @@ -3042,14 +3113,14 @@ (define-public qtwebengine-5
>  (define-public qtwebengine
>    (package
>      (name "qtwebengine")
> -    (version "6.5.3")
> +    (version "6.6.2")
>      (source
>       (origin
>         (method url-fetch)
>         (uri (qt-url name version))
>         (sha256
>          (base32
> -         "1ra5hyyg4vymp8pgzv08smjc3fl1axdavnkpj1i5zxym1ndww513"))
> +         "15h3hniszfkxv2vnn3fnbgbar8wb41ypgn4b4iz4iy6csar8f7fn"))
>         (modules '((ice-9 ftw)
>                    (ice-9 match)
>                    (srfi srfi-1)
> @@ -3081,12 +3152,11 @@ (define-public qtwebengine
>                      "net/third_party/uri_template"
>                      "third_party/abseil-cpp"
>                      "third_party/angle"
> -                    "third_party/angle/src/common/third_party/base"
> -                    "third_party/angle/src/common/third_party/smhasher"
>                      "third_party/angle/src/common/third_party/xxhash"
>                      "third_party/angle/src/third_party/libXNVCtrl" ;Expat
> -                    "third_party/angle/src/third_party/trace_event"
>                      "third_party/angle/src/third_party/volk"
> +                    "third_party/angle/src/third_party/systeminfo"
> +                    "third_party/angle/src/third_party/ceval"
>                      "third_party/axe-core"
>                      "third_party/blink"
>                      "third_party/boringssl"
> @@ -3118,8 +3188,6 @@ (define-public qtwebengine
>                      "third_party/dawn/third_party/khronos"
>                      "third_party/devtools-frontend"
>                      "third_party/devtools-frontend/src/front_end/third_party/i18n"
> -                    "third_party/devtools-frontend/src/front_end/third_party/acorn"
> -                    "third_party/devtools-frontend/src/front_end/third_party/acorn-loose"
>                      "third_party/devtools-frontend/src/front_end/third_party/\
>  additional_readme_paths.json"
>                      "third_party/devtools-frontend/src/front_end/third_party/axe-core"
> @@ -3130,11 +3198,17 @@ (define-public qtwebengine
>                      "third_party/devtools-frontend/src/front_end/third_party/i18n"
>                      "third_party/devtools-frontend/src/front_end/third_party/intl-messageformat"
>                      "third_party/devtools-frontend/src/front_end/third_party/lighthouse"
> -                    "third_party/devtools-frontend/src/front_end/third_party/lit-html"
> +                    "third_party/devtools-frontend/src/front_end/third_party/lit"
> +                    "third_party/devtools-frontend/src/front_end/third_party/acorn"
>                      "third_party/devtools-frontend/src/front_end/third_party/marked"
>                      "third_party/devtools-frontend/src/front_end/third_party/puppeteer"
> +                    "third_party/devtools-frontend/src/front_end/third_party/\
> +puppeteer/package/lib/esm/third_party/mitt"
> +                    "third_party/devtools-frontend/src/front_end/third_party/vscode.web-custom-data"

This line is too long; it can be broken with a backslash escape in the
middle of the string.

> +                    "third_party/devtools-frontend/src/third_party/pyjson5"
>                      "third_party/devtools-frontend/src/front_end/third_party/wasmparser"
>                      "third_party/devtools-frontend/src/third_party/typescript"
> +                    "third_party/devtools-frontend/src/third_party/i18n"
>                      "third_party/distributed_point_functions"
>                      "third_party/dom_distiller_js"
>                      "third_party/emoji-segmenter"
> @@ -3177,7 +3251,6 @@ (define-public qtwebengine
>                      "third_party/libgav1"
>                      "third_party/libjingle_xmpp"
>                      "third_party/libjpeg_turbo"
> -                    "third_party/libjxl"
>                      "third_party/libpng" ;TODO: make pdfium use system version
>                      "third_party/libsecret" ;LGPL2.1+
>                      "third_party/libsrtp"
> @@ -3196,6 +3269,7 @@ (define-public qtwebengine
>                      "third_party/lss"
>                      "third_party/mako"
>                      "third_party/markupsafe"
> +                    "third_party/material_color_utilities" ;ASL2.0
>                      "third_party/mesa_headers"
>                      "third_party/metrics_proto"
>                      "third_party/minigbm" ;BSD-3
> @@ -3215,6 +3289,7 @@ (define-public qtwebengine
>                      "third_party/opus/src/include/opus_multistream.h"
>                      "third_party/opus/src/include/opus_types.h"
>                      "third_party/ots"
> +                    "third_party/flac"
>                      "third_party/pdfium"
>                      "third_party/pdfium/third_party/agg23"
>                      "third_party/pdfium/third_party/base"
> @@ -3222,7 +3297,6 @@ (define-public qtwebengine
>                      "third_party/pdfium/third_party/freetype"
>                      "third_party/pdfium/third_party/lcms"
>                      "third_party/pdfium/third_party/libopenjpeg"
> -                    "third_party/pdfium/third_party/libpng16"
>                      "third_party/pdfium/third_party/libtiff"
>                      "third_party/pdfium/third_party/skia_shared"
>                      "third_party/pdfium/third_party/freetype/include/pstables.h" ;FreeType
> @@ -3292,6 +3366,7 @@ (define-public qtwebengine
>                      "v8/src/third_party/utf8-decoder"
>                      "v8/src/third_party/valgrind"
>                      "v8/third_party/inspector_protocol"
> +                    "v8/third_party/glibc/src/sysdeps/ieee754/dbl-64"
>                      "v8/third_party/v8/builtins")))
>
>               (with-directory-excursion "src/3rdparty"
> @@ -3359,14 +3434,17 @@ (define-public qtwebengine
>                "-DQT_FEATURE_webengine_system_libjpeg=ON"
>                "-DQT_FEATURE_webengine_system_libpci=ON"
>                "-DQT_FEATURE_webengine_system_libpng=ON"
> +              "-DQT_FEATURE_webengine_system_libtiff=ON"
>                "-DQT_FEATURE_webengine_system_libwebp=ON"
>                "-DQT_FEATURE_webengine_system_libxml=ON"
> -              "-DQT_FEATURE_webengine_system_libxslt=ON"
>                "-DQT_FEATURE_webengine_system_minizip=ON"
>                "-DQT_FEATURE_webengine_system_opus=ON"
>                "-DQT_FEATURE_webengine_system_pulseaudio=ON"
>                "-DQT_FEATURE_webengine_system_re2=ON"
> -              "-DQT_FEATURE_webengine_system_zlib=ON")
> +              "-DQT_FEATURE_webengine_system_zlib=ON"
> +              "-DQT_FEATURE_webengine_system_glib=ON"
> +              "-DQT_FEATURE_webengine_system_libvpx=ON"
> +              "-DQT_FEATURE_webengine_system_snappy=ON")
>        #:phases
>        #~(modify-phases %standard-phases
>            (add-after 'unpack 'patch-paths
> @@ -3416,7 +3494,11 @@ (define-public qtwebengine
>                           '()))))
>            (replace 'install
>              (lambda _
> -              (invoke "cmake" "--install" "."))))))
> +              (invoke "cmake" "--install" ".")))
> +          (add-after 'install 'delete-installed-tests
> +                 (lambda _
> +                   (delete-file-recursively
> +                    (string-append #$output "/tests")))))))
>      (native-inputs
>       (modify-inputs (package-native-inputs qtwebengine-5)
>         (delete "python2" "python2-six")
> @@ -3684,7 +3766,7 @@ (define-public python-pyqt
>         ("qtdeclarative-5" ,qtdeclarative-5)
>         ("qtlocation" ,qtlocation)
>         ("qtmultimedia-5" ,qtmultimedia-5)
> -       ("qtsensors" ,qtsensors)
> +       ("qtsensors" ,qtsensors-5)
>         ("qtserialport" ,qtserialport)
>         ("qtsvg-5" ,qtsvg-5)
>         ("qttools-5" ,qttools-5)
> @@ -4498,8 +4580,8 @@ (define-public python-pyside-2
>             qtquickcontrols2-5
>             qtscript
>             qtscxml
> -           qtsensors
> -           qtspeech
> +           qtsensors-5
> +           qtspeech-5
>             qtsvg-5
>             qttools-5
>             qtwebchannel-5

That LGTM.  In a separate commit, we could modernize webengine to remove
legacy input labels, unless they are used in the phases (and this can't
be expressed in a new way such as via 'search-input-file').

> @@ -5086,7 +5168,7 @@ (define-public clazy
>  (define-public qt-creator
>    (package
>      (name "qt-creator")
> -    (version "12.0.1")
> +    (version "12.0.2")
>      (source (origin
>                (method url-fetch)
>                (uri (string-append
> @@ -5109,7 +5191,7 @@ (define-public qt-creator
>                              ((".*marketplace/marketplace.qbs.*") ""))))
>                (sha256
>                 (base32
> -                "04h35za3gliai5djxwmzqrbih2g26lcv68pp4wvljkdwkcjsscvb"))))
> +                "1lgk547pvg31zzqra7gn9gsszm5wrwxiw06crbr5n2kqfavk9r22"))))
>      (build-system qt-build-system)
>      (arguments
>       (list

Can be in its own commit as mentioned earlier.

Thanks for this series!  It seems well crafted.  My earlier comments are
mostly cosmetic/nitpicks; so hopefully it's not too much work to
implement.  The more annoying part may be to separate your commits a bit
more.  For this time around, I think it's OK to group the Qt 6 upgrades
together, unless you want to try the automatic updates tooling I've
hinted at the beginning and re-apply the additional changes on top, but
I don't think it's worth it.

Thank you!  I'll be expecting a v4 :-)

Maxim

Message #86 received at 69628 <at> debbugs.gnu.org (full text, mbox):

From: Zheng Junjie <zhengjunjie <at> iscas.ac.cn>
To: 69628 <at> debbugs.gnu.org
Subject: [PATCH qt-team v4 00/24] qt: Update to 6.6.2.
Date: Wed, 13 Mar 2024 16:57:54 +0800

Hello, This is v4 patch. Thanks for the comment.
This version should fix question, and use etc/committer.scm
And add missing python-{shiboken,pyside}-6.

Zheng Junjie (24):
  gnu: qtbase: Update to 6.6.2.
  gnu: qt5compat: Update to 6.6.2.
  gnu: qtsvg: Update to 6.6.2.
  gnu: qtimageformats: Update to 6.6.2.
  gnu: qtdeclarative: Update to 6.6.2.
  gnu: qtwebsockets: Update to 6.6.2.
  gnu: qtshadertools: Update to 6.6.2.
  gnu: qtmultimedia: Update to 6.6.2.
  gnu: qtwayland: Update to 6.6.2.
  gnu: qtwebchannel: Update to 6.6.2.
  gnu: qtlanguageserver: Update to 6.6.2.
  gnu: qtlottie: Update to 6.6.2.
  gnu: qttools: Update to 6.6.2.
  gnu: qttranslations: Update to 6.6.2.
  gnu: qtpositioning: Update to 6.6.2.
  gnu: qtnetworkauth: Update to 6.6.2.
  gnu: qtremoteobjects: Update to 6.6.2.
  gnu: qtwebengine: Update to 6.6.2.
  gnu: python-{shiboken,pyside}-6: Update to 6.6.2.
  gnu: qtsensors: Rename package to qtsensors-5.
  gnu: Add qtsensors.
  gnu: qtspeech: Rename package to qtspeech-5.
  gnu: Add qtspeech.
  gnu: qt-creator: Update to 12.0.2.

 gnu/local.mk                                  |   3 +-
 gnu/packages/education.scm                    |   3 +-
 gnu/packages/games.scm                        |   4 +-
 gnu/packages/geo.scm                          |   3 +-
 gnu/packages/kde-frameworks.scm               |   6 +-
 gnu/packages/kde-pim.scm                      |   8 +-
 gnu/packages/kde-plasma.scm                   |   2 +-
 gnu/packages/kde-utils.scm                    |   4 +-
 gnu/packages/kde.scm                          |   2 +-
 .../patches/qtbase-find-tools-in-PATH.patch   |  49 ++++
 .../patches/qtbase-qmake-fix-includedir.patch |  29 ++
 gnu/packages/patches/qtbase-use-TZDIR.patch   | 141 ----------
 .../qtdeclarative-disable-qmlcache.patch      |  27 +-
 gnu/packages/qt.scm                           | 251 +++++++++++++-----
 gnu/packages/radio.scm                        |   3 +-
 15 files changed, 303 insertions(+), 232 deletions(-)
 create mode 100644 gnu/packages/patches/qtbase-find-tools-in-PATH.patch
 create mode 100644 gnu/packages/patches/qtbase-qmake-fix-includedir.patch
 delete mode 100644 gnu/packages/patches/qtbase-use-TZDIR.patch


base-commit: 447e9c96259e8fa15a828de9b2dd3400e2ffafe6
-- 
2.41.0

Message #89 received at 69628 <at> debbugs.gnu.org (full text, mbox):

From: Zheng Junjie <zhengjunjie <at> iscas.ac.cn>
To: 69628 <at> debbugs.gnu.org
Subject: [PATCH qt-team v4 02/24] gnu: qt5compat: Update to 6.6.2.
Date: Wed, 13 Mar 2024 16:57:56 +0800

* gnu/packages/qt.scm (qt5compat): Update to 6.6.2.

Change-Id: I9bdb9fbe880cabbc39d7928340e54ba2793131db
---
 gnu/packages/qt.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index e195df670d..ffd3539e77 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1101,13 +1101,13 @@ (define-public qt3d-5
 (define-public qt5compat
   (package
     (name "qt5compat")
-    (version "6.5.2")
+    (version "6.6.2")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "1i4izabbmf1dayzlj1miz7hsm4cy0qb7i72pwyl2fp05w8pf9axr"))))
+                "0rqr34lqf4mjdgjj09wzlvkxfknz8arjl9p30xpqbr2qfsmhhyz0"))))
     (build-system cmake-build-system)
     (arguments
      (list
-- 
2.41.0

Message #92 received at 69628 <at> debbugs.gnu.org (full text, mbox):

From: Zheng Junjie <zhengjunjie <at> iscas.ac.cn>
To: 69628 <at> debbugs.gnu.org
Subject: [PATCH qt-team v4 03/24] gnu: qtsvg: Update to 6.6.2.
Date: Wed, 13 Mar 2024 16:57:57 +0800

* gnu/packages/qt.scm (qtsvg): Update to 6.6.2.

Change-Id: Ibd80b03bb776cdbe2084e8be65ddd1ccc0edb6ad
---
 gnu/packages/qt.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index ffd3539e77..fa1c11b406 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1199,13 +1199,13 @@ (define-public qtsvg-5
 (define-public qtsvg
   (package
     (name "qtsvg")
-    (version "6.5.2")
+    (version "6.6.2")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "18v337lfk8krg0hff5jx6fi7gn6x3djn03x3psrhlbmgjc8crd28"))))
+                "10c1dmbv5d39n1q4m67gf2h4n6wfkzrlyk8plnxbyhhvxxcis8ss"))))
     (build-system cmake-build-system)
     (arguments
      (list
-- 
2.41.0

Message #95 received at 69628 <at> debbugs.gnu.org (full text, mbox):

From: Zheng Junjie <zhengjunjie <at> iscas.ac.cn>
To: 69628 <at> debbugs.gnu.org
Subject: [PATCH qt-team v4 11/24] gnu: qtlanguageserver: Update to 6.6.2.
Date: Wed, 13 Mar 2024 16:58:05 +0800

* gnu/packages/qt.scm (qtlanguageserver): Update to 6.6.2.

Change-Id: I08eb5329f3ee52b86002a9f3eb75f5b8672972d9
---
 gnu/packages/qt.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 70d7ed7c5d..55f8424486 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -2114,13 +2114,13 @@ (define-public qtwebview
 (define-public qtlanguageserver
   (package
     (name "qtlanguageserver")
-    (version "6.5.2")
+    (version "6.6.2")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "196iicwpqca2ydpca41qs6aqxxq8ycknw6lm2v00h1w3m86frdbk"))))
+                "1bgazi44mwac20biybhp21icgwa8k7jd295j8jsfgzxbw12lq7y3"))))
     (build-system cmake-build-system)
     (arguments
      (list #:phases #~(modify-phases %standard-phases
-- 
2.41.0

Message #98 received at 69628 <at> debbugs.gnu.org (full text, mbox):

From: Zheng Junjie <zhengjunjie <at> iscas.ac.cn>
To: 69628 <at> debbugs.gnu.org
Subject: [PATCH qt-team v4 07/24] gnu: qtshadertools: Update to 6.6.2.
Date: Wed, 13 Mar 2024 16:58:01 +0800

* gnu/packages/qt.scm (qtshadertools): Update to 6.6.2.

Change-Id: Iaba081f9a576c12b9e9cb4a8002376c8326a30cb
---
 gnu/packages/qt.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 4888df1fe0..ffd1064223 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1744,7 +1744,7 @@ (define-public qtmultimedia-5
 (define-public qtshadertools
   (package
     (name "qtshadertools")
-    (version "6.5.2")
+    (version "6.6.2")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
@@ -1752,7 +1752,7 @@ (define-public qtshadertools
               ;; sources.
               (sha256
                (base32
-                "0g8aziqhds2fkx11y4p2akmyn2p1qqf2fjxv72f9pibnhpdv0gya"))))
+                "0bxrczs9nw6az2p4n8x0f660vsmxxynx4iqgj75l4zsfzzbym2v2"))))
     (build-system cmake-build-system)
     (arguments
      (list
-- 
2.41.0

Message #101 received at 69628 <at> debbugs.gnu.org (full text, mbox):

From: Zheng Junjie <zhengjunjie <at> iscas.ac.cn>
To: 69628 <at> debbugs.gnu.org
Subject: [PATCH qt-team v4 12/24] gnu: qtlottie: Update to 6.6.2.
Date: Wed, 13 Mar 2024 16:58:06 +0800

* gnu/packages/qt.scm (qtlottie): Update to 6.6.2.

Change-Id: I82903a9593c7536bf9f38165b596774cf88994c6
---
 gnu/packages/qt.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 55f8424486..fe0992b617 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -2163,13 +2163,13 @@ (define-public qtlocation
 (define-public qtlottie
   (package
     (name "qtlottie")
-    (version "6.5.2")
+    (version "6.6.2")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "16z8fhaa40ig0cggb689zf8j3cid6fk6pmh91b8342ymy1fdqfh0"))))
+                "1hqhp55jfasavk7p8xb0srbc6lnk70w2q0x4iwn28z5s5kd1cvi7"))))
     (build-system cmake-build-system)
     (arguments
      (list
-- 
2.41.0

Message #104 received at 69628 <at> debbugs.gnu.org (full text, mbox):

From: Zheng Junjie <zhengjunjie <at> iscas.ac.cn>
To: 69628 <at> debbugs.gnu.org
Subject: [PATCH qt-team v4 06/24] gnu: qtwebsockets: Update to 6.6.2.
Date: Wed, 13 Mar 2024 16:58:00 +0800

* gnu/packages/qt.scm (qtwebsockets): Update to 6.6.2.

Change-Id: I10bfabe99fd53b47e2ec1dc50757ad89fd3f3b96
---
 gnu/packages/qt.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 7160beb702..4888df1fe0 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1628,13 +1628,13 @@ (define-public qtwebsockets-5
 (define-public qtwebsockets
   (package
     (name "qtwebsockets")
-    (version "6.5.2")
+    (version "6.6.2")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "0xjwifxj2ssshys6f6kjr6ri2vq1wfshxky6mcscjm7vvyqdfjr0"))))
+                "1y9q8jmspxbfxf07jdcg4n8zwmchccyzp0z68fxr0hnvr2dymrn0"))))
     (build-system cmake-build-system)
     (arguments
      (list
-- 
2.41.0

Message #107 received at 69628 <at> debbugs.gnu.org (full text, mbox):

From: Zheng Junjie <zhengjunjie <at> iscas.ac.cn>
To: 69628 <at> debbugs.gnu.org
Subject: [PATCH qt-team v4 04/24] gnu: qtimageformats: Update to 6.6.2.
Date: Wed, 13 Mar 2024 16:57:58 +0800

* gnu/packages/qt.scm (qtimageformats): Update to 6.6.2.

Change-Id: I111f67258116f1bd4e0e3029d38afaf0ed024435
---
 gnu/packages/qt.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index fa1c11b406..4bbdb53f07 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1258,14 +1258,14 @@ (define-public qtimageformats-5
 (define-public qtimageformats
   (package
     (name "qtimageformats")
-    (version "6.5.2")
+    (version "6.6.2")
     (source (origin
               (inherit (package-source qtimageformats-5))
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "0hv7mkn72126rkhy5gmjmbvzy7v17mkk3q2pkmzy99f64j4w1q5a"))))
+                "1cvwm0hnspglydms6qhcp5g0ayz5pamigl52kz8km66l6s8lqn3i"))))
     (build-system cmake-build-system)
     (arguments
      (list
-- 
2.41.0

Message #110 received at 69628 <at> debbugs.gnu.org (full text, mbox):

From: Zheng Junjie <zhengjunjie <at> iscas.ac.cn>
To: 69628 <at> debbugs.gnu.org
Subject: [PATCH qt-team v4 08/24] gnu: qtmultimedia: Update to 6.6.2.
Date: Wed, 13 Mar 2024 16:58:02 +0800

* gnu/packages/qt.scm (qtmultimedia): Update to 6.6.2.
[arguments]<#:phases>: Adjust 'disable-integration-tests phase.

Change-Id: I8dd6e4767b40436199e4d45a0b75c4bd3136b386
---
 gnu/packages/qt.scm | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index ffd1064223..ce038082e8 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1773,13 +1773,13 @@ (define-public qtshadertools
 (define-public qtmultimedia
   (package
     (name "qtmultimedia")
-    (version "6.5.2")
+    (version "6.6.2")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "0xc9k4mlncscxqbp8q46yjd89k4jb8j0ggbi5ad874lycym013wl"))
+                "1v0430jnv97ws6cizn9mi8zr9hcg7rixd0jg7smhdq8apacjb572"))
               (modules '((guix build utils)))
               (snippet
                '(begin
@@ -1804,7 +1804,11 @@ (define-public qtmultimedia
               ;; session bus, which requires an X11 server, and then is still
               ;; unhappy).
               (substitute* "tests/auto/CMakeLists.txt"
-                (("add_subdirectory\\(integration)") ""))))
+                (("add_subdirectory\\(integration)") ""))
+              ;; The "qvideoframecolormanagement" tests fail with an
+              ;; 'offscreen rendering' error.
+              (substitute* "tests/auto/unit/multimedia/CMakeLists.txt"
+                (("add_subdirectory\\(qvideoframecolormanagement\\)") ""))))
           (add-before 'check 'prepare-for-tests
             (lambda _
               (setenv "QT_QPA_PLATFORM" "offscreen")))
-- 
2.41.0

Message #113 received at 69628 <at> debbugs.gnu.org (full text, mbox):

From: Zheng Junjie <zhengjunjie <at> iscas.ac.cn>
To: 69628 <at> debbugs.gnu.org
Subject: [PATCH qt-team v4 15/24] gnu: qtpositioning: Update to 6.6.2.
Date: Wed, 13 Mar 2024 16:58:09 +0800

* gnu/packages/qt.scm (qtpositioning): Update to 6.6.2.

Change-Id: I86ba435616033922d9a26f86614ffcfd0cb6ef03
---
 gnu/packages/qt.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index b43d9ff4cb..c2bd0ef937 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -2425,13 +2425,13 @@ (define-public qtscxml
 (define-public qtpositioning
   (package
     (name "qtpositioning")
-    (version "6.5.2")
+    (version "6.6.2")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "1yhlfs8izc054qv1krf5qv6zzjlvmz013h74fwamn74dfh1kyjbh"))))
+                "1qn31vps9dj4g8m7d195qlsyj3p4dfqqszdc6yqq097dq5y5d9sd"))))
     (build-system cmake-build-system)
     (arguments
      (list
-- 
2.41.0

Message #116 received at 69628 <at> debbugs.gnu.org (full text, mbox):

From: Zheng Junjie <zhengjunjie <at> iscas.ac.cn>
To: 69628 <at> debbugs.gnu.org
Subject: [PATCH qt-team v4 14/24] gnu: qttranslations: Update to 6.6.2.
Date: Wed, 13 Mar 2024 16:58:08 +0800

* gnu/packages/qt.scm (qttranslations): Update to 6.6.2.

Change-Id: I1136bf3027303ea79a872605189290ca28670ce8
---
 gnu/packages/qt.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 1c793cc865..b43d9ff4cb 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -2267,13 +2267,13 @@ (define-public qttools
 (define-public qttranslations
   (package
     (name "qttranslations")
-    (version "6.5.2")
+    (version "6.6.2")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "1sxy2ljn5ajvn4yjb8fx86l56viyvqh5r9hf5x67azkmgrilaz1k"))))
+                "0xqcad8aa9lp6wzh1rs46id6r60zdw82qj3bq9k2b89sxy8c0fna"))))
     (build-system cmake-build-system)
     (arguments (list #:tests? #f))
     (native-inputs (list qtbase qttools))
-- 
2.41.0

Message #119 received at 69628 <at> debbugs.gnu.org (full text, mbox):

From: Zheng Junjie <zhengjunjie <at> iscas.ac.cn>
To: 69628 <at> debbugs.gnu.org
Subject: [PATCH qt-team v4 13/24] gnu: qttools: Update to 6.6.2.
Date: Wed, 13 Mar 2024 16:58:07 +0800

* gnu/packages/qt.scm (qttools): Update to 6.6.2.
[inputs]: Add zstd:lib.
Change-Id: I8d5ea1b3135809e28e2d159e8050ee9642c66d27

Change-Id: I7b78392d11fc7d3e5e9319fd60f4fcf57b0e9c2d
---
 gnu/packages/qt.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index fe0992b617..1c793cc865 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -2227,13 +2227,13 @@ (define-public qttools-5
 (define-public qttools
   (package
     (name "qttools")
-    (version "6.5.2")
+    (version "6.6.2")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "0ha3v488vnm4pgdpyjgf859sak0z2fwmbgcyivcd93qxflign7sm"))))
+                "0ij7djy06xi4v5v29fh31gqq5rnc12vviv3qg3vqf4hiaagrxm76"))))
     (build-system cmake-build-system)
     (arguments
      (list
@@ -2254,7 +2254,7 @@ (define-public qttools
     (native-inputs (list perl qtdeclarative vulkan-headers))
     ;; Use clang-15, which is built using as a single shared library, which is
     ;; what the build system of qttools expects.
-    (inputs (list clang-15 libxkbcommon mesa qtbase))
+    (inputs (list clang-15 libxkbcommon mesa qtbase `(,zstd "lib")))
     (home-page (package-home-page qtbase))
     (synopsis "Qt Tools and Designer modules")
     (description "The Qt Tools module provides a set of applications to browse
-- 
2.41.0

Message #122 received at 69628 <at> debbugs.gnu.org (full text, mbox):

From: Zheng Junjie <zhengjunjie <at> iscas.ac.cn>
To: 69628 <at> debbugs.gnu.org
Subject: [PATCH qt-team v4 19/24] gnu: python-{shiboken,
 pyside}-6: Update to 6.6.2.
Date: Wed, 13 Mar 2024 16:58:13 +0800

* gnu/packages/qt.scm (python-shiboken-6, python-pyside-6): Update to 6.6.2.
(python-shiboken-6)[properties]: Set upstream-name.
(python-pyside-6)[arguments]<#:phases>: Add 'set-rpath phase.

Change-Id: I098481f860c3bc97a629cca719305b2d00c3eace
---
 gnu/packages/qt.scm | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 053f589987..6b58fe2211 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -4498,7 +4498,7 @@ (define-public python-shiboken-6
   (package
     (inherit python-shiboken-2)
     (name "python-shiboken-6")
-    (version "6.5.2")
+    (version "6.6.2")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://qt/QtForPython/pyside6/PySide6-"
@@ -4506,7 +4506,7 @@ (define-public python-shiboken-6
                                   version ".tar.xz"))
               (sha256
                (base32
-                "1a0v9mjlcjbffm4lf5cfg45hvqai9654p95ygj5cjhfd9z8z3nwh"))))
+                "1w690jpxrski7c71gx05q5fvl2117lnjj5ih8iwckx3s9mlhnqhl"))))
     (build-system cmake-build-system)
     (inputs
      (modify-inputs (package-inputs python-shiboken-2)
@@ -4526,7 +4526,8 @@ (define-public python-shiboken-6
            "-DCMAKE_SKIP_RPATH=TRUE"
            (string-append "-DCMAKE_MODULE_LINKER_FLAGS=-Wl,-rpath="
                           #$output "/lib")
-           #$flags))))))
+           #$flags))))
+    (properties `((upstream-name . "pyside-setup")))))
 
 (define-public python-pyside-2
   (package
@@ -4668,6 +4669,11 @@ (define-public python-pyside-6
       #~(modify-phases %standard-phases
           (add-after 'unpack 'go-to-source-dir
             (lambda _ (chdir "sources/pyside6")))
+          (add-after 'go-to-source-dir 'set-rpath
+            (lambda _
+              (substitute* "CMakeLists.txt"
+                (("CMAKE_INSTALL_RPATH")
+                 (string-append "CMAKE_INSTALL_RPATH " #$output "/lib")))))
           (add-after 'go-to-source-dir 'fix-qt-module-detection
             (lambda _
               (substitute* "cmake/PySideHelpers.cmake"
-- 
2.41.0

Message #125 received at 69628 <at> debbugs.gnu.org (full text, mbox):

From: Zheng Junjie <zhengjunjie <at> iscas.ac.cn>
To: 69628 <at> debbugs.gnu.org
Subject: [PATCH qt-team v4 01/24] gnu: qtbase: Update to 6.6.2.
Date: Wed, 13 Mar 2024 16:57:55 +0800

* gnu/packages/qt.scm (qtbase): Update to 6.6.2.
[source]: Unbundle pcre2, md4c. Remove qtbase-use-TZDIR.patch. Add
qtbase-find-tools-in-PATH.patch,
qtbase-qmake-fix-includedir.patch,
[arguments]<#:phases>: Adjust 'patch-more-paths phase, skip tst_selftests test.
[inputs]: Add libb2

* gnu/packages/patches/qtbase-use-TZDIR.patch: Remove this.
* gnu/packages/patches/qtbase-find-tools-in-PATH.patch: New file.
* gnu/packages/patches/qtbase-qmake-fix-includedir.patch: New file.

* gnu/local.mk (dist_patch_DATA): Remove qtbase-use-TZDIR.patch.
Register qtbase-find-tools-in-PATH.patch,
qtbase-qmake-fix-includedir.patch.

Change-Id: I72af9c8f2e930bcae18f36ceca18a0a53f5c3e15
---
 gnu/local.mk                                  |   3 +-
 .../patches/qtbase-find-tools-in-PATH.patch   |  49 ++++++
 .../patches/qtbase-qmake-fix-includedir.patch |  29 ++++
 gnu/packages/patches/qtbase-use-TZDIR.patch   | 141 ------------------
 gnu/packages/qt.scm                           |  47 ++++--
 5 files changed, 117 insertions(+), 152 deletions(-)
 create mode 100644 gnu/packages/patches/qtbase-find-tools-in-PATH.patch
 create mode 100644 gnu/packages/patches/qtbase-qmake-fix-includedir.patch
 delete mode 100644 gnu/packages/patches/qtbase-use-TZDIR.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index e8b0a0e7be..0d8f4d28fe 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1951,10 +1951,11 @@ dist_patch_DATA =						\
   %D%/packages/patches/qemu-fix-agent-paths.patch 		\
   %D%/packages/patches/qrcodegen-cpp-make-install.patch		\
   %D%/packages/patches/qtbase-absolute-runpath.patch		\
+  %D%/packages/patches/qtbase-find-tools-in-PATH.patch		\
+  %D%/packages/patches/qtbase-qmake-fix-includedir.patch \
   %D%/packages/patches/qtbase-moc-ignore-gcc-macro.patch	\
   %D%/packages/patches/qtbase-qmake-use-libname.patch		\
   %D%/packages/patches/qtbase-5-use-TZDIR.patch			\
-  %D%/packages/patches/qtbase-use-TZDIR.patch			\
   %D%/packages/patches/qtscript-disable-tests.patch		\
   %D%/packages/patches/quagga-reproducible-build.patch          \
   %D%/packages/patches/quickswitch-fix-dmenu-check.patch	\
diff --git a/gnu/packages/patches/qtbase-find-tools-in-PATH.patch b/gnu/packages/patches/qtbase-find-tools-in-PATH.patch
new file mode 100644
index 0000000000..d5e38b09be
--- /dev/null
+++ b/gnu/packages/patches/qtbase-find-tools-in-PATH.patch
@@ -0,0 +1,49 @@
+Patch retrieved from NixOS
+
+https://github.com/NixOS/nixpkgs/blob/93ecdaa1f34354c9476062dc4fe323b442c087d5/pkgs/development/libraries/qt-6/patches/0006-qtbase-find-tools-in-PATH.patch
+
+From a8b9fae710a2bd5e743f5e16364eaa8c38dbd784 Mon Sep 17 00:00:00 2001
+From: rewine <luhongxu <at> deepin.org>
+Date: Wed, 29 Mar 2023 11:51:33 +0800
+Subject: [PATCH 06/11] qtbase-find-tools-in-PATH
+
+1. find qt's tools in `QTTOOLSPATH` env
+   qt assumes that all components use the same install prefix
+   we can't get the real prefix for qttools when build qtbase
+   we will add /libexec to `QTTOOLSPATH` in qtToolsHook
+   find_path will also search in 'PATH' by default
+   see `CMAKE_FIND_USE_SYSTEM_ENVIRONMENT_PATH`
+
+2. disable tool_dependencies_enabled
+   We can guarantee the build order of qt components in nixpkgs
+   tools in qttools always build before qtdoc
+   qdoc_bin is not a build target now, since we find it in `QTTOOLSPATH`
+---
+ cmake/QtDocsHelpers.cmake | 11 ++++++++---
+ 1 file changed, 8 insertions(+), 3 deletions(-)
+
+diff --git a/cmake/QtDocsHelpers.cmake b/cmake/QtDocsHelpers.cmake
+index 48ed5a324bf..91d8d41fb1f 100644
+--- a/cmake/QtDocsHelpers.cmake
++++ b/cmake/QtDocsHelpers.cmake
+@@ -47,9 +47,14 @@ function(qt_internal_add_docs)
+         set(doc_tools_libexec "${QT_BUILD_INTERNALS_RELOCATABLE_INSTALL_PREFIX}/${INSTALL_LIBEXECDIR}")
+     endif()
+ 
+-    set(qdoc_bin "${doc_tools_bin}/qdoc${CMAKE_EXECUTABLE_SUFFIX}")
+-    set(qtattributionsscanner_bin "${doc_tools_libexec}/qtattributionsscanner${CMAKE_EXECUTABLE_SUFFIX}")
+-    set(qhelpgenerator_bin "${doc_tools_libexec}/qhelpgenerator${CMAKE_EXECUTABLE_SUFFIX}")
++    set(tool_dependencies_enabled FALSE)
++
++    find_path(qdoc_path name qdoc PATHS ENV QTTOOLSPATH)
++    find_path(qtattributionsscanner_path name qtattributionsscanner PATHS ENV QTTOOLSPATH)
++    find_path(qhelpgenerator_path name qhelpgenerator PATHS ENV QTTOOLSPATH)
++    set(qdoc_bin "${qdoc_path}/qdoc${CMAKE_EXECUTABLE_SUFFIX}")
++    set(qtattributionsscanner_bin "${qtattributionsscanner_path}/qtattributionsscanner${CMAKE_EXECUTABLE_SUFFIX}")
++    set(qhelpgenerator_bin "${qhelpgenerator_path}/qhelpgenerator${CMAKE_EXECUTABLE_SUFFIX}")
+ 
+     get_target_property(target_type ${target} TYPE)
+     if (NOT target_type STREQUAL "INTERFACE_LIBRARY")
+-- 
+2.42.0
+
diff --git a/gnu/packages/patches/qtbase-qmake-fix-includedir.patch b/gnu/packages/patches/qtbase-qmake-fix-includedir.patch
new file mode 100644
index 0000000000..766689c4fd
--- /dev/null
+++ b/gnu/packages/patches/qtbase-qmake-fix-includedir.patch
@@ -0,0 +1,29 @@
+Patch retrieved from NixOS
+https://github.com/NixOS/nixpkgs/blob/93ecdaa1f34354c9476062dc4fe323b442c087d5/pkgs/development/libraries/qt-6/patches/0003-qtbase-qmake-fix-includedir-in-generated-pkg-config.patch
+
+From 6088085d3074316dd74639fc6c1233e5862aff11 Mon Sep 17 00:00:00 2001
+From: Nick Cao <nickcao <at> nichi.co>
+Date: Fri, 14 Apr 2023 09:34:46 +0800
+Subject: [PATCH 03/11] qtbase: qmake: fix includedir in generated pkg-config
+
+---
+ qmake/generators/makefile.cpp | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
+index 11d2f0ff7df..c78ed0d3485 100644
+--- a/qmake/generators/makefile.cpp
++++ b/qmake/generators/makefile.cpp
+@@ -3412,8 +3412,7 @@ MakefileGenerator::writePkgConfigFile()
+       << varGlue("QMAKE_PKGCONFIG_CFLAGS", "", " ", " ")
+         //      << varGlue("DEFINES","-D"," -D"," ")
+          ;
+-    if (!project->values("QMAKE_DEFAULT_INCDIRS").contains(includeDir))
+-        t << "-I${includedir}";
++    t << "-I${includedir}";
+     if (target_mode == TARG_MAC_MODE && project->isActiveConfig("lib_bundle")
+         && libDir != QLatin1String("/Library/Frameworks")) {
+             t << " -F${libdir}";
+-- 
+2.42.0
+
diff --git a/gnu/packages/patches/qtbase-use-TZDIR.patch b/gnu/packages/patches/qtbase-use-TZDIR.patch
deleted file mode 100644
index 98bf7493e9..0000000000
--- a/gnu/packages/patches/qtbase-use-TZDIR.patch
+++ /dev/null
@@ -1,141 +0,0 @@
-From 1075606f8b2f9e153c82f8e50cbd69cea9c72e87 Mon Sep 17 00:00:00 2001
-From: Edward Welbourne <edward.welbourne <at> qt.io>
-Date: Mon, 11 Sep 2023 11:41:39 +0200
-Subject: [PATCH] Support the TZDIR environment variable
-
-On Linux / glibc, this overrides the default system location for the
-zone info. So check for files there first. Break out a function to
-manage the trying of (now three) zoneinfo directories when opening a
-file by name relative to there.
-
-Pick-to: 6.6 6.5
-Task-number: QTBUG-116017
-Change-Id: I1f97107aabd9015c0a5543639870f1d70654ca67
----
-* Rebased on top of v6.5.2.
-
- src/corelib/time/qtimezoneprivate_tz.cpp | 73 ++++++++++++++++--------
- 1 file changed, 49 insertions(+), 24 deletions(-)
-
-diff --git a/src/corelib/time/qtimezoneprivate_tz.cpp b/src/corelib/time/qtimezoneprivate_tz.cpp
-index 067191d816..a8b2fc894e 100644
---- a/src/corelib/time/qtimezoneprivate_tz.cpp
-+++ b/src/corelib/time/qtimezoneprivate_tz.cpp
-@@ -51,17 +51,41 @@ typedef QHash<QByteArray, QTzTimeZone> QTzTimeZoneHash;
- 
- static bool isTzFile(const QString &name);
- 
-+// Open a named file under the zone info directory:
-+static bool openZoneInfo(QString name, QFile *file)
-+{
-+    // At least on Linux / glibc (see man 3 tzset), $TZDIR overrides the system
-+    // default location for zone info:
-+    const QString tzdir = qEnvironmentVariable("TZDIR");
-+    if (!tzdir.isEmpty()) {
-+        file->setFileName(QDir(tzdir).filePath(name));
-+        if (file->open(QIODevice::ReadOnly))
-+            return true;
-+    }
-+    // Try modern system path first:
-+    constexpr auto zoneShare = "/usr/share/zoneinfo/"_L1;
-+    if (tzdir != zoneShare && tzdir != zoneShare.chopped(1)) {
-+        file->setFileName(zoneShare + name);
-+        if (file->open(QIODevice::ReadOnly))
-+            return true;
-+    }
-+    // Fall back to legacy system path:
-+    constexpr auto zoneLib = "/usr/lib/zoneinfo/"_L1;
-+    if (tzdir != zoneLib && tzdir != zoneLib.chopped(1)) {
-+        file->setFileName(zoneShare + name);
-+        if (file->open(QIODevice::ReadOnly))
-+            return true;
-+    }
-+    return false;
-+}
-+
- // Parse zone.tab table for territory information, read directories to ensure we
- // find all installed zones (many are omitted from zone.tab; even more from
- // zone1970.tab).
- static QTzTimeZoneHash loadTzTimeZones()
- {
--    QString path = QStringLiteral("/usr/share/zoneinfo/zone.tab");
--    if (!QFile::exists(path))
--        path = QStringLiteral("/usr/lib/zoneinfo/zone.tab");
--
--    QFile tzif(path);
--    if (!tzif.open(QIODevice::ReadOnly))
-+    QFile tzif;
-+    if (!openZoneInfo("zone.tab"_L1, &tzif))
-         return QTzTimeZoneHash();
- 
-     QTzTimeZoneHash zonesHash;
-@@ -91,6 +115,7 @@ static QTzTimeZoneHash loadTzTimeZones()
-         }
-     }
- 
-+    const QString path = tzif.fileName();
-     const qsizetype cut = path.lastIndexOf(u'/');
-     Q_ASSERT(cut > 0);
-     const QDir zoneDir = QDir(path.first(cut));
-@@ -761,20 +786,13 @@ QTzTimeZoneCacheEntry QTzTimeZoneCache::findEntry(const QByteArray &ianaId)
-         tzif.setFileName(QStringLiteral("/etc/localtime"));
-         if (!tzif.open(QIODevice::ReadOnly))
-             return ret;
--    } else {
--        // Open named tz, try modern path first, if fails try legacy path
--        tzif.setFileName("/usr/share/zoneinfo/"_L1 + QString::fromLocal8Bit(ianaId));
--        if (!tzif.open(QIODevice::ReadOnly)) {
--            tzif.setFileName("/usr/lib/zoneinfo/"_L1 + QString::fromLocal8Bit(ianaId));
--            if (!tzif.open(QIODevice::ReadOnly)) {
--                // ianaId may be a POSIX rule, taken from $TZ or /etc/TZ
--                auto check = validatePosixRule(ianaId);
--                if (check.isValid) {
--                    ret.m_hasDst = check.hasDst;
--                    ret.m_posixRule = ianaId;
--                }
--                return ret;
--            }
-+    } else if (!openZoneInfo(QString::fromLocal8Bit(ianaId), &tzif)) {
-+        // ianaId may be a POSIX rule, taken from $TZ or /etc/TZ
-+        auto check = validatePosixRule(ianaId);
-+        if (check.isValid) {
-+            ret.m_hasDst = check.hasDst;
-+            ret.m_posixRule = ianaId;
-+            return ret;
-         }
-     }
- 
-@@ -1317,7 +1335,8 @@ private:
-     {
-         // On most distros /etc/localtime is a symlink to a real file so extract
-         // name from the path
--        const auto zoneinfo = "/zoneinfo/"_L1;
-+        const QString tzdir = qEnvironmentVariable("TZDIR");
-+        constexpr auto zoneinfo = "/zoneinfo/"_L1;
-         QString path = QStringLiteral("/etc/localtime");
-         long iteration = getSymloopMax();
-         // Symlink may point to another symlink etc. before being under zoneinfo/
-@@ -1325,9 +1344,15 @@ private:
-         // symlink, like America/Montreal pointing to America/Toronto
-         do {
-             path = QFile::symLinkTarget(path);
--            int index = path.indexOf(zoneinfo);
--            if (index >= 0) // Found zoneinfo file; extract zone name from path:
--                return QStringView{ path }.mid(index + zoneinfo.size()).toUtf8();
-+            // If it's a zoneinfo file, extract the zone name from its path:
-+            int index = tzdir.isEmpty() ? -1 : path.indexOf(tzdir);
-+            if (index >= 0) {
-+                const auto tail = QStringView{ path }.sliced(index + tzdir.size()).toUtf8();
-+                return tail.startsWith(u'/') ? tail.sliced(1) : tail;
-+            }
-+            index = path.indexOf(zoneinfo);
-+            if (index >= 0)
-+                return QStringView{ path }.sliced(index + zoneinfo.size()).toUtf8();
-         } while (!path.isEmpty() && --iteration > 0);
- 
-         return QByteArray();
-
-base-commit: af457a9f0f7eb1a2a7d11f495da508faab91a442
--- 
-2.41.0
-
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 9df49d7fb3..e195df670d 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -67,6 +67,7 @@ (define-module (gnu packages qt)
   #:use-module (gnu packages bash)
   #:use-module (gnu packages base)
   #:use-module (gnu packages bison)
+  #:use-module (gnu packages crypto)
   #:use-module (gnu packages check)
   #:use-module (gnu packages cmake)
   #:use-module (gnu packages compression)
@@ -654,27 +655,28 @@ (define-public qtbase
   (package
     (inherit qtbase-5)
     (name "qtbase")
-    (version "6.5.2")
+    (version "6.6.2")
     (source (origin
               (inherit (package-source qtbase-5))
               (uri (qt-url name version))
               (sha256
                (base32
-                "0s8jwzdcv97dfy8n3jjm8zzvllv380l73mwdva7rs2nqnhlwgd1x"))
+                "0yv78bwqzy975854h53rbiilsms62f3v02i3jqz7v8ajk1ml56xq"))
               (modules '((guix build utils)))
               (snippet
                ;; corelib uses bundled harfbuzz, md4, md5, sha3
                '(with-directory-excursion "src/3rdparty"
                   (for-each delete-file-recursively
-                            ;; The bundled pcre2 copy is kept, as its headers
-                            ;; are required by some internal bootstrap target
-                            ;; used for the tools.
                             (list "double-conversion" "freetype" "harfbuzz-ng"
-                                  "libpng" "libjpeg" "sqlite" "xcb" "zlib"))))
-              (patches (search-patches "qtbase-use-TZDIR.patch"
-                                       "qtbase-moc-ignore-gcc-macro.patch"
-                                       "qtbase-absolute-runpath.patch"
-                                       "qtbase-qmake-use-libname.patch"))))
+                                  "pcre2" "md4c" "libpng" "libjpeg"
+                                  "sqlite" "xcb" "zlib"))))
+              (patches
+               (search-patches
+                "qtbase-moc-ignore-gcc-macro.patch"
+                "qtbase-absolute-runpath.patch"
+                "qtbase-qmake-use-libname.patch"
+                "qtbase-find-tools-in-PATH.patch"
+                "qtbase-qmake-fix-includedir.patch"))))
     (build-system cmake-build-system)
     (arguments
      (substitute-keyword-arguments (package-arguments qtbase-5)
@@ -752,6 +754,12 @@ (define-public qtbase
                                "qmake/library/qmakebuiltins.cpp")
                   (("/bin/sh")
                    (search-input-file inputs "bin/bash")))
+
+                (substitute* "tests/auto/tools/qt_cmake_create/\
+tst_qt_cmake_create.cpp"
+                  (("/bin/sh")
+                   (which "sh")))
+
                 (substitute* "src/corelib/CMakeLists.txt"
                   (("/bin/ls")
                    (search-input-file inputs "bin/ls")))))
@@ -814,6 +822,24 @@ (define-public qtbase
                     (string-join
                      (append
                       (list
+                       ;; The 'tst_selftests' fails with the following error:
+                       ;; with expansion:
+                       ;; false
+                       ;; with messages:
+                       ;; test := "keyboard"
+                       ;; arguments := QList("-o", "-,tap")
+                       ;; Detected locale "C" with character encoding "ANSI_X3.4-1968", which is not UTF-8.
+                       ;; Qt depends on a UTF-8 locale, but has failed to switch to one.
+                       ;; If this causes problems, reconfigure your locale. See the locale(1) manual
+                       ;; for more information.
+
+                       ;; See https://bugreports.qt.io/browse/QTBUG-113371
+                       ;; Add glibc-utf8-locales to native-inpus is no help.
+                       ;; TODO: when core-updates merge, check again.
+                       "tst_selftests"
+
+                       ;; Sometimes it fails.
+                       "tst_qsystemsemaphore"
                        ;; The 'tst_moc' test fails with "'fi.exists()' returned FALSE".
                        "tst_moc"
 
@@ -984,6 +1010,7 @@ (define-public qtbase
                 bash-minimal
                 coreutils-minimal
                 md4c
+                libb2
                 libice
                 libsm
                 libxcb
-- 
2.41.0

Message #128 received at 69628 <at> debbugs.gnu.org (full text, mbox):

From: Zheng Junjie <zhengjunjie <at> iscas.ac.cn>
To: 69628 <at> debbugs.gnu.org
Subject: [PATCH qt-team v4 09/24] gnu: qtwayland: Update to 6.6.2.
Date: Wed, 13 Mar 2024 16:58:03 +0800

* gnu/packages/qt.scm (qtwayland): Update to 6.6.2.
[arguments]<#:phases>: Adjust 'set-test-environment phase.
Change-Id: I9aeaed2aa2c3f4d7275ea7a516baf6ff8fbf81ca

Change-Id: I106db86ced2ecfcb98892603a723f0ad11f48477
---
 gnu/packages/qt.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index ce038082e8..f62db76c60 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1898,13 +1898,13 @@ (define-public qtwayland-5
 (define-public qtwayland
   (package
     (name "qtwayland")
-    (version "6.5.2")
+    (version "6.6.2")
     (source
      (origin
        (method url-fetch)
        (uri (qt-url name version))
        (sha256
-        (base32 "16iwar19sgjvxgmbr6hmd3hsxp6ahdjwl1lra2wapl3zzf3bw81h"))))
+        (base32 "0y6x84ckcc53ddclnrlzs08b1kvw6saw9nim0hz4wc5fyz7dbkcv"))))
     (build-system cmake-build-system)
     (arguments
      (list #:configure-flags #~(list "-DQT_BUILD_TESTS=ON")
@@ -1921,6 +1921,7 @@ (define-public qtwayland
                      (("QTRY_COMPARE\\(bufferSpy\\.size\\(\\), 1\\);") ""))))
                (add-before 'check 'set-test-environment
                  (lambda _
+                   (setenv "XDG_RUNTIME_DIR" (getcwd))
                    ;; Do not fail just because /etc/machine-id is missing.
                    (setenv "DBUS_FATAL_WARNINGS" "0")
                    ;; Make Qt render "offscreen", required for tests.
-- 
2.41.0

Message #131 received at 69628 <at> debbugs.gnu.org (full text, mbox):

From: Zheng Junjie <zhengjunjie <at> iscas.ac.cn>
To: 69628 <at> debbugs.gnu.org
Subject: [PATCH qt-team v4 18/24] gnu: qtwebengine: Update to 6.6.2.
Date: Wed, 13 Mar 2024 16:58:12 +0800

* gnu/packages/qt.scm (qtwebengine): Update to 6.6.2.
(qtwebengine)[source]: Adjust snippet.
[arguments]<#:configure-flags>: Adjust it.
<#:phases>: Add 'delete-installed-tests phase.

Change-Id: If60f91e27464a80a927f459cc627a7a5ae3f229a
---
 gnu/packages/qt.scm | 38 +++++++++++++++++++++++++-------------
 1 file changed, 25 insertions(+), 13 deletions(-)

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 5680d5520a..053f589987 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -3076,14 +3076,14 @@ (define-public qtwebengine-5
 (define-public qtwebengine
   (package
     (name "qtwebengine")
-    (version "6.5.3")
+    (version "6.6.2")
     (source
      (origin
        (method url-fetch)
        (uri (qt-url name version))
        (sha256
         (base32
-         "1ra5hyyg4vymp8pgzv08smjc3fl1axdavnkpj1i5zxym1ndww513"))
+         "15h3hniszfkxv2vnn3fnbgbar8wb41ypgn4b4iz4iy6csar8f7fn"))
        (modules '((ice-9 ftw)
                   (ice-9 match)
                   (srfi srfi-1)
@@ -3115,12 +3115,11 @@ (define-public qtwebengine
                     "net/third_party/uri_template"
                     "third_party/abseil-cpp"
                     "third_party/angle"
-                    "third_party/angle/src/common/third_party/base"
-                    "third_party/angle/src/common/third_party/smhasher"
                     "third_party/angle/src/common/third_party/xxhash"
                     "third_party/angle/src/third_party/libXNVCtrl" ;Expat
-                    "third_party/angle/src/third_party/trace_event"
                     "third_party/angle/src/third_party/volk"
+                    "third_party/angle/src/third_party/systeminfo"
+                    "third_party/angle/src/third_party/ceval"
                     "third_party/axe-core"
                     "third_party/blink"
                     "third_party/boringssl"
@@ -3152,8 +3151,6 @@ (define-public qtwebengine
                     "third_party/dawn/third_party/khronos"
                     "third_party/devtools-frontend"
                     "third_party/devtools-frontend/src/front_end/third_party/i18n"
-                    "third_party/devtools-frontend/src/front_end/third_party/acorn"
-                    "third_party/devtools-frontend/src/front_end/third_party/acorn-loose"
                     "third_party/devtools-frontend/src/front_end/third_party/\
 additional_readme_paths.json"
                     "third_party/devtools-frontend/src/front_end/third_party/axe-core"
@@ -3164,11 +3161,18 @@ (define-public qtwebengine
                     "third_party/devtools-frontend/src/front_end/third_party/i18n"
                     "third_party/devtools-frontend/src/front_end/third_party/intl-messageformat"
                     "third_party/devtools-frontend/src/front_end/third_party/lighthouse"
-                    "third_party/devtools-frontend/src/front_end/third_party/lit-html"
+                    "third_party/devtools-frontend/src/front_end/third_party/lit"
+                    "third_party/devtools-frontend/src/front_end/third_party/acorn"
                     "third_party/devtools-frontend/src/front_end/third_party/marked"
                     "third_party/devtools-frontend/src/front_end/third_party/puppeteer"
+                    "third_party/devtools-frontend/src/front_end/third_party/\
+puppeteer/package/lib/esm/third_party/mitt"
+                    "third_party/devtools-frontend/src/front_end/third_party/\
+vscode.web-custom-data"
+                    "third_party/devtools-frontend/src/third_party/pyjson5"
                     "third_party/devtools-frontend/src/front_end/third_party/wasmparser"
                     "third_party/devtools-frontend/src/third_party/typescript"
+                    "third_party/devtools-frontend/src/third_party/i18n"
                     "third_party/distributed_point_functions"
                     "third_party/dom_distiller_js"
                     "third_party/emoji-segmenter"
@@ -3211,7 +3215,6 @@ (define-public qtwebengine
                     "third_party/libgav1"
                     "third_party/libjingle_xmpp"
                     "third_party/libjpeg_turbo"
-                    "third_party/libjxl"
                     "third_party/libpng" ;TODO: make pdfium use system version
                     "third_party/libsecret" ;LGPL2.1+
                     "third_party/libsrtp"
@@ -3230,6 +3233,7 @@ (define-public qtwebengine
                     "third_party/lss"
                     "third_party/mako"
                     "third_party/markupsafe"
+                    "third_party/material_color_utilities" ;ASL2.0
                     "third_party/mesa_headers"
                     "third_party/metrics_proto"
                     "third_party/minigbm" ;BSD-3
@@ -3249,6 +3253,7 @@ (define-public qtwebengine
                     "third_party/opus/src/include/opus_multistream.h"
                     "third_party/opus/src/include/opus_types.h"
                     "third_party/ots"
+                    "third_party/flac"
                     "third_party/pdfium"
                     "third_party/pdfium/third_party/agg23"
                     "third_party/pdfium/third_party/base"
@@ -3256,7 +3261,6 @@ (define-public qtwebengine
                     "third_party/pdfium/third_party/freetype"
                     "third_party/pdfium/third_party/lcms"
                     "third_party/pdfium/third_party/libopenjpeg"
-                    "third_party/pdfium/third_party/libpng16"
                     "third_party/pdfium/third_party/libtiff"
                     "third_party/pdfium/third_party/skia_shared"
                     "third_party/pdfium/third_party/freetype/include/pstables.h" ;FreeType
@@ -3326,6 +3330,7 @@ (define-public qtwebengine
                     "v8/src/third_party/utf8-decoder"
                     "v8/src/third_party/valgrind"
                     "v8/third_party/inspector_protocol"
+                    "v8/third_party/glibc/src/sysdeps/ieee754/dbl-64"
                     "v8/third_party/v8/builtins")))
 
              (with-directory-excursion "src/3rdparty"
@@ -3393,14 +3398,17 @@ (define-public qtwebengine
               "-DQT_FEATURE_webengine_system_libjpeg=ON"
               "-DQT_FEATURE_webengine_system_libpci=ON"
               "-DQT_FEATURE_webengine_system_libpng=ON"
+              "-DQT_FEATURE_webengine_system_libtiff=ON"
               "-DQT_FEATURE_webengine_system_libwebp=ON"
               "-DQT_FEATURE_webengine_system_libxml=ON"
-              "-DQT_FEATURE_webengine_system_libxslt=ON"
               "-DQT_FEATURE_webengine_system_minizip=ON"
               "-DQT_FEATURE_webengine_system_opus=ON"
               "-DQT_FEATURE_webengine_system_pulseaudio=ON"
               "-DQT_FEATURE_webengine_system_re2=ON"
-              "-DQT_FEATURE_webengine_system_zlib=ON")
+              "-DQT_FEATURE_webengine_system_zlib=ON"
+              "-DQT_FEATURE_webengine_system_glib=ON"
+              "-DQT_FEATURE_webengine_system_libvpx=ON"
+              "-DQT_FEATURE_webengine_system_snappy=ON")
       #:phases
       #~(modify-phases %standard-phases
           (add-after 'unpack 'patch-paths
@@ -3450,7 +3458,11 @@ (define-public qtwebengine
                          '()))))
           (replace 'install
             (lambda _
-              (invoke "cmake" "--install" "."))))))
+              (invoke "cmake" "--install" ".")))
+          (add-after 'install 'delete-installed-tests
+                 (lambda _
+                   (delete-file-recursively
+                    (string-append #$output "/tests")))))))
     (native-inputs
      (modify-inputs (package-native-inputs qtwebengine-5)
        (delete "python2" "python2-six")
-- 
2.41.0

Message #134 received at 69628 <at> debbugs.gnu.org (full text, mbox):

From: Zheng Junjie <zhengjunjie <at> iscas.ac.cn>
To: 69628 <at> debbugs.gnu.org
Subject: [PATCH qt-team v4 20/24] gnu: qtsensors: Rename package to
 qtsensors-5.
Date: Wed, 13 Mar 2024 16:58:14 +0800

* gnu/packages/qt.scm (qtsensors): Rename to qtsensors-5
* gnu/packages/qt.scm (python-pyqt, python-pyside-2)
* gnu/packages/geo.scm (openorienteering-mapper)
* gnu/packages/kde-plasma.scm (kscreen)
* gnu/packages/education.scm (gcompris-qt)
Adjust inputs.

Change-Id: Ie18fdf82881e508ecc25c535088672d1a89f19ba
---
 gnu/packages/education.scm  | 3 ++-
 gnu/packages/geo.scm        | 3 ++-
 gnu/packages/kde-plasma.scm | 2 +-
 gnu/packages/qt.scm         | 6 +++---
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm
index 698f15678b..fb432ee844 100644
--- a/gnu/packages/education.scm
+++ b/gnu/packages/education.scm
@@ -12,6 +12,7 @@
 ;;; Copyright © 2021 Nicolò Balzarotti <nicolo <at> nixo.xyz>
 ;;; Copyright © 2022 Luis Felipe López Acevedo <luis.felipe.la <at> protonmail.com>
 ;;; Copyright © 2023 Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
+;;; Copyright © 2024 Zheng Junjie <873216071 <at> qq.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -192,7 +193,7 @@ (define-public gcompris-qt
            qtgraphicaleffects
            qtmultimedia-5
            qtquickcontrols2-5
-           qtsensors
+           qtsensors-5
            qtsvg-5))
     (home-page "https://gcompris.net/index-en.html")
     (synopsis "Educational games for small children")
diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm
index 687effcace..2a1bf2b935 100644
--- a/gnu/packages/geo.scm
+++ b/gnu/packages/geo.scm
@@ -22,6 +22,7 @@
 ;;; Copyright © 2022 Roman Scherer <roman.scherer <at> burningswell.com>
 ;;; Copyright © 2022, 2023 Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
 ;;; Copyright © 2022 Denis 'GNUtoo' Carikli <GNUtoo <at> cyberdimension.org>
+;;; Copyright © 2024 Zheng Junjie <873216071 <at> qq.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -2575,7 +2576,7 @@ (define-public openorienteering-mapper
            qtbase-5
            qtimageformats-5
            qtlocation
-           qtsensors
+           qtsensors-5
            zlib))
     (native-inputs
      (list doxygen
diff --git a/gnu/packages/kde-plasma.scm b/gnu/packages/kde-plasma.scm
index cf45fa59f7..1d41d35a56 100644
--- a/gnu/packages/kde-plasma.scm
+++ b/gnu/packages/kde-plasma.scm
@@ -793,7 +793,7 @@ (define-public kscreen
                   libkscreen
                   libxi
                   plasma-wayland-protocols
-                  qtsensors
+                  qtsensors-5
                   qtbase-5
                   qtx11extras
                   xcb-util))
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 6b58fe2211..5a24b7da25 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1664,7 +1664,7 @@ (define-public qtwebsockets
     (home-page (package-home-page qtbase))
     (license (package-license qtbase))))
 
-(define-public qtsensors
+(define-public qtsensors-5
   (package
     (inherit qtsvg-5)
     (name "qtsensors")
@@ -3730,7 +3730,7 @@ (define-public python-pyqt
        ("qtdeclarative-5" ,qtdeclarative-5)
        ("qtlocation" ,qtlocation)
        ("qtmultimedia-5" ,qtmultimedia-5)
-       ("qtsensors" ,qtsensors)
+       ("qtsensors" ,qtsensors-5)
        ("qtserialport" ,qtserialport)
        ("qtsvg-5" ,qtsvg-5)
        ("qttools-5" ,qttools-5)
@@ -4545,7 +4545,7 @@ (define-public python-pyside-2
            qtquickcontrols2-5
            qtscript
            qtscxml
-           qtsensors
+           qtsensors-5
            qtspeech
            qtsvg-5
            qttools-5
-- 
2.41.0

Message #137 received at 69628 <at> debbugs.gnu.org (full text, mbox):

From: Zheng Junjie <zhengjunjie <at> iscas.ac.cn>
To: 69628 <at> debbugs.gnu.org
Subject: [PATCH qt-team v4 21/24] gnu: Add qtsensors.
Date: Wed, 13 Mar 2024 17:01:53 +0800

* gnu/packages/qt.scm (qtsensors): New variable.

Change-Id: I5d5bf3902f3340d6e73dc8889e27d4e5bf28b058
---
 gnu/packages/qt.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 5a24b7da25..f5c63800c9 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1664,6 +1664,25 @@ (define-public qtwebsockets
     (home-page (package-home-page qtbase))
     (license (package-license qtbase))))
 
+(define-public qtsensors
+  (package
+    (inherit qtsvg)
+    (name "qtsensors")
+    (version "6.6.2")
+    (source (origin
+              (method url-fetch)
+              (uri (qt-url name version))
+              (sha256
+               (base32
+                "0a3w50bfnmxndyxnn9lsy1wxffhm2am0yjxqx3vx0gfjwv79yvsa"))))
+    (native-inputs
+     (list qtdeclarative))
+    (inputs (list qtbase))
+    (synopsis "Qt Sensors module")
+    (description "The Qt Sensors API provides access to sensor hardware via QML
+and C++ interfaces.  The Qt Sensors API also provides a motion gesture
+recognition API for devices.")))
+
 (define-public qtsensors-5
   (package
     (inherit qtsvg-5)
-- 
2.41.0

Message #140 received at 69628 <at> debbugs.gnu.org (full text, mbox):

From: Zheng Junjie <zhengjunjie <at> iscas.ac.cn>
To: 69628 <at> debbugs.gnu.org
Subject: [PATCH qt-team v4 23/24] gnu: Add qtspeech.
Date: Wed, 13 Mar 2024 17:01:55 +0800

* gnu/packages/qt.scm (qtspeech): New variable.

Change-Id: I99294321514e7e3908d2f25812ceaa76d60bf060
---
 gnu/packages/qt.scm | 44 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 22d6e696c0..eea0aedcaf 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -2636,6 +2636,50 @@ (define-public qtspeech-5
 In such a scenario, the messaging application can read out the incoming
 message.")))
 
+(define-public qtspeech
+  (package
+    (name "qtspeech")
+    (version "6.6.2")
+    (source (origin
+              (method url-fetch)
+              (uri (qt-url name version))
+              (sha256
+               (base32
+                "1qvf3p2p1pc5fw40d8zq0iawaaqkc0dp5yx85b1dnw1j809bn8y0"))))
+    (build-system cmake-build-system)
+    (arguments
+     (list #:phases
+           #~(modify-phases %standard-phases
+               (delete 'check)               ;move after the install phase
+               (add-after 'install 'check
+                 (assoc-ref %standard-phases 'check))
+               (add-before 'check 'set-display
+                 (lambda _
+                   ;; make Qt render "offscreen", required for tests
+                   (setenv "QT_QPA_PLATFORM" "offscreen")))
+               (add-before 'check 'prepare-for-tests
+                 (lambda* (#:key outputs #:allow-other-keys)
+                   (setenv "QML2_IMPORT_PATH"
+                           (string-append (assoc-ref outputs "out")
+                                          "/lib/qt6/qml:"
+                                          (getenv "QML2_IMPORT_PATH")))))
+               (add-after 'install 'delete-installed-tests
+                 (lambda _
+                   (delete-file-recursively
+                    (string-append #$output "/tests")))))))
+    (propagated-inputs (list qtmultimedia))
+    (inputs (list qtbase qtdeclarative))
+    (synopsis "Qt Speech module")
+    (description "The Qt Speech module enables a Qt application to support
+accessibility features such as text-to-speech, which is useful for end-users
+who are visually challenged or cannot access the application for whatever
+reason.  The most common use case where text-to-speech comes in handy is when
+the end-user is driving and cannot attend the incoming messages on the phone.
+In such a scenario, the messaging application can read out the incoming
+message.")
+    (home-page (package-home-page qtbase))
+    (license (package-license qtbase))))
+
 (define-public qtvirtualkeyboard-5
   (package
     (inherit qtsvg-5)
-- 
2.41.0

Message #146 received at 69628 <at> debbugs.gnu.org (full text, mbox):

From: Zheng Junjie <zhengjunjie <at> iscas.ac.cn>
To: 69628 <at> debbugs.gnu.org
Subject: [PATCH qt-team v4 24/24] gnu: qt-creator: Update to 12.0.2.
Date: Wed, 13 Mar 2024 17:01:56 +0800

* gnu/packages/qt.scm (qt-creator): Update to 12.0.2.

Change-Id: Ibd753a2bafa6d4427c03d5ab657544571892b930
---
 gnu/packages/qt.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index eea0aedcaf..d46a50f130 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -28,7 +28,7 @@
 ;;; Copyright © 2022 Petr Hodina <phodina <at> protonmail.com>
 ;;; Copyright © 2022 Yash Tiwari <yasht <at> mailbox.org>
 ;;; Copyright © 2023 Sharlatan Hellseher <sharlatanus <at> gmail.com>
-;;; Copyright © 2022 Zheng Junjie <873216071 <at> qq.com>
+;;; Copyright © 2022, 2024 Zheng Junjie <873216071 <at> qq.com>
 ;;; Copyright © 2023 Herman Rimm <herman <at> rimm.ee>
 ;;;
 ;;; This file is part of GNU Guix.
@@ -5201,7 +5201,7 @@ (define-public clazy
 (define-public qt-creator
   (package
     (name "qt-creator")
-    (version "12.0.1")
+    (version "12.0.2")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -5224,7 +5224,7 @@ (define-public qt-creator
                             ((".*marketplace/marketplace.qbs.*") ""))))
               (sha256
                (base32
-                "04h35za3gliai5djxwmzqrbih2g26lcv68pp4wvljkdwkcjsscvb"))))
+                "1lgk547pvg31zzqra7gn9gsszm5wrwxiw06crbr5n2kqfavk9r22"))))
     (build-system qt-build-system)
     (arguments
      (list
-- 
2.41.0

Message #149 received at 69628 <at> debbugs.gnu.org (full text, mbox):

From: Zheng Junjie <zhengjunjie <at> iscas.ac.cn>
To: 69628 <at> debbugs.gnu.org
Subject: [PATCH qt-team v4 22/24] gnu: qtspeech: Rename package to qtspeech-5.
Date: Wed, 13 Mar 2024 17:01:54 +0800

* gnu/packages/qt.scm (qtspeech): Rename to qtspeech-5.
(python-pyside-2)
* gnu/packages/games.scm (chessx)
* gnu/packages/kde-frameworks.scm (ktextwidgets)
* gnu/packages/kde-pim.scm (kdepim-runtime,kpimtextedit)
* gnu/packages/kde-utils.scm (kmouth)
* gnu/packages/kde.scm  (okular)
* gnu/packages/radio.scm (sdrangel):
Adjust inputs.

Change-Id: I65ae1f4e3601f0caa8304cea6fb12f991f8e52a1
---
 gnu/packages/games.scm          | 4 ++--
 gnu/packages/kde-frameworks.scm | 6 +++---
 gnu/packages/kde-pim.scm        | 8 ++++----
 gnu/packages/kde-utils.scm      | 4 ++--
 gnu/packages/kde.scm            | 2 +-
 gnu/packages/qt.scm             | 4 ++--
 gnu/packages/radio.scm          | 3 ++-
 7 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index db8d8da0a9..b95b089ed5 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -75,7 +75,7 @@
 ;;; Copyright © 2022, 2024 Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
 ;;; Copyright © 2022 Hendursaga <hendursaga <at> aol.com>
 ;;; Copyright © 2022 Parnikkapore <poomklao <at> yahoo.com>
-;;; Copyright © 2023 Zheng Junjie <873216071 <at> qq.com>
+;;; Copyright © 2023, 2024 Zheng Junjie <873216071 <at> qq.com>
 ;;; Copyright © 2023 Florian Pelz <pelzflorian <at> pelzflorian.de>
 ;;; Copyright © 2023 Ivana Drazovic <iv.dra <at> hotmail.com>
 ;;; Copyright © 2023, 2024 gemmaro <gemmaro.dev <at> gmail.com>
@@ -10472,7 +10472,7 @@ (define-public chessx
     (native-inputs
      (list qttools-5))
     (inputs
-     (list qtbase-5 qtmultimedia-5 qtspeech qtsvg-5 zlib))
+     (list qtbase-5 qtmultimedia-5 qtspeech-5 qtsvg-5 zlib))
     (arguments
      `(#:tests? #f
        #:phases
diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index 64e41b510d..88ce09f59e 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -11,7 +11,7 @@
 ;;; Copyright © 2021 Alexandros Theodotou <alex <at> zrythm.org>
 ;;; Copyright © 2022 Brendan Tildesley <mail <at> brendan.scot>
 ;;; Copyright © 2022 Petr Hodina <phodina <at> protonmail.com>
-;;; Copyright © 2023 Zheng Junjie <873216071 <at> qq.com>
+;;; Copyright © 2023, 2024 Zheng Junjie <873216071 <at> qq.com>
 ;;; Copyright © 2024 Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
@@ -1985,7 +1985,7 @@ (define-public knotifications
            phonon
            qtdeclarative-5
            qtbase-5
-           qtspeech
+           qtspeech-5
            qtx11extras))
     (arguments
      (list #:phases #~(modify-phases %standard-phases
@@ -3249,7 +3249,7 @@ (define-public ktextwidgets
            kwidgetsaddons
            kwindowsystem
            qtbase-5
-           qtspeech))
+           qtspeech-5))
     (home-page "https://community.kde.org/Frameworks")
     (synopsis "Text editing widgets")
     (description "KTextWidgets provides widgets for displaying and editing text.
diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm
index e95eac4e2f..c3f7f9a4d6 100644
--- a/gnu/packages/kde-pim.scm
+++ b/gnu/packages/kde-pim.scm
@@ -848,13 +848,13 @@ (define-public kdepim-runtime
            qtdeclarative-5
            qtkeychain
            qtnetworkauth-5
-           qtspeech
+           qtspeech-5
            qtwebchannel-5
            qtwebengine-5
            qtxmlpatterns))
     (arguments
-      ;; TODO: 5/45 tests fail for quite different reasons, even with
-      ;; "offscreen" and dbus
+     ;; TODO: 5/45 tests fail for quite different reasons, even with
+     ;; "offscreen" and dbus
      `(#:phases (modify-phases %standard-phases
                   (add-after 'set-paths 'extend-CPLUS_INCLUDE_PATH
                     (lambda* (#:key inputs #:allow-other-keys)
@@ -1993,7 +1993,7 @@ (define-public kpimtextedit
            kwidgetsaddons
            kxmlgui
            qtbase-5
-           qtspeech
+           qtspeech-5
            sonnet))
     (arguments
      `(#:tests? #f)) ;; TODO - test suite hangs
diff --git a/gnu/packages/kde-utils.scm b/gnu/packages/kde-utils.scm
index 4e665da599..351a58687c 100644
--- a/gnu/packages/kde-utils.scm
+++ b/gnu/packages/kde-utils.scm
@@ -1,7 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2017, 2019 Hartmut Goebel <h.goebel <at> crazy-compilers.com>
 ;;; Copyright © 2020, 2021 Tobias Geerinckx-Rice <me <at> tobias.gr>
-;;; Copyright © 2021 Zheng Junjie <873216071 <at> qq.com>
+;;; Copyright © 2021, 2024 Zheng Junjie <873216071 <at> qq.com>
 ;;; Copyright © 2022 Brendan Tildesley <mail <at> brendan.scot>
 ;;; Copyright © 2022 Petr Hodina <phodina <at> protonmail.com>
 ;;;
@@ -874,7 +874,7 @@ (define-public kmouth
            kxmlgui
            breeze-icons ;; default icon set
            qtbase-5
-           qtspeech))
+           qtspeech-5))
     (home-page "https://apps.kde.org/kmouth/")
     (synopsis "Type-and-say frontend for speech synthesizers")
     (description "KMouth is a program which enables persons that cannot speak
diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm
index 8e8bb32fda..385bb42926 100644
--- a/gnu/packages/kde.scm
+++ b/gnu/packages/kde.scm
@@ -1557,7 +1557,7 @@ (define-public okular
            kio
            kparts
            kpty
-           qtspeech
+           qtspeech-5
            kwallet
            kwindowsystem
            libkexiv2
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index f5c63800c9..22d6e696c0 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -2611,7 +2611,7 @@ (define-public qtremoteobjects
     (home-page (package-home-page qtbase))
     (license (package-license qtbase))))
 
-(define-public qtspeech
+(define-public qtspeech-5
   (package
     (inherit qtsvg-5)
     (name "qtspeech")
@@ -4565,7 +4565,7 @@ (define-public python-pyside-2
            qtscript
            qtscxml
            qtsensors-5
-           qtspeech
+           qtspeech-5
            qtsvg-5
            qttools-5
            qtwebchannel-5
diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm
index 9c8225d22b..74a74f9922 100644
--- a/gnu/packages/radio.scm
+++ b/gnu/packages/radio.scm
@@ -14,6 +14,7 @@
 ;;; Copyright © 2022 Ryan Tolboom <ryan <at> using.tech>
 ;;; Copyright © 2023 Sharlatan Hellseher <sharlatanus <at> gmail.com>
 ;;; Copyright © 2023 Efraim Flashner <efraim <at> flashner.co.il>
+;;; Copyright © 2024 Zheng Junjie <873216071 <at> qq.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -2671,7 +2672,7 @@ (define-public sdrangel
            qtmultimedia-5
            qtquickcontrols2-5
            qtserialport
-           qtspeech
+           qtspeech-5
            qtwebchannel-5
            qtwebengine-5
            qtwebsockets-5
-- 
2.41.0

Message #152 received at 69628 <at> debbugs.gnu.org (full text, mbox):

From: Zheng Junjie <zhengjunjie <at> iscas.ac.cn>
To: 69628 <at> debbugs.gnu.org
Subject: [PATCH qt-team v4 10/24] gnu: qtwebchannel: Update to 6.6.2.
Date: Wed, 13 Mar 2024 16:58:04 +0800

* gnu/packages/qt.scm (qtwebchannel): Update to 6.6.2.

Change-Id: If488f765e1373f2886eed2cc4e76f34350283682
---
 gnu/packages/qt.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index f62db76c60..70d7ed7c5d 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -2030,13 +2030,13 @@ (define-public qtwebchannel-5
 (define-public qtwebchannel
   (package
     (name "qtwebchannel")
-    (version "6.5.2")
+    (version "6.6.2")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "0qwfnwva7v5f2g5is17yy66mnmc9c1yf9aagaw5qanskdvxdk261"))))
+                "1incvisc3j758b4k82vnwci8j1bba8zf6xgmgcrsm553k4wpsz1x"))))
     (build-system cmake-build-system)
     (arguments
      (list
-- 
2.41.0

Message #155 received at 69628 <at> debbugs.gnu.org (full text, mbox):

From: Zheng Junjie <zhengjunjie <at> iscas.ac.cn>
To: 69628 <at> debbugs.gnu.org
Subject: [PATCH qt-team v4 17/24] gnu: qtremoteobjects: Update to 6.6.2.
Date: Wed, 13 Mar 2024 16:58:11 +0800

* gnu/packages/qt.scm (qtremoteobjects): Update to 6.6.2.

Change-Id: I8c0bf3b125dc8a2c319caf2f0b9be381e4521b8c
---
 gnu/packages/qt.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 35e64e7be7..5680d5520a 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -2558,13 +2558,13 @@ (define-public qtnetworkauth
 (define-public qtremoteobjects
   (package
     (name "qtremoteobjects")
-    (version "6.5.2")
+    (version "6.6.2")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "0k29sk02n54vj1w6vh6xycsjpyfqlijc13fnxh1q7wpgg4gizx60"))))
+                "0fbkjzykxpkz8myr6dy588gcmhyy3lar17v78zfam8kyxq7s5qxa"))))
     (build-system cmake-build-system)
     (arguments
      (list
-- 
2.41.0

Message #158 received at 69628 <at> debbugs.gnu.org (full text, mbox):

From: Zheng Junjie <zhengjunjie <at> iscas.ac.cn>
To: 69628 <at> debbugs.gnu.org
Subject: [PATCH qt-team v4 16/24] gnu: qtnetworkauth: Update to 6.6.2.
Date: Wed, 13 Mar 2024 16:58:10 +0800

* gnu/packages/qt.scm (qtnetworkauth): Update to 6.6.2.

Change-Id: I5fac372916ce516cd2ac3e7dbd83a32fc77024ec
---
 gnu/packages/qt.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index c2bd0ef937..35e64e7be7 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -2538,13 +2538,13 @@ (define-public qtnetworkauth-5
 (define-public qtnetworkauth
   (package
     (name "qtnetworkauth")
-    (version "6.5.2")
+    (version "6.6.2")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "0g18kh3zhcfi9ni8cqbbjdc1l6jf99ijv5shcl42jk6219b4pk2f"))))
+                "1lijsdwbj8gscfllmp358n5ysa8pvhx2msh7gpxvb4x81daxbg9j"))))
     (build-system cmake-build-system)
     (arguments (list #:configure-flags #~(list "-DQT_BUILD_TESTS=ON")))
     (native-inputs (list perl))
-- 
2.41.0

Message #161 received at 69628 <at> debbugs.gnu.org (full text, mbox):

From: Zheng Junjie <zhengjunjie <at> iscas.ac.cn>
To: 69628 <at> debbugs.gnu.org
Subject: [PATCH qt-team v4 05/24] gnu: qtdeclarative: Update to 6.6.2.
Date: Wed, 13 Mar 2024 16:57:59 +0800

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

Message #164 received at 69628 <at> debbugs.gnu.org (full text, mbox):

From: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
To: Zheng Junjie <zhengjunjie <at> iscas.ac.cn>
Cc: 69628 <at> debbugs.gnu.org, 宋文武 <iyzsong <at> envs.net>
Subject: Re: [bug#69628] [PATCH qt-team v4 00/24] qt: Update to 6.6.2.
Date: Mon, 25 Mar 2024 11:21:57 -0400

Hi Zheng,

Zheng Junjie <zhengjunjie <at> iscas.ac.cn> writes:

> Hello, This is v4 patch. Thanks for the comment.
> This version should fix question, and use etc/committer.scm
> And add missing python-{shiboken,pyside}-6.

Thanks for the reworked series.  I'm in the process of reviewing and
building this locally.  I'm investigating the new test failures that
were skipped.  It seems the SVG plugin is not found by qtdeclarative.  I
also found a new flaky test for qtbase, which I've reported.

When done I'll push the series to qt-team, have it built, then merge to
master if everything looks dandy.

-- 
Thanks,
Maxim

Message #167 received at 69628 <at> debbugs.gnu.org (full text, mbox):

From: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
To: 宋文武 <iyzsong <at> envs.net>
Cc: 69628 <at> debbugs.gnu.org, Zheng Junjie <zhengjunjie <at> iscas.ac.cn>
Subject: Re: [bug#69628] [PATCH qt-team v4 00/24] qt: Update to 6.6.2.
Date: Tue, 26 Mar 2024 10:17:45 -0400

Hi,

宋文武 <iyzsong <at> envs.net> writes:

> Zheng Junjie <zhengjunjie <at> iscas.ac.cn> writes:
>
>> Maxim Cournoyer <maxim.cournoyer <at> gmail.com> writes:
>>
>>> Hi Zheng,
>>>
>>> For your information, I've this series (with some light changes, mostly
>>> annotating new test failures with upstream reports I've prepared) to the
>>> 'qt-team' branch, and re-enabled the qt-team job specification from
>>> Berlin/Cuirass: https://ci.guix.gnu.org/jobset/qt-team
>>
>> Does it look like qt-team job is not compiling?
>
> I changed period for the qt-team jobset to 600, and it success trigger a
> job to commit 4ef8806 now.

Thank you!

-- 
Thanks,
Maxim

Message #170 received at 69628 <at> debbugs.gnu.org (full text, mbox):

From: 宋文武 <iyzsong <at> envs.net>
To: Zheng Junjie <zhengjunjie <at> iscas.ac.cn>
Cc: 69628 <at> debbugs.gnu.org, Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
Subject: Re: [bug#69628] [PATCH qt-team v4 00/24] qt: Update to 6.6.2.
Date: Tue, 26 Mar 2024 18:12:10 +0800

Zheng Junjie <zhengjunjie <at> iscas.ac.cn> writes:

> Maxim Cournoyer <maxim.cournoyer <at> gmail.com> writes:
>
>> Hi Zheng,
>>
>> For your information, I've this series (with some light changes, mostly
>> annotating new test failures with upstream reports I've prepared) to the
>> 'qt-team' branch, and re-enabled the qt-team job specification from
>> Berlin/Cuirass: https://ci.guix.gnu.org/jobset/qt-team
>
> Does it look like qt-team job is not compiling?

I changed period for the qt-team jobset to 600, and it success trigger a
job to commit 4ef8806 now.

Message #173 received at 69628 <at> debbugs.gnu.org (full text, mbox):

From: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
To: Zheng Junjie <zhengjunjie <at> iscas.ac.cn>
Cc: 69628 <at> debbugs.gnu.org, 宋文武 <iyzsong <at> envs.net>
Subject: Re: [bug#69628] [PATCH qt-team v4 00/24] qt: Update to 6.6.2.
Date: Mon, 25 Mar 2024 23:10:18 -0400

Hi Zheng,

For your information, I've this series (with some light changes, mostly
annotating new test failures with upstream reports I've prepared) to the
'qt-team' branch, and re-enabled the qt-team job specification from
Berlin/Cuirass: https://ci.guix.gnu.org/jobset/qt-team

We'll have to wait a bit to see how it built and if there is any
collateral damage.  If not, we can create an issue to request merging
the branch per (info guix --index-search='merge requests').

-- 
Thanks,
Maxim

Message #176 received at 69628 <at> debbugs.gnu.org (full text, mbox):

From: Zheng Junjie <zhengjunjie <at> iscas.ac.cn>
To: 69628 <at> debbugs.gnu.org
Subject: [PATCH 1/2] gnu: python-sip: Update to 6.8.3.
Date: Wed, 27 Mar 2024 21:07:57 +0800

* gnu/packages/qt.scm (python-sip): Update to 6.8.3.
[build-system]: Switch to pyproject-build-system.
[propagated-inputs]: Add python-tomli. Remove python-toml, python-ply.

Change-Id: I03fcec79a8124a545c9bb5fcfe0d0bb9de88434e
---
 gnu/packages/qt.scm | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 86a8eed33e..8b0371681c 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -3737,7 +3737,7 @@ (define-public pyotherside-for-qt5
 (define-public python-sip
   (package
     (name "python-sip")
-    (version "6.7.7")
+    (version "6.8.3")
     (source
       (origin
         (method url-fetch)
@@ -3747,13 +3747,14 @@ (define-public python-sip
                                   "/sip-" version ".tar.gz")))
         (sha256
          (base32
-          "1qm9q9lhfky5zvxxkssf4zdfv5k1zikji4hz80d48vdfm1pw1sfy"))
+          "0b3n237lbggz3b6bfmdsl1m4qgai7qyyj6fmvrmc695v32q4g1c8"))
         (patches (search-patches "python-sip-include-dirs.patch"))))
-    (build-system python-build-system)
+    (build-system pyproject-build-system)
     (native-inputs
      (list python-wrapper))
     (propagated-inputs
-     (list python-toml python-packaging python-ply))
+     (list python-tomli
+           python-packaging))
     (home-page "https://www.riverbankcomputing.com/software/sip/intro")
     (synopsis "Python binding creator for C and C++ libraries")
     (description

base-commit: cd32d5b66ea0440644e480fa7733243a42438fa7
-- 
2.41.0

Message #179 received at 69628 <at> debbugs.gnu.org (full text, mbox):

From: Zheng Junjie <zhengjunjie <at> iscas.ac.cn>
To: 69628 <at> debbugs.gnu.org
Subject: [PATCH 2/2] gnu: python-pyqt-6: Update to 6.6.1.
Date: Wed, 27 Mar 2024 21:07:58 +0800

* gnu/packages/qt.scm (python-pyqt-6): Update to 6.6.1.

Change-Id: Ie2de2267eca8a164a3bda86c69b41b9371d758a1
---
 gnu/packages/qt.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 8b0371681c..841a8b4fd3 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -3882,14 +3882,14 @@ (define-public python-pyqt
 (define-public python-pyqt-6
   (package
     (inherit python-pyqt)
-    (version "6.5.2")
+    (version "6.6.1")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "PyQt6" version))
        (file-name (string-append "PyQt6-" version ".tar.gz"))
        (sha256
-        (base32 "100jh1iiz5gx821qzgicfrqv7hjjj98pchdbc1nvdzzra1ryx1ql"))))
+        (base32 "0y83zm7xd2yspjbhmlkqhgi0ppxqhivx0d8gdz2l4l90kni8l5cz"))))
     (inputs ;Qt5 dependencies only in python-pyqt:
             ;; (qt)connectivity, location, sensors, serialport, x11extras, xmlpatterns.
             (list python-wrapper
-- 
2.41.0

Message #184 received at 69628-done <at> debbugs.gnu.org (full text, mbox):

From: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
To: Zheng Junjie <zhengjunjie <at> iscas.ac.cn>
Cc: 69628-done <at> debbugs.gnu.org, 宋文武 <iyzsong <at> envs.net>
Subject: Re: [bug#69628] [PATCH 2/2] gnu: python-pyqt-6: Update to 6.6.1.
Date: Fri, 29 Mar 2024 22:34:43 -0400

Hi,

Zheng Junjie <zhengjunjie <at> iscas.ac.cn> writes:

> * gnu/packages/qt.scm (python-pyqt-6): Update to 6.6.1.
>
> Change-Id: Ie2de2267eca8a164a3bda86c69b41b9371d758a1
> ---
>  gnu/packages/qt.scm | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
> index 8b0371681c..841a8b4fd3 100644
> --- a/gnu/packages/qt.scm
> +++ b/gnu/packages/qt.scm
> @@ -3882,14 +3882,14 @@ (define-public python-pyqt
>  (define-public python-pyqt-6
>    (package
>      (inherit python-pyqt)
> -    (version "6.5.2")
> +    (version "6.6.1")
>      (source
>       (origin
>         (method url-fetch)
>         (uri (pypi-uri "PyQt6" version))
>         (file-name (string-append "PyQt6-" version ".tar.gz"))
>         (sha256
> -        (base32 "100jh1iiz5gx821qzgicfrqv7hjjj98pchdbc1nvdzzra1ryx1ql"))))
> +        (base32 "0y83zm7xd2yspjbhmlkqhgi0ppxqhivx0d8gdz2l4l90kni8l5cz"))))
>      (inputs ;Qt5 dependencies only in python-pyqt:
>              ;; (qt)connectivity, location, sensors, serialport, x11extras, xmlpatterns.
>              (list python-wrapper

I've applied these two to the qt-team branch.

Closing.

-- 
Thanks,
Maxim

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.