[PATCH 00/26] Refresh Qt 6 packages

Done

Details

3 participants

Andreas Enge
???
Maxim Cournoyer

Owner: unassigned

Submitted by: Maxim Cournoyer

Severity: normal

Maxim Cournoyer wrote on 14 Aug 2023 06:21

Recipients:

Message-ID:cover.1691986843.git.maxim.cournoyer@gmail.com

This series refreshes our modern Qt 6 packages to their latest release,
6.5.2.  It also adds some tooling for the Qt team in the form of two manifests
to select all the core Qt 5 packages or the other core packages.


Maxim Cournoyer (26):
  gnu: qt: Revert to use individual versions instead of %qt5-version.
  gnu: qtdeclarative: Disable QML cache to avoid stale cache issues.
  etc: Add Qt manifests for Qt maintenance.
  gnu: qtbase: Update to 6.5.2.
  gnu: qtbase: Enable zstd support.
  gnu: qt5compat: Update to 6.5.2.
  gnu: qtsvg: Update to 6.5.2.
  gnu: qtimageformats: Rename variable to qtimageformats-5.
  gnu: qtimageformats-5: Fix indentation.
  gnu: Add qtimageformats.
  gnu: Add qtlanguageserver.
  gnu: qtdeclarative: Update to 6.5.2.
  gnu: qtwebsockets: Update to 6.5.2.
  gnu: qtshadertools: Update to 6.5.2.
  gnu: qtmultimedia: Update to 6.5.2.
  gnu: qtwayland: Update to 6.5.2.
  gnu: qtwebchannel: Update to 6.5.2.
  gnu: qtlottie: Update to 6.5.2.
  gnu: qttools: Update to 6.5.2.
  gnu: qttranslations: Update to 6.5.2.
  gnu: qtpositioning: Update to 6.5.2.
  gnu: qtnetworkauth: Update to 6.5.2.
  gnu: qtremoteobjects: Update to 6.5.2.
  gnu: qtwebengine: Update to 6.5.2.
  gnu: Remove qtquickcontrols2.
  gnu: qt-creator: Update to 11.0.1.

 etc/teams/qt/common.scm                       |  50 +++
 etc/teams/qt/qt-manifest.scm                  |  34 ++
 etc/teams/qt/qt5-manifest.scm                 |  34 ++
 gnu/local.mk                                  |   2 +
 gnu/packages/geo.scm                          |   2 +-
 gnu/packages/image-viewers.scm                |   2 +-
 .../qtdeclarative-5-disable-qmlcache.patch    |  16 +
 .../qtdeclarative-disable-qmlcache.patch      |  16 +
 gnu/packages/qt.scm                           | 308 ++++++++++++------
 gnu/packages/telegram.scm                     |   2 +-
 10 files changed, 363 insertions(+), 103 deletions(-)
 create mode 100644 etc/teams/qt/common.scm
 create mode 100644 etc/teams/qt/qt-manifest.scm
 create mode 100644 etc/teams/qt/qt5-manifest.scm
 create mode 100644 gnu/packages/patches/qtdeclarative-5-disable-qmlcache.patch
 create mode 100644 gnu/packages/patches/qtdeclarative-disable-qmlcache.patch


base-commit: c5e2f55069658ea4e9febee1622f9e32dcbe2718
prerequisite-patch-id: 7498c01c0a80752067cc314a465373c7d8710657
-- 
2.41.0

Maxim Cournoyer wrote on 14 Aug 2023 06:29

[PATCH 01/26] gnu: qt: Revert to use individual versions instead of %qt5-version.

Recipients:(address . 65280@debbugs.gnu.org)(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)

Message-ID:5ccf2d80db7b5ac4d71238b9859a0da8ca5a069f.1691987375.git.maxim.cournoyer@gmail.com

Rationale: using a variable for the version field currently hinders automatic

upgrades via 'guix refresh':

qtbase: no `version' field in source; skipping

Automated with:

sed 's/%qt5-version/"5.15.8"/g' -i gnu/packages/qt.scm

---

gnu/packages/qt.scm | 66 ++++++++++++++++++++++-----------------------

1 file changed, 32 insertions(+), 34 deletions(-)

Toggle diff (303 lines)diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 2ca03b77d1..59c079934c 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -127,8 +127,6 @@ (define-module (gnu packages qt)
   #:use-module (ice-9 match)
   #:use-module (srfi srfi-1))
 
-(define %qt-version "5.15.8")
-
 (define-public qite
   (let ((commit "75fb3b6bbd5c6a5a8fc35e08a6efbfb588ed546a")
         (revision "74"))
@@ -332,7 +330,7 @@ (define (qt-url component version)
 (define-public qtbase-5
   (package
     (name "qtbase")
-    (version %qt-version)
+    (version "5.15.8")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
@@ -888,7 +886,7 @@ (define-public qt3d-5
   (package
     (inherit qtbase-5)
     (name "qt3d")
-    (version %qt-version)
+    (version "5.15.8")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
@@ -980,7 +978,7 @@ (define-public qtsvg-5
   (package
     (inherit qtbase-5)
     (name "qtsvg")
-    (version %qt-version)
+    (version "5.15.8")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
@@ -1079,7 +1077,7 @@ (define-public qtsvg
 (define-public qtimageformats
   (package (inherit qtsvg-5)
     (name "qtimageformats")
-    (version %qt-version)
+    (version "5.15.8")
     (source (origin
              (method url-fetch)
              (uri (qt-url name version))
@@ -1106,7 +1104,7 @@ (define-public qtimageformats
 (define-public qtx11extras
   (package (inherit qtsvg-5)
     (name "qtx11extras")
-    (version %qt-version)
+    (version "5.15.8")
     (source (origin
              (method url-fetch)
              (uri (qt-url name version))
@@ -1172,7 +1170,7 @@ (define-public qxlsx-qt5
 (define-public qtxmlpatterns
   (package (inherit qtsvg-5)
     (name "qtxmlpatterns")
-    (version %qt-version)
+    (version "5.15.8")
     (source (origin
              (method url-fetch)
              (uri (qt-url name version))
@@ -1201,7 +1199,7 @@ (define-public qtdeclarative-5
   (package
     (inherit qtsvg-5)
     (name "qtdeclarative")
-    (version %qt-version)
+    (version "5.15.8")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
@@ -1379,7 +1377,7 @@ (define-public qtconnectivity
   (package
     (inherit qtsvg-5)
     (name "qtconnectivity")
-    (version %qt-version)
+    (version "5.15.8")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
@@ -1397,7 +1395,7 @@ (define-public qtconnectivity
 (define-public qtwebsockets-5
   (package (inherit qtsvg-5)
     (name "qtwebsockets")
-    (version %qt-version)
+    (version "5.15.8")
     (source (origin
              (method url-fetch)
              (uri (qt-url name version))
@@ -1460,7 +1458,7 @@ (define-public qtsensors
   (package
     (inherit qtsvg-5)
     (name "qtsensors")
-    (version %qt-version)
+    (version "5.15.8")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
@@ -1489,7 +1487,7 @@ (define-public qtmultimedia-5
   (package
     (inherit qtsvg-5)
     (name "qtmultimedia")
-    (version %qt-version)
+    (version "5.15.8")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
@@ -1628,7 +1626,7 @@ (define-public qtwayland-5
   (package
     (inherit qtsvg-5)
     (name "qtwayland")
-    (version %qt-version)
+    (version "5.15.8")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
@@ -1728,7 +1726,7 @@ (define-public qtserialport
   (package
     (inherit qtsvg-5)
     (name "qtserialport")
-    (version %qt-version)
+    (version "5.15.8")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
@@ -1759,7 +1757,7 @@ (define-public qtserialbus
   (package
     (inherit qtsvg-5)
     (name "qtserialbus")
-    (version %qt-version)
+    (version "5.15.8")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
@@ -1786,7 +1784,7 @@ (define-public qtserialbus
 (define-public qtwebchannel-5
   (package (inherit qtsvg-5)
     (name "qtwebchannel")
-    (version %qt-version)
+    (version "5.15.8")
     (source (origin
              (method url-fetch)
              (uri (qt-url name version))
@@ -1842,7 +1840,7 @@ (define-public qtwebglplugin
   (package
     (inherit qtsvg-5)
     (name "qtwebglplugin")
-    (version %qt-version)
+    (version "5.15.8")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
@@ -1871,7 +1869,7 @@ (define-public qtwebview
   (package
     (inherit qtsvg-5)
     (name "qtwebview")
-    (version %qt-version)
+    (version "5.15.8")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
@@ -1889,7 +1887,7 @@ (define-public qtlocation
   (package
     (inherit qtsvg-5)
     (name "qtlocation")
-    (version %qt-version)
+    (version "5.15.8")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
@@ -1946,7 +1944,7 @@ (define-public qttools-5
   (package
     (inherit qtsvg-5)
     (name "qttools")
-    (version %qt-version)
+    (version "5.15.8")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
@@ -2028,7 +2026,7 @@ (define-public qtscript
   (package
     (inherit qtsvg-5)
     (name "qtscript")
-    (version %qt-version)
+    (version "5.15.8")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
@@ -2047,7 +2045,7 @@ (define-public qtquickcontrols-5
   (package
     (inherit qtsvg-5)
     (name "qtquickcontrols")
-    (version %qt-version)
+    (version "5.15.8")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
@@ -2067,7 +2065,7 @@ (define-public qtquickcontrols2-5
   (package
     (inherit qtsvg-5)
     (name "qtquickcontrols2")
-    (version %qt-version)
+    (version "5.15.8")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
@@ -2094,7 +2092,7 @@ (define-public qtgraphicaleffects
   (package
     (inherit qtsvg-5)
     (name "qtgraphicaleffects")
-    (version %qt-version)
+    (version "5.15.8")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
@@ -2117,7 +2115,7 @@ (define-public qtgamepad
   (package
     (inherit qtsvg-5)
     (name "qtgamepad")
-    (version %qt-version)
+    (version "5.15.8")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
@@ -2143,7 +2141,7 @@ (define-public qtscxml
   (package
     (inherit qtsvg-5)
     (name "qtscxml")
-    (version %qt-version)
+    (version "5.15.8")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
@@ -2201,7 +2199,7 @@ (define-public qtpurchasing
   (package
     (inherit qtsvg-5)
     (name "qtpurchasing")
-    (version %qt-version)
+    (version "5.15.8")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
@@ -2217,7 +2215,7 @@ (define-public qtcharts
   (package
     (inherit qtsvg-5)
     (name "qtcharts")
-    (version %qt-version)
+    (version "5.15.8")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
@@ -2246,7 +2244,7 @@ (define-public qtdatavis3d
   (package
     (inherit qtsvg-5)
     (name "qtdatavis3d")
-    (version %qt-version)
+    (version "5.15.8")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
@@ -2268,7 +2266,7 @@ (define-public qtdatavis3d
 (define-public qtnetworkauth-5
   (package (inherit qtsvg-5)
     (name "qtnetworkauth")
-    (version %qt-version)
+    (version "5.15.8")
     (source (origin
              (method url-fetch)
              (uri (qt-url name version))
@@ -2341,7 +2339,7 @@ (define-public qtspeech
   (package
     (inherit qtsvg-5)
     (name "qtspeech")
-    (version %qt-version)
+    (version "5.15.8")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
@@ -2449,7 +2447,7 @@ (define-public qtwebengine-5
   (package
     (inherit qtsvg-5)
     (name "qtwebengine")
-    (version %qt-version)
+    (version "5.15.8")
     (source
      (origin
        (method url-fetch)
@@ -3991,7 +3989,7 @@ (define-public qcustomplot
 (define-public python-shiboken-2
   (package
     (name "python-shiboken-2")
-    (version %qt-version)
+    (version "5.15.8")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://download.qt.io/official_releases"
-- 
2.41.0

Maxim Cournoyer wrote on 14 Aug 2023 06:29

[PATCH 02/26] gnu: qtdeclarative: Disable QML cache to avoid stale cache issues.

Recipients:(address . 65280@debbugs.gnu.org)

Message-ID:8a72e5cccd6eb746dae0e41cf9365ed246a11650.1691987375.git.maxim.cournoyer@gmail.com

Fixes https://issues.guix.gnu.org/64605 and similar reports.

* gnu/packages/patches/qtdeclarative-5-disable-qmlcache.patch: New patch.

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

* gnu/local.mk (dist_patch_DATA): Register them.

* gnu/packages/qt.scm (qtdeclarative-5, qtdeclarative): Apply them.

Reported-by: Distopico Vegan <distopico@riseup.net>

---

gnu/local.mk | 2 ++

.../qtdeclarative-5-disable-qmlcache.patch | 16 ++++++++++++++++

.../patches/qtdeclarative-disable-qmlcache.patch | 16 ++++++++++++++++

gnu/packages/qt.scm | 6 ++++--

4 files changed, 38 insertions(+), 2 deletions(-)

create mode 100644 gnu/packages/patches/qtdeclarative-5-disable-qmlcache.patch

create mode 100644 gnu/packages/patches/qtdeclarative-disable-qmlcache.patch

Toggle diff (83 lines)diff --git a/gnu/local.mk b/gnu/local.mk
index 1fc37ca6e8..bc703db2df 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1730,6 +1730,8 @@ dist_patch_DATA =						\
   %D%/packages/patches/python-typeguard-python3.10.patch	\
   %D%/packages/patches/python-w3lib-fix-test-failure.patch	\
   %D%/packages/patches/python-wxwidgets-type-errors.patch	\
+  %D%/packages/patches/qtdeclarative-5-disable-qmlcache.patch	\
+  %D%/packages/patches/qtdeclarative-disable-qmlcache.patch	\
   %D%/packages/patches/quodlibet-fix-invalid-glob.patch	\
   %D%/packages/patches/quodlibet-fix-mtime-tests.patch		\
   %D%/packages/patches/qxlsx-fix-include-directory.patch	\
diff --git a/gnu/packages/patches/qtdeclarative-5-disable-qmlcache.patch b/gnu/packages/patches/qtdeclarative-5-disable-qmlcache.patch
new file mode 100644
index 0000000000..2f1cf0dd4e
--- /dev/null
+++ b/gnu/packages/patches/qtdeclarative-5-disable-qmlcache.patch
@@ -0,0 +1,16 @@
+Retrieved from
+https://github.com/NixOS/nixpkgs/raw/master/pkgs/development/libraries/qt-5/5.15/qtdeclarative-default-disable-qmlcache.patch
+
+diff --git a/src/qml/qml/qqmltypeloader.cpp b/src/qml/qml/qqmltypeloader.cpp
+index 1d66e75..827567a 100644
+--- a/src/qml/qml/qqmltypeloader.cpp
++++ b/src/qml/qml/qqmltypeloader.cpp
+@@ -727,7 +727,7 @@ bool QQmlTypeLoader::Blob::isDebugging() const
+ 
+ bool QQmlTypeLoader::Blob::diskCacheEnabled() const
+ {
+-    return (!disableDiskCache() && !isDebugging()) || forceDiskCache();
++    return forceDiskCache();
+ }
+ 
+ bool QQmlTypeLoader::Blob::qmldirDataAvailable(const QQmlRefPointer<QQmlQmldirData> &data, QList<QQmlError> *errors)
diff --git a/gnu/packages/patches/qtdeclarative-disable-qmlcache.patch b/gnu/packages/patches/qtdeclarative-disable-qmlcache.patch
new file mode 100644
index 0000000000..5f06ec53b4
--- /dev/null
+++ b/gnu/packages/patches/qtdeclarative-disable-qmlcache.patch
@@ -0,0 +1,16 @@
+Retrieved from
+https://raw.githubusercontent.com/NixOS/nixpkgs/master/pkgs/development/libraries/qt-6/patches/qtdeclarative-default-disable-qmlcache.patch
+
+diff --git a/src/qml/jsruntime/qv4engine.cpp b/src/qml/jsruntime/qv4engine.cpp
+index 852cde9e..165f1b57 100644
+--- a/src/qml/jsruntime/qv4engine.cpp
++++ b/src/qml/jsruntime/qv4engine.cpp
+@@ -2093,7 +2093,7 @@ void ExecutionEngine::registerModule(const QString &_name, const QJSValue &modul
+ 
+ bool ExecutionEngine::diskCacheEnabled() const
+ {
+-    return (!disableDiskCache() && !debugger()) || forceDiskCache();
++    return forceDiskCache();
+ }
+ 
+ void ExecutionEngine::callInContext(QV4::Function *function, QObject *self,
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 59c079934c..a4de003647 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1205,7 +1205,8 @@ (define-public qtdeclarative-5
               (uri (qt-url name version))
               (sha256
                (base32
-                "1kb8nj17vmnky0ayiwypim7kf6rmlmfcjf6gnrw8rydmp61w0vh2"))))
+                "1kb8nj17vmnky0ayiwypim7kf6rmlmfcjf6gnrw8rydmp61w0vh2"))
+              (patches (search-patches "qtdeclarative-5-disable-qmlcache.patch"))))
     (arguments
      (substitute-keyword-arguments (package-arguments qtsvg-5)
        ((#:tests? _ #f) #f)             ;TODO: Enable the tests
@@ -1251,7 +1252,8 @@ (define-public qtdeclarative
               (uri (qt-url name version))
               (sha256
                (base32
-                "1hbw63828pp8vm9b46i2pkcbcpr4mq9nblhmpwrw2pflq0fi24xq"))))
+                "1hbw63828pp8vm9b46i2pkcbcpr4mq9nblhmpwrw2pflq0fi24xq"))
+              (patches (search-patches "qtdeclarative-disable-qmlcache.patch"))))
     (build-system cmake-build-system)
     (arguments
      (list
-- 
2.41.0

Maxim Cournoyer wrote on 14 Aug 2023 06:29

[PATCH 03/26] etc: Add Qt manifests for Qt maintenance.

Recipients:(address . 65280@debbugs.gnu.org)(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)

Message-ID:bd74a73cdecf45cb09d89cedccac750ca00ba70b.1691987375.git.maxim.cournoyer@gmail.com

* etc/teams/qt/common.scm: New file.
* etc/teams/qt/qt-manifest.scm: Likewise.
* etc/teams/qt/qt5-manifest.scm: Likewise.
---

 etc/teams/qt/common.scm       | 50 +++++++++++++++++++++++++++++++++++
 etc/teams/qt/qt-manifest.scm  | 34 ++++++++++++++++++++++++
 etc/teams/qt/qt5-manifest.scm | 34 ++++++++++++++++++++++++
 3 files changed, 118 insertions(+)
 create mode 100644 etc/teams/qt/common.scm
 create mode 100644 etc/teams/qt/qt-manifest.scm
 create mode 100644 etc/teams/qt/qt5-manifest.scm

Toggle diff (138 lines)diff --git a/etc/teams/qt/common.scm b/etc/teams/qt/common.scm
new file mode 100644
index 0000000000..8e11ac220b
--- /dev/null
+++ b/etc/teams/qt/common.scm
@@ -0,0 +1,50 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; This file returns a manifest of packages related to linux-libre.
+;;; Simplistically, it selects packages whose names begin with "linux-libre".
+;;; It is used to assist continuous integration of the kernel packages.
+
+(use-modules (guix packages)
+             (guix profiles)
+             (guix utils)
+             (gnu packages))
+
+(define* (qt-packages-manifest #:key major-version negate-version-test?)
+  "Return a manifest of Qt packages for MAJOR-VERSION, or any version if left
+unspecified.  If NEGATE-VERSION-TEST? is true, select all the Qt packages
+*not* matching MAJOR-VERSION."
+  (manifest
+   (map package->manifest-entry
+        (fold-packages
+         (lambda (package lst)
+           (let ((uri (and=> (package-source package)
+                             (lambda (x)
+                               (and (origin? x)
+                                    (origin-uri x))))))
+             (if (and uri
+                      (string? uri)
+                      (string-prefix? "mirror://qt/" uri)
+                      (if major-version
+                          ((if negate-version-test? not identity)
+                           (string=? major-version (version-major
+                                                    (package-version package))))
+                          #t))
+                 (cons package lst)
+                 lst)))
+         '()))))
diff --git a/etc/teams/qt/qt-manifest.scm b/etc/teams/qt/qt-manifest.scm
new file mode 100644
index 0000000000..0d8fa95bfe
--- /dev/null
+++ b/etc/teams/qt/qt-manifest.scm
@@ -0,0 +1,34 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; This file returns a manifest of packages related to linux-libre.
+;;; Simplistically, it selects packages whose names begin with "linux-libre".
+;;; It is used to assist continuous integration of the kernel packages.
+
+(load "common.scm")
+
+;;; Commentary:
+;;;
+;;; This manifest can be used to update the latest Qt packages collection, via
+;;; e.g.:
+;;;
+;;; ./pre-inst-env guix refresh -u -m etc/teams/qt/qt-manifest.scm
+;;;
+;;; Code:
+
+(qt-packages-manifest #:major-version "5" #:negate-version-test? #t)
diff --git a/etc/teams/qt/qt5-manifest.scm b/etc/teams/qt/qt5-manifest.scm
new file mode 100644
index 0000000000..8d879f182e
--- /dev/null
+++ b/etc/teams/qt/qt5-manifest.scm
@@ -0,0 +1,34 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; This file returns a manifest of packages related to linux-libre.
+;;; Simplistically, it selects packages whose names begin with "linux-libre".
+;;; It is used to assist continuous integration of the kernel packages.
+
+(load "common.scm")
+
+;;; Commentary:
+;;;
+;;; This manifest can be used to update the Qt 5 packages collection, via
+;;; e.g.:
+;;;
+;;; ./pre-inst-env guix refresh -u -m etc/teams/qt/qt5-manifest.scm --to-version=5.15.10
+;;;
+;;; Code:
+
+(qt-packages-manifest #:major-version "5")
-- 
2.41.0

Maxim Cournoyer wrote on 14 Aug 2023 06:29

[PATCH 05/26] gnu: qtbase: Enable zstd support.

Recipients:(address . 65280@debbugs.gnu.org)(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)

Message-ID:0183f1f30be8e2c5ff7c6fca6c0834273f054fc9.1691987375.git.maxim.cournoyer@gmail.com

* gnu/packages/qt.scm (qtbase) [inputs]: Add zstd:lib.

---

gnu/packages/qt.scm | 3 ++-

1 file changed, 2 insertions(+), 1 deletion(-)

Toggle diff (16 lines)diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 03c9256a48..7d77d8ff80 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -883,7 +883,8 @@ (define-public qtbase
                 libsm
                 libxcb
                 libxext
-                xcb-util-cursor)))
+                xcb-util-cursor
+                `(,zstd "lib"))))
     (native-search-paths
      (list (search-path-specification
             (variable "QMAKEPATH")
-- 
2.41.0

Maxim Cournoyer wrote on 14 Aug 2023 06:29

[PATCH 04/26] gnu: qtbase: Update to 6.5.2.

Recipients:(address . 65280@debbugs.gnu.org)(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)

Message-ID:20e48e84f2a08aa6a139a6f206fb45fdb1a46669.1691987375.git.maxim.cournoyer@gmail.com

* gnu/packages/qt.scm (qtbase): Update to 6.5.2.  Use normal inheritance, not
package/inherit, as the package is distinct and not a variant (it does not use
the same source).
[arguments]: Disable a few newly failing tests in the check phase.  Adjust the
patch-mkspecs phase.
[inputs]: Remove extraneous postgresql replacement.  Add at-spi2-core, libice,
libsm, libxext and xcb-util-cursor.
---

 gnu/packages/qt.scm | 33 ++++++++++++++++++++++++++-------
 1 file changed, 26 insertions(+), 7 deletions(-)

Toggle diff (73 lines)diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index a4de003647..03c9256a48 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -581,15 +581,16 @@ (define-public qtbase-5
     (license (list license:lgpl2.1 license:lgpl3))))
 
 (define-public qtbase
-  (package/inherit qtbase-5
+  (package
+    (inherit qtbase-5)
     (name "qtbase")
-    (version "6.3.2")
+    (version "6.5.2")
     (source (origin
               (inherit (package-source qtbase-5))
               (uri (qt-url name version))
               (sha256
                (base32
-                "19m9r8sf9mvyrwipn44if3nhding4ljys2mwf04b7dkhz16vlabr"))
+                "0s8jwzdcv97dfy8n3jjm8zzvllv380l73mwdva7rs2nqnhlwgd1x"))
               (modules '((guix build utils)))
               (snippet
                ;; corelib uses bundled harfbuzz, md4, md5, sha3
@@ -742,6 +743,18 @@ (define-public qtbase
                      (list
                       ;; The 'tst_moc' test fails with "'fi.exists()' returned FALSE".
                       "tst_moc"
+
+                      ;; The 'tst_qdate' test fails because the current time
+                      ;; is reported as an invalid date (see:
+                      ;; https://bugreports.qt.io/browse/QTBUG-116017).
+                      "tst_qdate"
+
+                      ;; The qgraphicsview and qopenglwidget tests fail with a
+                      ;; segfault for unknown reasons (see:
+                      ;; https://bugreports.qt.io/browse/QTBUG-116018).
+                      "tst_qgraphicsview"
+                      "tst_qopenglwidget"
+
                       ;; The 'test_rcc' test fails on a comparison:
                       ;; <<<<<< actual
                       ;; 0x0,0x0,0x0,0x0,0x0,0x0,0x3,0xe8,
@@ -853,8 +866,7 @@ (define-public qtbase
                              (search-input-file
                               outputs
                               (string-append "lib/qt6/mkspecs/features/" file)))
-                           '("device_config.prf" "moc.prf" "qt_build_config.prf"
-                             "qt_config.prf"))
+                           '("device_config.prf" "moc.prf" "qt_config.prf"))
                     (("\\$\\$\\[QT_HOST_DATA/get\\]") archdata)
                     (("\\$\\$\\[QT_HOST_DATA/src\\]") archdata)))))))))
     (native-inputs
@@ -863,8 +875,15 @@ (define-public qtbase
                 xvfb-run)))
     (inputs
      (modify-inputs (package-inputs qtbase-5)
-       (prepend bash-minimal coreutils-minimal libxcb md4c)
-       (replace "postgresql" postgresql))) ;use latest postgresql
+       (prepend at-spi2-core
+                bash-minimal
+                coreutils-minimal
+                md4c
+                libice
+                libsm
+                libxcb
+                libxext
+                xcb-util-cursor)))
     (native-search-paths
      (list (search-path-specification
             (variable "QMAKEPATH")
-- 
2.41.0

Maxim Cournoyer wrote on 14 Aug 2023 06:29

[PATCH 06/26] gnu: qt5compat: Update to 6.5.2.

Recipients:(address . 65280@debbugs.gnu.org)(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)

Message-ID:32f9a47709a62d0a17b40ad8354b1762fd17066c.1691987375.git.maxim.cournoyer@gmail.com

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

---

gnu/packages/qt.scm | 4 ++--

1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (22 lines)diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 7d77d8ff80..2cb395629a 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -968,13 +968,13 @@ (define-public qt3d-5
 (define-public qt5compat
   (package
     (name "qt5compat")
-    (version "6.3.2")
+    (version "6.5.2")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "1k30hnwnlbay1hnkdavgf6plsdzrryzcqd2qz8x11r477w7sr8wi"))))
+                "1i4izabbmf1dayzlj1miz7hsm4cy0qb7i72pwyl2fp05w8pf9axr"))))
     (build-system cmake-build-system)
     (arguments
      (list
-- 
2.41.0

Maxim Cournoyer wrote on 14 Aug 2023 06:29

[PATCH 07/26] gnu: qtsvg: Update to 6.5.2.

Recipients:(address . 65280@debbugs.gnu.org)(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)

Message-ID:f7f972ee9fe4ecbedf7f379ea49e26b2216ce0c1.1691987375.git.maxim.cournoyer@gmail.com

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

---

gnu/packages/qt.scm | 4 ++--

1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (22 lines)diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 2cb395629a..1e7815dce2 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1066,13 +1066,13 @@ (define-public qtsvg-5
 (define-public qtsvg
   (package
     (name "qtsvg")
-    (version "6.3.2")
+    (version "6.5.2")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "14i3f23k9k0731akpwa6zzhw5m3c0m2l5r7irvim4h4faah445ac"))))
+                "18v337lfk8krg0hff5jx6fi7gn6x3djn03x3psrhlbmgjc8crd28"))))
     (build-system cmake-build-system)
     (arguments
      (list
-- 
2.41.0

Maxim Cournoyer wrote on 14 Aug 2023 06:29

[PATCH 08/26] gnu: qtimageformats: Rename variable to qtimageformats-5.

Recipients:(address . 65280@debbugs.gnu.org)(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)

Message-ID:5ab9d0903e7e2325adbc83142433c7b7f856d5f5.1691987375.git.maxim.cournoyer@gmail.com

* gnu/packages/qt.scm (qtimageformats): Rename to...
(qtimageformats-5): ... this.
* gnu/packages/telegram.scm (telegram-desktop): Adjust accordingly.
* gnu/packages/image-viewers.scm (qview): Likewise.
* gnu/packages/geo.scm (openorienteering-mapper): Likewise.
---

 gnu/packages/geo.scm           | 2 +-
 gnu/packages/image-viewers.scm | 2 +-
 gnu/packages/qt.scm            | 2 +-
 gnu/packages/telegram.scm      | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

Toggle diff (54 lines)diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm
index cce4f2518d..a2f97a35b8 100644
--- a/gnu/packages/geo.scm
+++ b/gnu/packages/geo.scm
@@ -2432,7 +2432,7 @@ (define-public openorienteering-mapper
        ("gdal" ,gdal)
        ("proj" ,proj)
        ("qtbase" ,qtbase-5)
-       ("qtimageformats" ,qtimageformats)
+       ("qtimageformats" ,qtimageformats-5)
        ("qtlocation" ,qtlocation)
        ("qtsensors" ,qtsensors)
        ("zlib" ,zlib)))
diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm
index 70f3f37768..0ce3a27b01 100644
--- a/gnu/packages/image-viewers.scm
+++ b/gnu/packages/image-viewers.scm
@@ -730,7 +730,7 @@ (define-public qview
     (native-inputs
      (list qttools-5))
     (inputs
-     (list qtbase-5 qtimageformats qtsvg-5))
+     (list qtbase-5 qtimageformats-5 qtsvg-5))
     (home-page "https://interversehq.com/qview/")
     (synopsis "Convenient and minimal image viewer")
     (description "qView is a Qt image viewer designed with visually
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 1e7815dce2..b6fe7bd14a 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1094,7 +1094,7 @@ (define-public qtsvg
     (home-page (package-home-page qtbase))
     (license (package-license qtbase))))
 
-(define-public qtimageformats
+(define-public qtimageformats-5
   (package (inherit qtsvg-5)
     (name "qtimageformats")
     (version "5.15.8")
diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm
index aa5c303603..dffc6b8ff4 100644
--- a/gnu/packages/telegram.scm
+++ b/gnu/packages/telegram.scm
@@ -517,7 +517,7 @@ (define-public telegram-desktop
            qrcodegen-cpp
            qtbase-5
            qtdeclarative-5
-           qtimageformats
+           qtimageformats-5
            qtsvg-5
            qtwayland-5
            range-v3
-- 
2.41.0

Maxim Cournoyer wrote on 14 Aug 2023 06:29

[PATCH 09/26] gnu: qtimageformats-5: Fix indentation.

Recipients:(address . 65280@debbugs.gnu.org)(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)

Message-ID:5af3c3a604c2e6bd1c21b492755a1686479b3abb.1691987375.git.maxim.cournoyer@gmail.com

* gnu/packages/qt.scm (qtimageformats-5): Fix indentation.

---

gnu/packages/qt.scm | 21 +++++++++++----------

1 file changed, 11 insertions(+), 10 deletions(-)

Toggle diff (37 lines)diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index b6fe7bd14a..e1869802ea 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1095,19 +1095,20 @@ (define-public qtsvg
     (license (package-license qtbase))))
 
 (define-public qtimageformats-5
-  (package (inherit qtsvg-5)
+  (package
+    (inherit qtsvg-5)
     (name "qtimageformats")
     (version "5.15.8")
     (source (origin
-             (method url-fetch)
-             (uri (qt-url name version))
-             (sha256
-              (base32
-               "0c6fq9zcw5hbkiny56wx2fbm123x14l7habydv6zhvnhn3rhwi31"))
-             (modules '((guix build utils)))
-             (snippet
-              '(begin
-                 (delete-file-recursively "src/3rdparty")))))
+              (method url-fetch)
+              (uri (qt-url name version))
+              (sha256
+               (base32
+                "0c6fq9zcw5hbkiny56wx2fbm123x14l7habydv6zhvnhn3rhwi31"))
+              (modules '((guix build utils)))
+              (snippet
+               '(begin
+                  (delete-file-recursively "src/3rdparty")))))
     (native-inputs `())
     (inputs
      (list jasper
-- 
2.41.0

Maxim Cournoyer wrote on 14 Aug 2023 06:29

[PATCH 10/26] gnu: Add qtimageformats.

Recipients:(address . 65280@debbugs.gnu.org)(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)

Message-ID:b450da719d7e8e15ab0c033564bdbac6eeb75516.1691987375.git.maxim.cournoyer@gmail.com

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

---

gnu/packages/qt.scm | 34 ++++++++++++++++++++++++++++++++++

1 file changed, 34 insertions(+)

Toggle diff (47 lines)diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index e1869802ea..d9ca408721 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1122,6 +1122,40 @@ (define-public qtimageformats-5
     (description "The QtImageFormats module contains plugins for adding
 support for MNG, TGA, TIFF and WBMP image formats.")))
 
+(define-public qtimageformats
+  (package
+    (name "qtimageformats")
+    (version "6.5.2")
+    (source (origin
+              (inherit (package-source qtimageformats-5))
+              (method url-fetch)
+              (uri (qt-url name version))
+              (sha256
+               (base32
+                "0hv7mkn72126rkhy5gmjmbvzy7v17mkk3q2pkmzy99f64j4w1q5a"))))
+    (build-system cmake-build-system)
+    (arguments
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-before 'check 'set-display
+            (lambda _
+              ;; Make Qt render "offscreen", required for tests.
+              (setenv "QT_QPA_PLATFORM" "offscreen"))))))
+    (inputs
+     (list jasper
+           libmng
+           libtiff
+           libwebp
+           mesa
+           qtbase
+           zlib))
+    (synopsis "Additional Image Format plugins for Qt")
+    (description "The QtImageFormats module contains plugins for adding
+support for MNG, TGA, TIFF and WBMP image formats.")
+    (home-page (package-home-page qtbase))
+    (license (package-license qtbase))))
+
 (define-public qtx11extras
   (package (inherit qtsvg-5)
     (name "qtx11extras")
-- 
2.41.0

Maxim Cournoyer wrote on 14 Aug 2023 06:29

[PATCH 11/26] gnu: Add qtlanguageserver.

Recipients:(address . 65280@debbugs.gnu.org)(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)

Message-ID:004f1f87db1d395e4adc83782f9ce19c384faf94.1691987375.git.maxim.cournoyer@gmail.com

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

---

gnu/packages/qt.scm | 24 ++++++++++++++++++++++++

1 file changed, 24 insertions(+)

Toggle diff (37 lines)diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index d9ca408721..d66ecda169 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1940,6 +1940,30 @@ (define-public qtwebview
 application without necessarily including a full web browser stack by using
 native APIs where it makes sense.")))
 
+(define-public qtlanguageserver
+  (package
+    (name "qtlanguageserver")
+    (version "6.5.2")
+    (source (origin
+              (method url-fetch)
+              (uri (qt-url name version))
+              (sha256
+               (base32
+                "196iicwpqca2ydpca41qs6aqxxq8ycknw6lm2v00h1w3m86frdbk"))))
+    (build-system cmake-build-system)
+    (arguments
+     (list #:phases #~(modify-phases %standard-phases
+                        (add-after 'install 'delete-installed-tests
+                          (lambda _
+                            (delete-file-recursively
+                             (string-append #$output "/tests")))))))
+    (inputs (list qtbase))
+    (home-page (package-home-page qtbase))
+    (synopsis "Implementation of the Language Server Protocol for Qt")
+    (description "This package provides an implementation of the Language
+Server Protocol (LSP) for Qt.")
+    (license (package-license qtbase))))
+
 (define-public qtlocation
   (package
     (inherit qtsvg-5)
-- 
2.41.0

Maxim Cournoyer wrote on 14 Aug 2023 06:29

[PATCH 12/26] gnu: qtdeclarative: Update to 6.5.2.

Recipients:(address . 65280@debbugs.gnu.org)(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)

Message-ID:ca4a2321abfe312cb1f414bd23662a4bd92177f7.1691987375.git.maxim.cournoyer@gmail.com

* gnu/packages/qt.scm (qtdeclarative): Update to 6.5.2.

[arguments]: Disable a few extra tests in check phase.

[inputs]: Add at-spi2-core, qtimageformats, qtlanguageserver and qtsvg.

---

gnu/packages/qt.scm | 27 ++++++++++++++++++++++-----

1 file changed, 22 insertions(+), 5 deletions(-)

Toggle diff (61 lines)diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index d66ecda169..e362ae7a15 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1300,14 +1300,14 @@ (define-public qtdeclarative-5
 (define-public qtdeclarative
   (package
     (name "qtdeclarative")
-    (version "6.3.2")
+    (version "6.5.2")
     ;; TODO: Package 'masm' and unbundle from sources.
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "1hbw63828pp8vm9b46i2pkcbcpr4mq9nblhmpwrw2pflq0fi24xq"))
+                "06c7xfqn2a5s2m8j1bcvx3pyjqg1rgqkjvp49737gb4z9vjiz8gk"))
               (patches (search-patches "qtdeclarative-disable-qmlcache.patch"))))
     (build-system cmake-build-system)
     (arguments
@@ -1405,7 +1405,20 @@ (define-public qtdeclarative
                     ;; waiting for a killed process, which becomes a zombie in
                     ;; the build container (perhaps solved after
                     ;; fixing/applying #30948).
-                    "tst_qqmlpreview") "|")
+                    "tst_qqmlpreview"
+
+                    ;; These tests fail starting with 6.5.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.
+                    "cmake_test_common_import_path"
+                    "tst_qqmlcomponent"
+                    "tst_qmllint"
+                    "tst_qmldomitem"
+                    "tst_dom_all"
+                    "tst_qmlls"
+                    "tst_qmllscompletions"
+                    ) "|")
                   ")")))))
           (add-after 'install 'delete-installed-tests
             (lambda _
@@ -1418,9 +1431,13 @@ (define-public qtdeclarative
            qtshadertools
            vulkan-headers))
     (inputs
-     (list libxkbcommon
+     (list at-spi2-core
+           libxkbcommon
            mesa
-           qtbase))
+           qtbase
+           qtimageformats
+           qtlanguageserver
+           qtsvg))
     (home-page (package-home-page qtbase))
     (synopsis "Qt QML module (Quick 2)")
     (description "The Qt QML module provides a framework for developing
-- 
2.41.0

Maxim Cournoyer wrote on 14 Aug 2023 06:29

[PATCH 13/26] gnu: qtwebsockets: Update to 6.5.2.

Recipients:(address . 65280@debbugs.gnu.org)(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)

Message-ID:d6e93b9656f7cb1d01cb5e63c5f2d7f638286bc1.1691987375.git.maxim.cournoyer@gmail.com

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

---

gnu/packages/qt.scm | 4 ++--

1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (22 lines)diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index e362ae7a15..b5831c79dc 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1492,13 +1492,13 @@ (define-public qtwebsockets-5
 (define-public qtwebsockets
   (package
     (name "qtwebsockets")
-    (version "6.3.2")
+    (version "6.5.2")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "1smbvidaybphvsmaap9v1pbkibwmng11hb925g0ww4ghwzpxkb8q"))))
+                "0xjwifxj2ssshys6f6kjr6ri2vq1wfshxky6mcscjm7vvyqdfjr0"))))
     (build-system cmake-build-system)
     (arguments
      (list
-- 
2.41.0

Maxim Cournoyer wrote on 14 Aug 2023 06:29

[PATCH 14/26] gnu: qtshadertools: Update to 6.5.2.

Recipients:(address . 65280@debbugs.gnu.org)(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)

Message-ID:beca9c0d3572b292eb6540123009befbebfaa3fb.1691987375.git.maxim.cournoyer@gmail.com

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

---

gnu/packages/qt.scm | 4 ++--

1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (24 lines)diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index b5831c79dc..3ccddf5af3 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1605,7 +1605,7 @@ (define-public qtmultimedia-5
 (define-public qtshadertools
   (package
     (name "qtshadertools")
-    (version "6.3.2")
+    (version "6.5.2")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
@@ -1613,7 +1613,7 @@ (define-public qtshadertools
               ;; sources.
               (sha256
                (base32
-                "1bmkrpk414clx8pnyrdslqlsnfmsdldmwrdcqzz6rwi8ymk2ggpn"))))
+                "0g8aziqhds2fkx11y4p2akmyn2p1qqf2fjxv72f9pibnhpdv0gya"))))
     (build-system cmake-build-system)
     (arguments
      (list
-- 
2.41.0

Maxim Cournoyer wrote on 14 Aug 2023 06:29

[PATCH 15/26] gnu: qtmultimedia: Update to 6.5.2.

Recipients:(address . 65280@debbugs.gnu.org)(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)

Message-ID:2330db882a343af2c09328fa32d9f858ba768d7c.1691987375.git.maxim.cournoyer@gmail.com

* gnu/packages/qt.scm (qtmultimedia): Update to 6.5.2.

---

gnu/packages/qt.scm | 4 ++--

1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (22 lines)diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 3ccddf5af3..b86de7e2a8 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1634,13 +1634,13 @@ (define-public qtshadertools
 (define-public qtmultimedia
   (package
     (name "qtmultimedia")
-    (version "6.3.2")
+    (version "6.5.2")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "0hqwq0ad6z8c5kyyvbaddj00mciijn2ns2r60jc3mqh98nm2js3z"))
+                "0xc9k4mlncscxqbp8q46yjd89k4jb8j0ggbi5ad874lycym013wl"))
               (modules '((guix build utils)))
               (snippet
                '(begin
-- 
2.41.0

Maxim Cournoyer wrote on 14 Aug 2023 06:29

[PATCH 16/26] gnu: qtwayland: Update to 6.5.2.

Recipients:(address . 65280@debbugs.gnu.org)(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)

Message-ID:7b6a94d10fbf53e6fea9db9e1eb2e5ef5cefef52.1691987376.git.maxim.cournoyer@gmail.com

* gnu/packages/qt.scm (qtwayland): Update to 6.5.2.

---

gnu/packages/qt.scm | 4 ++--

1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (22 lines)diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index b86de7e2a8..e7675a93bb 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1749,13 +1749,13 @@ (define-public qtwayland-5
 (define-public qtwayland
   (package
     (name "qtwayland")
-    (version "6.3.2")
+    (version "6.5.2")
     (source
      (origin
        (method url-fetch)
        (uri (qt-url name version))
        (sha256
-        (base32 "0rwiirkibgpvx05pg2842j4dcq9ckxmcqxhaf50xx2i55z64ll83"))))
+        (base32 "16iwar19sgjvxgmbr6hmd3hsxp6ahdjwl1lra2wapl3zzf3bw81h"))))
     (build-system cmake-build-system)
     (arguments
      (list #:configure-flags #~(list "-DQT_BUILD_TESTS=ON")
-- 
2.41.0

Maxim Cournoyer wrote on 14 Aug 2023 06:29

[PATCH 17/26] gnu: qtwebchannel: Update to 6.5.2.

Recipients:(address . 65280@debbugs.gnu.org)(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)

Message-ID:582392fd39566d83b3bee23ee9e54e20afc3f85d.1691987376.git.maxim.cournoyer@gmail.com

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

---

gnu/packages/qt.scm | 4 ++--

1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (22 lines)diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index e7675a93bb..3f481d1729 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1876,13 +1876,13 @@ (define-public qtwebchannel-5
 (define-public qtwebchannel
   (package
     (name "qtwebchannel")
-    (version "6.3.2")
+    (version "6.5.2")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "0gqm09yqdq27kgb02idx5ycj14k5mjhh10ddp9jfs8lblimlgfni"))))
+                "0qwfnwva7v5f2g5is17yy66mnmc9c1yf9aagaw5qanskdvxdk261"))))
     (build-system cmake-build-system)
     (arguments
      (list
-- 
2.41.0

Maxim Cournoyer wrote on 14 Aug 2023 06:29

[PATCH 18/26] gnu: qtlottie: Update to 6.5.2.

Recipients:(address . 65280@debbugs.gnu.org)(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)

Message-ID:5469e6d1db6a0bf3b9f21204092e697db66208f9.1691987376.git.maxim.cournoyer@gmail.com

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

---

gnu/packages/qt.scm | 4 ++--

1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (22 lines)diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 3f481d1729..c5b590e58c 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -2009,13 +2009,13 @@ (define-public qtlocation
 (define-public qtlottie
   (package
     (name "qtlottie")
-    (version "6.3.2")
+    (version "6.5.2")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "1c092hmf114r8jfdhkhxnn3vywj93mg33whzav47gr9mbza44icq"))))
+                "16z8fhaa40ig0cggb689zf8j3cid6fk6pmh91b8342ymy1fdqfh0"))))
     (build-system cmake-build-system)
     (arguments
      (list
-- 
2.41.0

Maxim Cournoyer wrote on 14 Aug 2023 06:29

[PATCH 19/26] gnu: qttools: Update to 6.5.2.

Recipients:(address . 65280@debbugs.gnu.org)(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)

Message-ID:d5a2d544d89cb9f7a145ded1a84b52104419d25a.1691987376.git.maxim.cournoyer@gmail.com

* gnu/packages/qt.scm (qttools): Update to 6.5.2.

---

gnu/packages/qt.scm | 4 ++--

1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (22 lines)diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index c5b590e58c..4c8e7fd535 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -2062,13 +2062,13 @@ (define-public qttools-5
 (define-public qttools
   (package
     (name "qttools")
-    (version "6.3.2")
+    (version "6.5.2")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "1lmfk5bhgg4daxkqrhmx4iyln7pyiz40c9cp6plyp35nz8ppvc75"))))
+                "0ha3v488vnm4pgdpyjgf859sak0z2fwmbgcyivcd93qxflign7sm"))))
     (build-system cmake-build-system)
     (arguments
      (list
-- 
2.41.0

Maxim Cournoyer wrote on 14 Aug 2023 06:29

[PATCH 20/26] gnu: qttranslations: Update to 6.5.2.

Recipients:(address . 65280@debbugs.gnu.org)(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)

Message-ID:c706363e9c9e639c2545cbeb882ac3d9f383ae6c.1691987376.git.maxim.cournoyer@gmail.com

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

---

gnu/packages/qt.scm | 4 ++--

1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (22 lines)diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 4c8e7fd535..6614daae62 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -2102,13 +2102,13 @@ (define-public qttools
 (define-public qttranslations
   (package
     (name "qttranslations")
-    (version "6.3.2")
+    (version "6.5.2")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "1h66n9cx4g65c9wrgp32h9gm3r47gyh1nrcn3ivbfbvngfawqxpg"))))
+                "1sxy2ljn5ajvn4yjb8fx86l56viyvqh5r9hf5x67azkmgrilaz1k"))))
     (build-system cmake-build-system)
     (arguments (list #:tests? #f))
     (native-inputs (list qtbase qttools))
-- 
2.41.0

Maxim Cournoyer wrote on 14 Aug 2023 06:29

[PATCH 21/26] gnu: qtpositioning: Update to 6.5.2.

Recipients:(address . 65280@debbugs.gnu.org)(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)

Message-ID:a1d51eadefdfa33141ce674f4f18527548c88d96.1691987376.git.maxim.cournoyer@gmail.com

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

---

gnu/packages/qt.scm | 4 ++--

1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (22 lines)diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 6614daae62..4f736207b9 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -2266,13 +2266,13 @@ (define-public qtscxml
 (define-public qtpositioning
   (package
     (name "qtpositioning")
-    (version "6.3.2")
+    (version "6.5.2")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "0zh45lf164nzwl1hh96qm64nyw9wzzrnm5s7sx761glz54q6l5xz"))))
+                "1yhlfs8izc054qv1krf5qv6zzjlvmz013h74fwamn74dfh1kyjbh"))))
     (build-system cmake-build-system)
     (arguments
      (list
-- 
2.41.0

Maxim Cournoyer wrote on 14 Aug 2023 06:29

[PATCH 22/26] gnu: qtnetworkauth: Update to 6.5.2.

Recipients:(address . 65280@debbugs.gnu.org)(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)

Message-ID:1ae44c04d551dd2b7c95ea3753fe7561ea5b723d.1691987376.git.maxim.cournoyer@gmail.com

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

---

gnu/packages/qt.scm | 4 ++--

1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (22 lines)diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 4f736207b9..bec561d2a4 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -2379,13 +2379,13 @@ (define-public qtnetworkauth-5
 (define-public qtnetworkauth
   (package
     (name "qtnetworkauth")
-    (version "6.3.2")
+    (version "6.5.2")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "0mjnz87splyxq7jwydi5ws2aqb6j7czscrkns193w425x0dgy94l"))))
+                "0g18kh3zhcfi9ni8cqbbjdc1l6jf99ijv5shcl42jk6219b4pk2f"))))
     (build-system cmake-build-system)
     (arguments (list #:configure-flags #~(list "-DQT_BUILD_TESTS=ON")))
     (native-inputs (list perl))
-- 
2.41.0

Maxim Cournoyer wrote on 14 Aug 2023 06:29

[PATCH 23/26] gnu: qtremoteobjects: Update to 6.5.2.

Recipients:(address . 65280@debbugs.gnu.org)(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)

Message-ID:0879622ab9b9aef0b7cdbfc186c330c59c9f36cb.1691987376.git.maxim.cournoyer@gmail.com

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

---

gnu/packages/qt.scm | 4 ++--

1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (22 lines)diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index bec561d2a4..8360b16bb3 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -2399,13 +2399,13 @@ (define-public qtnetworkauth
 (define-public qtremoteobjects
   (package
     (name "qtremoteobjects")
-    (version "6.3.2")
+    (version "6.5.2")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "099b3vchi458i4fci9kfwan871jplqlk5l8q78mfnh33g80qnasi"))))
+                "0k29sk02n54vj1w6vh6xycsjpyfqlijc13fnxh1q7wpgg4gizx60"))))
     (build-system cmake-build-system)
     (arguments
      (list
-- 
2.41.0

Maxim Cournoyer wrote on 14 Aug 2023 06:29

[PATCH 24/26] gnu: qtwebengine: Update to 6.5.2.

Recipients:(address . 65280@debbugs.gnu.org)(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)

Message-ID:81d675680b9338729f9b6c77cd9c3439afbfb8e1.1691987376.git.maxim.cournoyer@gmail.com

* gnu/packages/qt.scm (qtwebengine): Update to 6.5.2.

---

gnu/packages/qt.scm | 4 ++--

1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (23 lines)diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 8360b16bb3..412af0d913 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -2873,14 +2873,14 @@ (define-public qtwebengine-5
 (define-public qtwebengine
   (package
     (name "qtwebengine")
-    (version "6.3.2")
+    (version "6.5.2")
     (source
      (origin
        (method url-fetch)
        (uri (qt-url name version))
        (sha256
         (base32
-         "09j4w9ax8242d1yx3hmic7jcwidwdrn8sp7k89hj4l0n8mzkkd35"))
+         "17qxf3asyxq6kcqqvml170n7rnzih3nr4srp9r5v80pmas5l7jg7"))
        (modules '((ice-9 ftw)
                   (ice-9 match)
                   (srfi srfi-1)
-- 
2.41.0

Maxim Cournoyer wrote on 14 Aug 2023 06:29

[PATCH 25/26] gnu: Remove qtquickcontrols2.

Recipients:(address . 65280@debbugs.gnu.org)(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)

Message-ID:118b2b5e6457b6834a8803108737987cda584941.1691987376.git.maxim.cournoyer@gmail.com

* gnu/packages/qt.scm (qtquickcontrols2): Delete variable.

(pyotherside) [inputs]: Remove qtquickcontrols2.

---

gnu/packages/qt.scm | 8 +-------

1 file changed, 1 insertion(+), 7 deletions(-)

Toggle diff (28 lines)diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 412af0d913..50731ba8ac 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -2180,12 +2180,6 @@ (define-public qtquickcontrols2-5
 and tray icons.  It falls back to Qt Widgets when a native implementation is
 not available.")))
 
-(define-public qtquickcontrols2
-  ;; qtquickcontrols2 still exist, but was merged into qtdeclarative.
-  ;; Unfortunately that hasn't been well communicated at all (see:
-  ;; https://bugreports.qt.io/browse/QTBUG-79454).
-  (deprecated-package "qtquickcontrols2" qtdeclarative))
-
 (define-public qtgraphicaleffects
   (package
     (inherit qtsvg-5)
@@ -3344,7 +3338,7 @@ (define-public pyotherside
             ;; installation prefix.
             (lambda _
               (invoke "make" "sub-src-install_subtargets"))))))
-    (inputs (list python qtdeclarative qtquickcontrols2 qtsvg))
+    (inputs (list python qtdeclarative qtsvg))
     (home-page "https://thp.io/2011/pyotherside/")
     (synopsis "Qt plugin providing access to a Python 3 interpreter from QML")
     (description "Pyotherside is a Qt plugin providing access to a Python 3
-- 
2.41.0

Maxim Cournoyer wrote on 14 Aug 2023 06:29

[PATCH 26/26] gnu: qt-creator: Update to 11.0.1.

Recipients:(address . 65280@debbugs.gnu.org)(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)

Message-ID:cb1979dee1e2fc4a3311fe0674f3d1afb125e816.1691987376.git.maxim.cournoyer@gmail.com

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

[source]: Adjust snippet.

[arguments]: Adjust patch-paths phase. Disable new failing tests.

---

gnu/packages/qt.scm | 32 +++++++++++++++++++++++++-------

1 file changed, 25 insertions(+), 7 deletions(-)

Toggle diff (82 lines)diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 50731ba8ac..bfcf3affc5 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -4789,7 +4789,7 @@ (define-public clazy
 (define-public qt-creator
   (package
     (name "qt-creator")
-    (version "9.0.0")
+    (version "11.0.1")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -4803,7 +4803,6 @@ (define-public qt-creator
                            ;; Remove bundled libraries, where supported.
                            ;; TODO: package and unbundle litehtml
                            '("src/libs/3rdparty/yaml-cpp"
-                             "src/shared/qbs/src/shared/qtscript/src/3rdparty"
                              "tests/unit/unittest/3rdparty"
                              ;; Marketplace recommends nonfree extensions;
                              ;; remove it.
@@ -4814,7 +4813,7 @@ (define-public qt-creator
                             ((".*marketplace/marketplace.qbs.*") ""))))
               (sha256
                (base32
-                "1adyxs0cnqx14gwzkvh909c52449ia6y87n1r4qf6wwydhch43cs"))))
+                "0j90dv9micqsvj4r7iqd11szixr0mlpna4w5s2lnyqckjs6a0mm6"))))
     (build-system qt-build-system)
     (arguments
      (list
@@ -4845,10 +4844,11 @@ (define-public qt-creator
                              "src/libs/utils/deviceshell.cpp")
                 (("/bin/sh")
                  (search-input-file inputs "bin/sh")))
-              (substitute* "src/libs/utils/qtcprocess.cpp"
+              (substitute* "src/libs/utils/process.cpp"
                 (("/usr/bin/env")
                  (search-input-file inputs "bin/env")))
-              (substitute* "tests/auto/utils/qtcprocess/tst_qtcprocess.cpp"
+              (substitute* '("tests/auto/utils/process/tst_process.cpp"
+                             "tests/auto/utils/commandline/tst_commandline.cpp")
                 (("/bin/sh")
                  (which "sh")))))
           (add-before 'build 'build-doc
@@ -4861,7 +4861,6 @@ (define-public qt-creator
               (invoke "cmake" "--install" "." "--prefix" #$output
                       "--component=html_docs")))
           (replace 'check
-            ;; Loosely based on .github/workflows/build_cmake.yml.
             (lambda* (#:key tests? parallel-tests? #:allow-other-keys)
               (when tests?
                 (invoke "xvfb-run"      ;for the 'renderpass' tests
@@ -4869,7 +4868,26 @@ (define-public qt-creator
                                          (number->string (parallel-job-count))
                                          "1")
                         "--label-exclude" "exclude_from_precheck"
-                        "--exclude-regex" "tst_perfdata"))))
+                        "-E"
+                        (string-append
+                         "("
+                         (string-join
+                          (list
+                           ;; The performance data tests require external
+                           ;; data.
+                           "tst_perfdata"
+                           ;; These tests fail due to not being able to create
+                           ;; an OpenGL context, with error "This plugin does
+                           ;; not support createPlatformOpenGLContext" (see:
+                           ;; https://bugreports.qt.io/browse/QTCREATORBUG-29495).
+                           "tst_tracing_timelineitemsrenderpass"
+                           "tst_tracing_timelinenotesrenderpass"
+                           "tst_tracing_timelineselectionrenderpass"
+                           ;; This test relies on counting processes, counts
+                           ;; only 0 of them instead of 5 for unknown reasons.
+                           "tst_process"
+                           ) "|")
+                         ")")))))
           (add-after 'qt-wrap 'wrap-bin
             ;; Make a few well-integrated tools readily available.
             (lambda* (#:key inputs outputs #:allow-other-keys)
-- 
2.41.0

??? wrote on 16 Aug 2023 12:56

Re: bug#65280: [PATCH 00/26] Refresh Qt 6 packages

Recipients:(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)

Message-ID:878rabgsrd.fsf@envs.net

Maxim Cournoyer <maxim.cournoyer@gmail.com> writes:

Toggle quote (34 lines)> This series refreshes our modern Qt 6 packages to their latest release,
> 6.5.2.  It also adds some tooling for the Qt team in the form of two manifests
> to select all the core Qt 5 packages or the other core packages.
>
>
> Maxim Cournoyer (26):
>   gnu: qt: Revert to use individual versions instead of %qt5-version.
>   gnu: qtdeclarative: Disable QML cache to avoid stale cache issues.
>   etc: Add Qt manifests for Qt maintenance.
>   gnu: qtbase: Update to 6.5.2.
>   gnu: qtbase: Enable zstd support.
>   gnu: qt5compat: Update to 6.5.2.
>   gnu: qtsvg: Update to 6.5.2.
>   gnu: qtimageformats: Rename variable to qtimageformats-5.
>   gnu: qtimageformats-5: Fix indentation.
>   gnu: Add qtimageformats.
>   gnu: Add qtlanguageserver.
>   gnu: qtdeclarative: Update to 6.5.2.
>   gnu: qtwebsockets: Update to 6.5.2.
>   gnu: qtshadertools: Update to 6.5.2.
>   gnu: qtmultimedia: Update to 6.5.2.
>   gnu: qtwayland: Update to 6.5.2.
>   gnu: qtwebchannel: Update to 6.5.2.
>   gnu: qtlottie: Update to 6.5.2.
>   gnu: qttools: Update to 6.5.2.
>   gnu: qttranslations: Update to 6.5.2.
>   gnu: qtpositioning: Update to 6.5.2.
>   gnu: qtnetworkauth: Update to 6.5.2.
>   gnu: qtremoteobjects: Update to 6.5.2.
>   gnu: qtwebengine: Update to 6.5.2.
>   gnu: Remove qtquickcontrols2.
>   gnu: qt-creator: Update to 11.0.1.
>

All look good to me, thanks!

Maxim Cournoyer wrote on 16 Aug 2023 14:10

[PATCH v2 00/59] Refresh Qt 5 and 6 packages

Recipients:(address . 65280@debbugs.gnu.org)(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)

Message-ID:cover.1692187578.git.maxim.cournoyer@gmail.com

This series refreshes our core Qt packages to their latest releases,
5.15.10 and 6.5.2.

It also adds some tooling for the Qt team in the form of two manifests to
select all the core Qt 5 packages or the other core packages, that builds on
top of the series posted at https://issues.guix.gnu.org/65230.

With this new tooling, it took less than two days to update our complete core
Qt packages collection, with the most time spent on qtwebengine (it has a
large allow-list of 3rd party libraries that needed to be tuned), as well as
investigating test failures in a few Qt 6.5.2 packages.

Changes in v2:
- Fix xcb backend by adding missing inputs
- Delete fix-tests-build phase
- Only one new test is now disabled

Maxim Cournoyer (59):
  gnu: qt: Revert to use individual versions instead of %qt5-version.
  gnu: qtdeclarative: Disable QML cache to avoid stale cache issues.
  etc: Add Qt manifests for Qt maintenance.
  gnu: qtbase: Update to 6.5.2.
  gnu: qtbase: Enable zstd support.
  gnu: qt5compat: Update to 6.5.2.
  gnu: qtsvg: Update to 6.5.2.
  gnu: qtimageformats: Rename variable to qtimageformats-5.
  gnu: qtimageformats-5: Fix indentation.
  gnu: Add qtimageformats.
  gnu: Add qtlanguageserver.
  gnu: qtdeclarative: Update to 6.5.2.
  gnu: qtwebsockets: Update to 6.5.2.
  gnu: qtshadertools: Update to 6.5.2.
  gnu: qtmultimedia: Update to 6.5.2.
  gnu: qtwayland: Update to 6.5.2.
  gnu: qtwebchannel: Update to 6.5.2.
  gnu: qtlottie: Update to 6.5.2.
  gnu: qttools: Update to 6.5.2.
  gnu: qttranslations: Update to 6.5.2.
  gnu: qtpositioning: Update to 6.5.2.
  gnu: qtnetworkauth: Update to 6.5.2.
  gnu: qtremoteobjects: Update to 6.5.2.
  gnu: qtwebengine: Update to 6.5.2.
  gnu: Remove qtquickcontrols2.
  gnu: qt-creator: Update to 11.0.1.
  gnu: qtbase-5: Update to 5.15.10.
  gnu: qt3d-5: Update to 5.15.10.
  gnu: qtsvg-5: Update to 5.15.10.
  gnu: qtimageformats-5: Update to 5.15.10.
  gnu: qtx11extras: Update to 5.15.10.
  gnu: qtxmlpatterns: Update to 5.15.10.
  gnu: qtdeclarative-5: Update to 5.15.10.
  gnu: qtconnectivity: Update to 5.15.10.
  gnu: qtwebsockets-5: Update to 5.15.10.
  gnu: qtsensors: Update to 5.15.10.
  gnu: qtmultimedia-5: Update to 5.15.10.
  gnu: qtsensors: Shorten line width.
  gnu: qtmultimedia-5: Shorten maximum line width.
  gnu: qtwayland-5: Update to 5.15.10.
  gnu: qtserialport: Update to 5.15.10.
  gnu: qtserialbus: Update to 5.15.10.
  gnu: qtwebchannel-5: Update to 5.15.10.
  gnu: qtwebglplugin: Update to 5.15.10.
  gnu: qtwebview: Update to 5.15.10.
  gnu: qtlocation: Update to 5.15.10.
  gnu: qttools-5: Update to 5.15.10.
  gnu: qtscript: Update to 5.15.10.
  gnu: qtquickcontrols-5: Update to 5.15.10.
  gnu: qtquickcontrols2-5: Update to 5.15.10.
  gnu: qtgraphicaleffects: Update to 5.15.10.
  gnu: qtgamepad: Update to 5.15.10.
  gnu: qtscxml: Update to 5.15.10.
  gnu: qtpurchasing: Update to 5.15.10.
  gnu: qtcharts: Update to 5.15.10.
  gnu: qtdatavis3d: Update to 5.15.10.
  gnu: qtnetworkauth-5: Update to 5.15.10.
  gnu: qtspeech: Update to 5.15.10.
  gnu: qtwebengine-5: Update to 5.15.10.

 etc/teams/qt/common.scm                       |  50 ++
 etc/teams/qt/qt-manifest.scm                  |  34 ++
 etc/teams/qt/qt5-manifest.scm                 |  34 ++
 gnu/local.mk                                  |   3 +-
 gnu/packages/geo.scm                          |   2 +-
 gnu/packages/image-viewers.scm                |   2 +-
 .../qtdeclarative-5-disable-qmlcache.patch    |  16 +
 .../qtdeclarative-disable-qmlcache.patch      |  16 +
 gnu/packages/patches/qtwayland-gcc-11.patch   |  18 -
 gnu/packages/qt.scm                           | 490 +++++++++++-------
 gnu/packages/telegram.scm                     |   2 +-
 11 files changed, 463 insertions(+), 204 deletions(-)
 create mode 100644 etc/teams/qt/common.scm
 create mode 100644 etc/teams/qt/qt-manifest.scm
 create mode 100644 etc/teams/qt/qt5-manifest.scm
 create mode 100644 gnu/packages/patches/qtdeclarative-5-disable-qmlcache.patch
 create mode 100644 gnu/packages/patches/qtdeclarative-disable-qmlcache.patch
 delete mode 100644 gnu/packages/patches/qtwayland-gcc-11.patch


base-commit: 8e06a5301d2857027e6acf41c28173f9530e2c9a
-- 
2.41.0

Maxim Cournoyer wrote on 16 Aug 2023 14:10

[PATCH v2 02/59] gnu: qtdeclarative: Disable QML cache to avoid stale cache issues.

Recipients:(address . 65280@debbugs.gnu.org)

Message-ID:5f432f6aa1fc188fc69ac26f13fff03a2b318a5d.1692187578.git.maxim.cournoyer@gmail.com

Fixes https://issues.guix.gnu.org/64605 and similar reports.

* gnu/packages/patches/qtdeclarative-5-disable-qmlcache.patch: New patch.

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

* gnu/local.mk (dist_patch_DATA): Register them.

* gnu/packages/qt.scm (qtdeclarative-5, qtdeclarative): Apply them.

Reported-by: Distopico Vegan <distopico@riseup.net>

---

(no changes since v1)

gnu/local.mk | 2 ++

.../qtdeclarative-5-disable-qmlcache.patch | 16 ++++++++++++++++

.../patches/qtdeclarative-disable-qmlcache.patch | 16 ++++++++++++++++

gnu/packages/qt.scm | 6 ++++--

4 files changed, 38 insertions(+), 2 deletions(-)

create mode 100644 gnu/packages/patches/qtdeclarative-5-disable-qmlcache.patch

create mode 100644 gnu/packages/patches/qtdeclarative-disable-qmlcache.patch

Toggle diff (83 lines)diff --git a/gnu/local.mk b/gnu/local.mk
index 1bf33377a4..f10fe292dc 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1732,6 +1732,8 @@ dist_patch_DATA =						\
   %D%/packages/patches/python-typeguard-python3.10.patch	\
   %D%/packages/patches/python-w3lib-fix-test-failure.patch	\
   %D%/packages/patches/python-wxwidgets-type-errors.patch	\
+  %D%/packages/patches/qtdeclarative-5-disable-qmlcache.patch	\
+  %D%/packages/patches/qtdeclarative-disable-qmlcache.patch	\
   %D%/packages/patches/quodlibet-fix-invalid-glob.patch	\
   %D%/packages/patches/quodlibet-fix-mtime-tests.patch		\
   %D%/packages/patches/qxlsx-fix-include-directory.patch	\
diff --git a/gnu/packages/patches/qtdeclarative-5-disable-qmlcache.patch b/gnu/packages/patches/qtdeclarative-5-disable-qmlcache.patch
new file mode 100644
index 0000000000..2f1cf0dd4e
--- /dev/null
+++ b/gnu/packages/patches/qtdeclarative-5-disable-qmlcache.patch
@@ -0,0 +1,16 @@
+Retrieved from
+https://github.com/NixOS/nixpkgs/raw/master/pkgs/development/libraries/qt-5/5.15/qtdeclarative-default-disable-qmlcache.patch
+
+diff --git a/src/qml/qml/qqmltypeloader.cpp b/src/qml/qml/qqmltypeloader.cpp
+index 1d66e75..827567a 100644
+--- a/src/qml/qml/qqmltypeloader.cpp
++++ b/src/qml/qml/qqmltypeloader.cpp
+@@ -727,7 +727,7 @@ bool QQmlTypeLoader::Blob::isDebugging() const
+ 
+ bool QQmlTypeLoader::Blob::diskCacheEnabled() const
+ {
+-    return (!disableDiskCache() && !isDebugging()) || forceDiskCache();
++    return forceDiskCache();
+ }
+ 
+ bool QQmlTypeLoader::Blob::qmldirDataAvailable(const QQmlRefPointer<QQmlQmldirData> &data, QList<QQmlError> *errors)
diff --git a/gnu/packages/patches/qtdeclarative-disable-qmlcache.patch b/gnu/packages/patches/qtdeclarative-disable-qmlcache.patch
new file mode 100644
index 0000000000..5f06ec53b4
--- /dev/null
+++ b/gnu/packages/patches/qtdeclarative-disable-qmlcache.patch
@@ -0,0 +1,16 @@
+Retrieved from
+https://raw.githubusercontent.com/NixOS/nixpkgs/master/pkgs/development/libraries/qt-6/patches/qtdeclarative-default-disable-qmlcache.patch
+
+diff --git a/src/qml/jsruntime/qv4engine.cpp b/src/qml/jsruntime/qv4engine.cpp
+index 852cde9e..165f1b57 100644
+--- a/src/qml/jsruntime/qv4engine.cpp
++++ b/src/qml/jsruntime/qv4engine.cpp
+@@ -2093,7 +2093,7 @@ void ExecutionEngine::registerModule(const QString &_name, const QJSValue &modul
+ 
+ bool ExecutionEngine::diskCacheEnabled() const
+ {
+-    return (!disableDiskCache() && !debugger()) || forceDiskCache();
++    return forceDiskCache();
+ }
+ 
+ void ExecutionEngine::callInContext(QV4::Function *function, QObject *self,
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 59c079934c..a4de003647 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1205,7 +1205,8 @@ (define-public qtdeclarative-5
               (uri (qt-url name version))
               (sha256
                (base32
-                "1kb8nj17vmnky0ayiwypim7kf6rmlmfcjf6gnrw8rydmp61w0vh2"))))
+                "1kb8nj17vmnky0ayiwypim7kf6rmlmfcjf6gnrw8rydmp61w0vh2"))
+              (patches (search-patches "qtdeclarative-5-disable-qmlcache.patch"))))
     (arguments
      (substitute-keyword-arguments (package-arguments qtsvg-5)
        ((#:tests? _ #f) #f)             ;TODO: Enable the tests
@@ -1251,7 +1252,8 @@ (define-public qtdeclarative
               (uri (qt-url name version))
               (sha256
                (base32
-                "1hbw63828pp8vm9b46i2pkcbcpr4mq9nblhmpwrw2pflq0fi24xq"))))
+                "1hbw63828pp8vm9b46i2pkcbcpr4mq9nblhmpwrw2pflq0fi24xq"))
+              (patches (search-patches "qtdeclarative-disable-qmlcache.patch"))))
     (build-system cmake-build-system)
     (arguments
      (list
-- 
2.41.0

Maxim Cournoyer wrote on 16 Aug 2023 14:10

[PATCH v2 01/59] gnu: qt: Revert to use individual versions instead of %qt5-version.

Recipients:(address . 65280@debbugs.gnu.org)(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)

Message-ID:d17f959443d770ce3ebdac91e045948a65721594.1692187578.git.maxim.cournoyer@gmail.com

Rationale: using a variable for the version field currently hinders automatic

upgrades via 'guix refresh':

qtbase: no `version' field in source; skipping

Automated with:

sed 's/%qt5-version/"5.15.8"/g' -i gnu/packages/qt.scm

---

(no changes since v1)

gnu/packages/qt.scm | 66 ++++++++++++++++++++++-----------------------

1 file changed, 32 insertions(+), 34 deletions(-)

Toggle diff (303 lines)diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 2ca03b77d1..59c079934c 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -127,8 +127,6 @@ (define-module (gnu packages qt)
   #:use-module (ice-9 match)
   #:use-module (srfi srfi-1))
 
-(define %qt-version "5.15.8")
-
 (define-public qite
   (let ((commit "75fb3b6bbd5c6a5a8fc35e08a6efbfb588ed546a")
         (revision "74"))
@@ -332,7 +330,7 @@ (define (qt-url component version)
 (define-public qtbase-5
   (package
     (name "qtbase")
-    (version %qt-version)
+    (version "5.15.8")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
@@ -888,7 +886,7 @@ (define-public qt3d-5
   (package
     (inherit qtbase-5)
     (name "qt3d")
-    (version %qt-version)
+    (version "5.15.8")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
@@ -980,7 +978,7 @@ (define-public qtsvg-5
   (package
     (inherit qtbase-5)
     (name "qtsvg")
-    (version %qt-version)
+    (version "5.15.8")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
@@ -1079,7 +1077,7 @@ (define-public qtsvg
 (define-public qtimageformats
   (package (inherit qtsvg-5)
     (name "qtimageformats")
-    (version %qt-version)
+    (version "5.15.8")
     (source (origin
              (method url-fetch)
              (uri (qt-url name version))
@@ -1106,7 +1104,7 @@ (define-public qtimageformats
 (define-public qtx11extras
   (package (inherit qtsvg-5)
     (name "qtx11extras")
-    (version %qt-version)
+    (version "5.15.8")
     (source (origin
              (method url-fetch)
              (uri (qt-url name version))
@@ -1172,7 +1170,7 @@ (define-public qxlsx-qt5
 (define-public qtxmlpatterns
   (package (inherit qtsvg-5)
     (name "qtxmlpatterns")
-    (version %qt-version)
+    (version "5.15.8")
     (source (origin
              (method url-fetch)
              (uri (qt-url name version))
@@ -1201,7 +1199,7 @@ (define-public qtdeclarative-5
   (package
     (inherit qtsvg-5)
     (name "qtdeclarative")
-    (version %qt-version)
+    (version "5.15.8")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
@@ -1379,7 +1377,7 @@ (define-public qtconnectivity
   (package
     (inherit qtsvg-5)
     (name "qtconnectivity")
-    (version %qt-version)
+    (version "5.15.8")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
@@ -1397,7 +1395,7 @@ (define-public qtconnectivity
 (define-public qtwebsockets-5
   (package (inherit qtsvg-5)
     (name "qtwebsockets")
-    (version %qt-version)
+    (version "5.15.8")
     (source (origin
              (method url-fetch)
              (uri (qt-url name version))
@@ -1460,7 +1458,7 @@ (define-public qtsensors
   (package
     (inherit qtsvg-5)
     (name "qtsensors")
-    (version %qt-version)
+    (version "5.15.8")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
@@ -1489,7 +1487,7 @@ (define-public qtmultimedia-5
   (package
     (inherit qtsvg-5)
     (name "qtmultimedia")
-    (version %qt-version)
+    (version "5.15.8")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
@@ -1628,7 +1626,7 @@ (define-public qtwayland-5
   (package
     (inherit qtsvg-5)
     (name "qtwayland")
-    (version %qt-version)
+    (version "5.15.8")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
@@ -1728,7 +1726,7 @@ (define-public qtserialport
   (package
     (inherit qtsvg-5)
     (name "qtserialport")
-    (version %qt-version)
+    (version "5.15.8")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
@@ -1759,7 +1757,7 @@ (define-public qtserialbus
   (package
     (inherit qtsvg-5)
     (name "qtserialbus")
-    (version %qt-version)
+    (version "5.15.8")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
@@ -1786,7 +1784,7 @@ (define-public qtserialbus
 (define-public qtwebchannel-5
   (package (inherit qtsvg-5)
     (name "qtwebchannel")
-    (version %qt-version)
+    (version "5.15.8")
     (source (origin
              (method url-fetch)
              (uri (qt-url name version))
@@ -1842,7 +1840,7 @@ (define-public qtwebglplugin
   (package
     (inherit qtsvg-5)
     (name "qtwebglplugin")
-    (version %qt-version)
+    (version "5.15.8")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
@@ -1871,7 +1869,7 @@ (define-public qtwebview
   (package
     (inherit qtsvg-5)
     (name "qtwebview")
-    (version %qt-version)
+    (version "5.15.8")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
@@ -1889,7 +1887,7 @@ (define-public qtlocation
   (package
     (inherit qtsvg-5)
     (name "qtlocation")
-    (version %qt-version)
+    (version "5.15.8")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
@@ -1946,7 +1944,7 @@ (define-public qttools-5
   (package
     (inherit qtsvg-5)
     (name "qttools")
-    (version %qt-version)
+    (version "5.15.8")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
@@ -2028,7 +2026,7 @@ (define-public qtscript
   (package
     (inherit qtsvg-5)
     (name "qtscript")
-    (version %qt-version)
+    (version "5.15.8")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
@@ -2047,7 +2045,7 @@ (define-public qtquickcontrols-5
   (package
     (inherit qtsvg-5)
     (name "qtquickcontrols")
-    (version %qt-version)
+    (version "5.15.8")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
@@ -2067,7 +2065,7 @@ (define-public qtquickcontrols2-5
   (package
     (inherit qtsvg-5)
     (name "qtquickcontrols2")
-    (version %qt-version)
+    (version "5.15.8")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
@@ -2094,7 +2092,7 @@ (define-public qtgraphicaleffects
   (package
     (inherit qtsvg-5)
     (name "qtgraphicaleffects")
-    (version %qt-version)
+    (version "5.15.8")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
@@ -2117,7 +2115,7 @@ (define-public qtgamepad
   (package
     (inherit qtsvg-5)
     (name "qtgamepad")
-    (version %qt-version)
+    (version "5.15.8")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
@@ -2143,7 +2141,7 @@ (define-public qtscxml
   (package
     (inherit qtsvg-5)
     (name "qtscxml")
-    (version %qt-version)
+    (version "5.15.8")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
@@ -2201,7 +2199,7 @@ (define-public qtpurchasing
   (package
     (inherit qtsvg-5)
     (name "qtpurchasing")
-    (version %qt-version)
+    (version "5.15.8")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
@@ -2217,7 +2215,7 @@ (define-public qtcharts
   (package
     (inherit qtsvg-5)
     (name "qtcharts")
-    (version %qt-version)
+    (version "5.15.8")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
@@ -2246,7 +2244,7 @@ (define-public qtdatavis3d
   (package
     (inherit qtsvg-5)
     (name "qtdatavis3d")
-    (version %qt-version)
+    (version "5.15.8")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
@@ -2268,7 +2266,7 @@ (define-public qtdatavis3d
 (define-public qtnetworkauth-5
   (package (inherit qtsvg-5)
     (name "qtnetworkauth")
-    (version %qt-version)
+    (version "5.15.8")
     (source (origin
              (method url-fetch)
              (uri (qt-url name version))
@@ -2341,7 +2339,7 @@ (define-public qtspeech
   (package
     (inherit qtsvg-5)
     (name "qtspeech")
-    (version %qt-version)
+    (version "5.15.8")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
@@ -2449,7 +2447,7 @@ (define-public qtwebengine-5
   (package
     (inherit qtsvg-5)
     (name "qtwebengine")
-    (version %qt-version)
+    (version "5.15.8")
     (source
      (origin
        (method url-fetch)
@@ -3991,7 +3989,7 @@ (define-public qcustomplot
 (define-public python-shiboken-2
   (package
     (name "python-shiboken-2")
-    (version %qt-version)
+    (version "5.15.8")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://download.qt.io/official_releases"
-- 
2.41.0

Maxim Cournoyer wrote on 16 Aug 2023 14:10

[PATCH v2 03/59] etc: Add Qt manifests for Qt maintenance.

Recipients:(address . 65280@debbugs.gnu.org)(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)

Message-ID:32fca03a51c37e46d44b39d32b11a87038b04c8b.1692187578.git.maxim.cournoyer@gmail.com

* etc/teams/qt/common.scm: New file.

* etc/teams/qt/qt-manifest.scm: Likewise.

* etc/teams/qt/qt5-manifest.scm: Likewise.

---

(no changes since v1)

etc/teams/qt/common.scm | 50 +++++++++++++++++++++++++++++++++++

etc/teams/qt/qt-manifest.scm | 34 ++++++++++++++++++++++++

etc/teams/qt/qt5-manifest.scm | 34 ++++++++++++++++++++++++

3 files changed, 118 insertions(+)

create mode 100644 etc/teams/qt/common.scm

create mode 100644 etc/teams/qt/qt-manifest.scm

create mode 100644 etc/teams/qt/qt5-manifest.scm

Toggle diff (138 lines)diff --git a/etc/teams/qt/common.scm b/etc/teams/qt/common.scm
new file mode 100644
index 0000000000..8e11ac220b
--- /dev/null
+++ b/etc/teams/qt/common.scm
@@ -0,0 +1,50 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; This file returns a manifest of packages related to linux-libre.
+;;; Simplistically, it selects packages whose names begin with "linux-libre".
+;;; It is used to assist continuous integration of the kernel packages.
+
+(use-modules (guix packages)
+             (guix profiles)
+             (guix utils)
+             (gnu packages))
+
+(define* (qt-packages-manifest #:key major-version negate-version-test?)
+  "Return a manifest of Qt packages for MAJOR-VERSION, or any version if left
+unspecified.  If NEGATE-VERSION-TEST? is true, select all the Qt packages
+*not* matching MAJOR-VERSION."
+  (manifest
+   (map package->manifest-entry
+        (fold-packages
+         (lambda (package lst)
+           (let ((uri (and=> (package-source package)
+                             (lambda (x)
+                               (and (origin? x)
+                                    (origin-uri x))))))
+             (if (and uri
+                      (string? uri)
+                      (string-prefix? "mirror://qt/" uri)
+                      (if major-version
+                          ((if negate-version-test? not identity)
+                           (string=? major-version (version-major
+                                                    (package-version package))))
+                          #t))
+                 (cons package lst)
+                 lst)))
+         '()))))
diff --git a/etc/teams/qt/qt-manifest.scm b/etc/teams/qt/qt-manifest.scm
new file mode 100644
index 0000000000..0d8fa95bfe
--- /dev/null
+++ b/etc/teams/qt/qt-manifest.scm
@@ -0,0 +1,34 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; This file returns a manifest of packages related to linux-libre.
+;;; Simplistically, it selects packages whose names begin with "linux-libre".
+;;; It is used to assist continuous integration of the kernel packages.
+
+(load "common.scm")
+
+;;; Commentary:
+;;;
+;;; This manifest can be used to update the latest Qt packages collection, via
+;;; e.g.:
+;;;
+;;; ./pre-inst-env guix refresh -u -m etc/teams/qt/qt-manifest.scm
+;;;
+;;; Code:
+
+(qt-packages-manifest #:major-version "5" #:negate-version-test? #t)
diff --git a/etc/teams/qt/qt5-manifest.scm b/etc/teams/qt/qt5-manifest.scm
new file mode 100644
index 0000000000..34fdf479bf
--- /dev/null
+++ b/etc/teams/qt/qt5-manifest.scm
@@ -0,0 +1,34 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; This file returns a manifest of packages related to linux-libre.
+;;; Simplistically, it selects packages whose names begin with "linux-libre".
+;;; It is used to assist continuous integration of the kernel packages.
+
+(load "common.scm")
+
+;;; Commentary:
+;;;
+;;; This manifest can be used to update the Qt 5 packages collection, via
+;;; e.g.:
+;;;
+;;; ./pre-inst-env guix refresh -u -m etc/teams/qt/qt5-manifest.scm --target-version=5.15.10
+;;;
+;;; Code:
+
+(qt-packages-manifest #:major-version "5")
-- 
2.41.0

Maxim Cournoyer wrote on 16 Aug 2023 14:10

[PATCH v2 04/59] gnu: qtbase: Update to 6.5.2.

Recipients:(address . 65280@debbugs.gnu.org)(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)

Message-ID:1176b1ea6a93417dbbca2638145e0f74e5e1da47.1692187578.git.maxim.cournoyer@gmail.com

* gnu/packages/qt.scm (qtbase): Update to 6.5.2. Use normal inheritance, not

package/inherit, as the package is distinct and not a variant (it does not use

the same source).

[arguments]: Disable a few newly failing tests in the check phase. Adjust the

patch-mkspecs phase.

[inputs]: Remove extraneous postgresql replacement. Add at-spi2-core, libice,

libsm, libxext and xcb-util-cursor.

---

Changes in v2:

- Fix xcb backend by adding missing inputs

gnu/packages/qt.scm | 33 ++++++++++++++++++++++++++-------

1 file changed, 26 insertions(+), 7 deletions(-)

Toggle diff (73 lines)diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index a4de003647..03c9256a48 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -581,15 +581,16 @@ (define-public qtbase-5
     (license (list license:lgpl2.1 license:lgpl3))))
 
 (define-public qtbase
-  (package/inherit qtbase-5
+  (package
+    (inherit qtbase-5)
     (name "qtbase")
-    (version "6.3.2")
+    (version "6.5.2")
     (source (origin
               (inherit (package-source qtbase-5))
               (uri (qt-url name version))
               (sha256
                (base32
-                "19m9r8sf9mvyrwipn44if3nhding4ljys2mwf04b7dkhz16vlabr"))
+                "0s8jwzdcv97dfy8n3jjm8zzvllv380l73mwdva7rs2nqnhlwgd1x"))
               (modules '((guix build utils)))
               (snippet
                ;; corelib uses bundled harfbuzz, md4, md5, sha3
@@ -742,6 +743,18 @@ (define-public qtbase
                      (list
                       ;; The 'tst_moc' test fails with "'fi.exists()' returned FALSE".
                       "tst_moc"
+
+                      ;; The 'tst_qdate' test fails because the current time
+                      ;; is reported as an invalid date (see:
+                      ;; https://bugreports.qt.io/browse/QTBUG-116017).
+                      "tst_qdate"
+
+                      ;; The qgraphicsview and qopenglwidget tests fail with a
+                      ;; segfault for unknown reasons (see:
+                      ;; https://bugreports.qt.io/browse/QTBUG-116018).
+                      "tst_qgraphicsview"
+                      "tst_qopenglwidget"
+
                       ;; The 'test_rcc' test fails on a comparison:
                       ;; <<<<<< actual
                       ;; 0x0,0x0,0x0,0x0,0x0,0x0,0x3,0xe8,
@@ -853,8 +866,7 @@ (define-public qtbase
                              (search-input-file
                               outputs
                               (string-append "lib/qt6/mkspecs/features/" file)))
-                           '("device_config.prf" "moc.prf" "qt_build_config.prf"
-                             "qt_config.prf"))
+                           '("device_config.prf" "moc.prf" "qt_config.prf"))
                     (("\\$\\$\\[QT_HOST_DATA/get\\]") archdata)
                     (("\\$\\$\\[QT_HOST_DATA/src\\]") archdata)))))))))
     (native-inputs
@@ -863,8 +875,15 @@ (define-public qtbase
                 xvfb-run)))
     (inputs
      (modify-inputs (package-inputs qtbase-5)
-       (prepend bash-minimal coreutils-minimal libxcb md4c)
-       (replace "postgresql" postgresql))) ;use latest postgresql
+       (prepend at-spi2-core
+                bash-minimal
+                coreutils-minimal
+                md4c
+                libice
+                libsm
+                libxcb
+                libxext
+                xcb-util-cursor)))
     (native-search-paths
      (list (search-path-specification
             (variable "QMAKEPATH")
-- 
2.41.0

Maxim Cournoyer wrote on 16 Aug 2023 14:10

[PATCH v2 05/59] gnu: qtbase: Enable zstd support.

Recipients:(address . 65280@debbugs.gnu.org)(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)

Message-ID:8f521299ddf83af9fc87fe11743ca67666f48d86.1692187578.git.maxim.cournoyer@gmail.com

* gnu/packages/qt.scm (qtbase) [inputs]: Add zstd:lib.

---

(no changes since v1)

gnu/packages/qt.scm | 3 ++-

1 file changed, 2 insertions(+), 1 deletion(-)

Toggle diff (16 lines)diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 03c9256a48..7d77d8ff80 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -883,7 +883,8 @@ (define-public qtbase
                 libsm
                 libxcb
                 libxext
-                xcb-util-cursor)))
+                xcb-util-cursor
+                `(,zstd "lib"))))
     (native-search-paths
      (list (search-path-specification
             (variable "QMAKEPATH")
-- 
2.41.0

Maxim Cournoyer wrote on 16 Aug 2023 14:10

[PATCH v2 07/59] gnu: qtsvg: Update to 6.5.2.

Recipients:(address . 65280@debbugs.gnu.org)(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)

Message-ID:2d4338321d2cf4b14a0d9ac9e59aa83be8ef1607.1692187578.git.maxim.cournoyer@gmail.com

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

---

(no changes since v1)

gnu/packages/qt.scm | 4 ++--

1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (22 lines)diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 2cb395629a..1e7815dce2 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1066,13 +1066,13 @@ (define-public qtsvg-5
 (define-public qtsvg
   (package
     (name "qtsvg")
-    (version "6.3.2")
+    (version "6.5.2")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "14i3f23k9k0731akpwa6zzhw5m3c0m2l5r7irvim4h4faah445ac"))))
+                "18v337lfk8krg0hff5jx6fi7gn6x3djn03x3psrhlbmgjc8crd28"))))
     (build-system cmake-build-system)
     (arguments
      (list
-- 
2.41.0

Maxim Cournoyer wrote on 16 Aug 2023 14:10

[PATCH v2 08/59] gnu: qtimageformats: Rename variable to qtimageformats-5.

Recipients:(address . 65280@debbugs.gnu.org)(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)

Message-ID:2fb81660c7eca991b931cedf0972c3c5a04dcf43.1692187578.git.maxim.cournoyer@gmail.com

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

(qtimageformats-5): ... this.

* gnu/packages/telegram.scm (telegram-desktop): Adjust accordingly.

* gnu/packages/image-viewers.scm (qview): Likewise.

* gnu/packages/geo.scm (openorienteering-mapper): Likewise.

---

(no changes since v1)

gnu/packages/geo.scm | 2 +-

gnu/packages/image-viewers.scm | 2 +-

gnu/packages/qt.scm | 2 +-

gnu/packages/telegram.scm | 2 +-

4 files changed, 4 insertions(+), 4 deletions(-)

Toggle diff (54 lines)diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm
index f5f59d1d99..dee2ea068c 100644
--- a/gnu/packages/geo.scm
+++ b/gnu/packages/geo.scm
@@ -2434,7 +2434,7 @@ (define-public openorienteering-mapper
        ("gdal" ,gdal)
        ("proj" ,proj)
        ("qtbase" ,qtbase-5)
-       ("qtimageformats" ,qtimageformats)
+       ("qtimageformats" ,qtimageformats-5)
        ("qtlocation" ,qtlocation)
        ("qtsensors" ,qtsensors)
        ("zlib" ,zlib)))
diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm
index 70f3f37768..0ce3a27b01 100644
--- a/gnu/packages/image-viewers.scm
+++ b/gnu/packages/image-viewers.scm
@@ -730,7 +730,7 @@ (define-public qview
     (native-inputs
      (list qttools-5))
     (inputs
-     (list qtbase-5 qtimageformats qtsvg-5))
+     (list qtbase-5 qtimageformats-5 qtsvg-5))
     (home-page "https://interversehq.com/qview/")
     (synopsis "Convenient and minimal image viewer")
     (description "qView is a Qt image viewer designed with visually
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 1e7815dce2..b6fe7bd14a 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1094,7 +1094,7 @@ (define-public qtsvg
     (home-page (package-home-page qtbase))
     (license (package-license qtbase))))
 
-(define-public qtimageformats
+(define-public qtimageformats-5
   (package (inherit qtsvg-5)
     (name "qtimageformats")
     (version "5.15.8")
diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm
index aa5c303603..dffc6b8ff4 100644
--- a/gnu/packages/telegram.scm
+++ b/gnu/packages/telegram.scm
@@ -517,7 +517,7 @@ (define-public telegram-desktop
            qrcodegen-cpp
            qtbase-5
            qtdeclarative-5
-           qtimageformats
+           qtimageformats-5
            qtsvg-5
            qtwayland-5
            range-v3
-- 
2.41.0

Maxim Cournoyer wrote on 16 Aug 2023 14:10

[PATCH v2 09/59] gnu: qtimageformats-5: Fix indentation.

Recipients:(address . 65280@debbugs.gnu.org)(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)

Message-ID:cbb4b92e9b812eb384e41ee03f9aa2c705c12101.1692187578.git.maxim.cournoyer@gmail.com

* gnu/packages/qt.scm (qtimageformats-5): Fix indentation.

---

(no changes since v1)

gnu/packages/qt.scm | 21 +++++++++++----------

1 file changed, 11 insertions(+), 10 deletions(-)

Toggle diff (37 lines)diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index b6fe7bd14a..e1869802ea 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1095,19 +1095,20 @@ (define-public qtsvg
     (license (package-license qtbase))))
 
 (define-public qtimageformats-5
-  (package (inherit qtsvg-5)
+  (package
+    (inherit qtsvg-5)
     (name "qtimageformats")
     (version "5.15.8")
     (source (origin
-             (method url-fetch)
-             (uri (qt-url name version))
-             (sha256
-              (base32
-               "0c6fq9zcw5hbkiny56wx2fbm123x14l7habydv6zhvnhn3rhwi31"))
-             (modules '((guix build utils)))
-             (snippet
-              '(begin
-                 (delete-file-recursively "src/3rdparty")))))
+              (method url-fetch)
+              (uri (qt-url name version))
+              (sha256
+               (base32
+                "0c6fq9zcw5hbkiny56wx2fbm123x14l7habydv6zhvnhn3rhwi31"))
+              (modules '((guix build utils)))
+              (snippet
+               '(begin
+                  (delete-file-recursively "src/3rdparty")))))
     (native-inputs `())
     (inputs
      (list jasper
-- 
2.41.0

Maxim Cournoyer wrote on 16 Aug 2023 14:10

[PATCH v2 10/59] gnu: Add qtimageformats.

Recipients:(address . 65280@debbugs.gnu.org)(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)

Message-ID:0ec8dc1a5ec18197d0e314950c8cfea71669cf27.1692187578.git.maxim.cournoyer@gmail.com

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

---

(no changes since v1)

gnu/packages/qt.scm | 34 ++++++++++++++++++++++++++++++++++

1 file changed, 34 insertions(+)

Toggle diff (47 lines)diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index e1869802ea..d9ca408721 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1122,6 +1122,40 @@ (define-public qtimageformats-5
     (description "The QtImageFormats module contains plugins for adding
 support for MNG, TGA, TIFF and WBMP image formats.")))
 
+(define-public qtimageformats
+  (package
+    (name "qtimageformats")
+    (version "6.5.2")
+    (source (origin
+              (inherit (package-source qtimageformats-5))
+              (method url-fetch)
+              (uri (qt-url name version))
+              (sha256
+               (base32
+                "0hv7mkn72126rkhy5gmjmbvzy7v17mkk3q2pkmzy99f64j4w1q5a"))))
+    (build-system cmake-build-system)
+    (arguments
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-before 'check 'set-display
+            (lambda _
+              ;; Make Qt render "offscreen", required for tests.
+              (setenv "QT_QPA_PLATFORM" "offscreen"))))))
+    (inputs
+     (list jasper
+           libmng
+           libtiff
+           libwebp
+           mesa
+           qtbase
+           zlib))
+    (synopsis "Additional Image Format plugins for Qt")
+    (description "The QtImageFormats module contains plugins for adding
+support for MNG, TGA, TIFF and WBMP image formats.")
+    (home-page (package-home-page qtbase))
+    (license (package-license qtbase))))
+
 (define-public qtx11extras
   (package (inherit qtsvg-5)
     (name "qtx11extras")
-- 
2.41.0

Maxim Cournoyer wrote on 16 Aug 2023 14:10

[PATCH v2 11/59] gnu: Add qtlanguageserver.

Recipients:(address . 65280@debbugs.gnu.org)(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)

Message-ID:75afb6f2d6cfc5602af6d703895596836e83d032.1692187578.git.maxim.cournoyer@gmail.com

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

---

(no changes since v1)

gnu/packages/qt.scm | 24 ++++++++++++++++++++++++

1 file changed, 24 insertions(+)

Toggle diff (37 lines)diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index d9ca408721..d66ecda169 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1940,6 +1940,30 @@ (define-public qtwebview
 application without necessarily including a full web browser stack by using
 native APIs where it makes sense.")))
 
+(define-public qtlanguageserver
+  (package
+    (name "qtlanguageserver")
+    (version "6.5.2")
+    (source (origin
+              (method url-fetch)
+              (uri (qt-url name version))
+              (sha256
+               (base32
+                "196iicwpqca2ydpca41qs6aqxxq8ycknw6lm2v00h1w3m86frdbk"))))
+    (build-system cmake-build-system)
+    (arguments
+     (list #:phases #~(modify-phases %standard-phases
+                        (add-after 'install 'delete-installed-tests
+                          (lambda _
+                            (delete-file-recursively
+                             (string-append #$output "/tests")))))))
+    (inputs (list qtbase))
+    (home-page (package-home-page qtbase))
+    (synopsis "Implementation of the Language Server Protocol for Qt")
+    (description "This package provides an implementation of the Language
+Server Protocol (LSP) for Qt.")
+    (license (package-license qtbase))))
+
 (define-public qtlocation
   (package
     (inherit qtsvg-5)
-- 
2.41.0

Maxim Cournoyer wrote on 16 Aug 2023 14:10

[PATCH v2 12/59] gnu: qtdeclarative: Update to 6.5.2.

Recipients:(address . 65280@debbugs.gnu.org)(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)

Message-ID:32eb5c356b35241e313cb71e41d16ffae543d07f.1692187578.git.maxim.cournoyer@gmail.com

* gnu/packages/qt.scm (qtdeclarative): Update to 6.5.2.

[arguments]: Disable a few extra tests in check phase.

[inputs]: Add at-spi2-core, qtimageformats, qtlanguageserver and qtsvg.

---

(no changes since v1)

gnu/packages/qt.scm | 27 ++++++++++++++++++++++-----

1 file changed, 22 insertions(+), 5 deletions(-)

Toggle diff (61 lines)diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index d66ecda169..e362ae7a15 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1300,14 +1300,14 @@ (define-public qtdeclarative-5
 (define-public qtdeclarative
   (package
     (name "qtdeclarative")
-    (version "6.3.2")
+    (version "6.5.2")
     ;; TODO: Package 'masm' and unbundle from sources.
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "1hbw63828pp8vm9b46i2pkcbcpr4mq9nblhmpwrw2pflq0fi24xq"))
+                "06c7xfqn2a5s2m8j1bcvx3pyjqg1rgqkjvp49737gb4z9vjiz8gk"))
               (patches (search-patches "qtdeclarative-disable-qmlcache.patch"))))
     (build-system cmake-build-system)
     (arguments
@@ -1405,7 +1405,20 @@ (define-public qtdeclarative
                     ;; waiting for a killed process, which becomes a zombie in
                     ;; the build container (perhaps solved after
                     ;; fixing/applying #30948).
-                    "tst_qqmlpreview") "|")
+                    "tst_qqmlpreview"
+
+                    ;; These tests fail starting with 6.5.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.
+                    "cmake_test_common_import_path"
+                    "tst_qqmlcomponent"
+                    "tst_qmllint"
+                    "tst_qmldomitem"
+                    "tst_dom_all"
+                    "tst_qmlls"
+                    "tst_qmllscompletions"
+                    ) "|")
                   ")")))))
           (add-after 'install 'delete-installed-tests
             (lambda _
@@ -1418,9 +1431,13 @@ (define-public qtdeclarative
            qtshadertools
            vulkan-headers))
     (inputs
-     (list libxkbcommon
+     (list at-spi2-core
+           libxkbcommon
            mesa
-           qtbase))
+           qtbase
+           qtimageformats
+           qtlanguageserver
+           qtsvg))
     (home-page (package-home-page qtbase))
     (synopsis "Qt QML module (Quick 2)")
     (description "The Qt QML module provides a framework for developing
-- 
2.41.0

Maxim Cournoyer wrote on 16 Aug 2023 14:10

[PATCH v2 06/59] gnu: qt5compat: Update to 6.5.2.

Recipients:(address . 65280@debbugs.gnu.org)(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)

Message-ID:3c09c85236aea38547be7c035c32326ef332ec35.1692187578.git.maxim.cournoyer@gmail.com

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

---

(no changes since v1)

gnu/packages/qt.scm | 4 ++--

1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (22 lines)diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 7d77d8ff80..2cb395629a 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -968,13 +968,13 @@ (define-public qt3d-5
 (define-public qt5compat
   (package
     (name "qt5compat")
-    (version "6.3.2")
+    (version "6.5.2")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "1k30hnwnlbay1hnkdavgf6plsdzrryzcqd2qz8x11r477w7sr8wi"))))
+                "1i4izabbmf1dayzlj1miz7hsm4cy0qb7i72pwyl2fp05w8pf9axr"))))
     (build-system cmake-build-system)
     (arguments
      (list
-- 
2.41.0

Maxim Cournoyer wrote on 16 Aug 2023 14:10

[PATCH v2 14/59] gnu: qtshadertools: Update to 6.5.2.

Recipients:(address . 65280@debbugs.gnu.org)(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)

Message-ID:0497398945102560c2c5b097970cd3559af548bf.1692187578.git.maxim.cournoyer@gmail.com

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

---

(no changes since v1)

gnu/packages/qt.scm | 4 ++--

1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (24 lines)diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index b5831c79dc..3ccddf5af3 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1605,7 +1605,7 @@ (define-public qtmultimedia-5
 (define-public qtshadertools
   (package
     (name "qtshadertools")
-    (version "6.3.2")
+    (version "6.5.2")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
@@ -1613,7 +1613,7 @@ (define-public qtshadertools
               ;; sources.
               (sha256
                (base32
-                "1bmkrpk414clx8pnyrdslqlsnfmsdldmwrdcqzz6rwi8ymk2ggpn"))))
+                "0g8aziqhds2fkx11y4p2akmyn2p1qqf2fjxv72f9pibnhpdv0gya"))))
     (build-system cmake-build-system)
     (arguments
      (list
-- 
2.41.0

Maxim Cournoyer wrote on 16 Aug 2023 14:10

[PATCH v2 16/59] gnu: qtwayland: Update to 6.5.2.

Recipients:(address . 65280@debbugs.gnu.org)(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)

Message-ID:47a9591cfc58c5ca978bb7d0f76dc1d4d435feb6.1692187578.git.maxim.cournoyer@gmail.com

* gnu/packages/qt.scm (qtwayland): Update to 6.5.2.

---

(no changes since v1)

gnu/packages/qt.scm | 4 ++--

1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (22 lines)diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index b86de7e2a8..e7675a93bb 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1749,13 +1749,13 @@ (define-public qtwayland-5
 (define-public qtwayland
   (package
     (name "qtwayland")
-    (version "6.3.2")
+    (version "6.5.2")
     (source
      (origin
        (method url-fetch)
        (uri (qt-url name version))
        (sha256
-        (base32 "0rwiirkibgpvx05pg2842j4dcq9ckxmcqxhaf50xx2i55z64ll83"))))
+        (base32 "16iwar19sgjvxgmbr6hmd3hsxp6ahdjwl1lra2wapl3zzf3bw81h"))))
     (build-system cmake-build-system)
     (arguments
      (list #:configure-flags #~(list "-DQT_BUILD_TESTS=ON")
-- 
2.41.0

Maxim Cournoyer wrote on 16 Aug 2023 14:10

[PATCH v2 15/59] gnu: qtmultimedia: Update to 6.5.2.

Recipients:(address . 65280@debbugs.gnu.org)(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)

Message-ID:04b7bb7eabdab2a7d0fa7638244bcfcdb40ab16f.1692187578.git.maxim.cournoyer@gmail.com

* gnu/packages/qt.scm (qtmultimedia): Update to 6.5.2.

---

(no changes since v1)

gnu/packages/qt.scm | 4 ++--

1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (22 lines)diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 3ccddf5af3..b86de7e2a8 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1634,13 +1634,13 @@ (define-public qtshadertools
 (define-public qtmultimedia
   (package
     (name "qtmultimedia")
-    (version "6.3.2")
+    (version "6.5.2")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "0hqwq0ad6z8c5kyyvbaddj00mciijn2ns2r60jc3mqh98nm2js3z"))
+                "0xc9k4mlncscxqbp8q46yjd89k4jb8j0ggbi5ad874lycym013wl"))
               (modules '((guix build utils)))
               (snippet
                '(begin
-- 
2.41.0

Maxim Cournoyer wrote on 16 Aug 2023 14:10

[PATCH v2 13/59] gnu: qtwebsockets: Update to 6.5.2.

Recipients:(address . 65280@debbugs.gnu.org)(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)

Message-ID:64ec8fd2dd2710a13c4437cd8c50321b81527140.1692187578.git.maxim.cournoyer@gmail.com

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

---

(no changes since v1)

gnu/packages/qt.scm | 4 ++--

1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (22 lines)diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index e362ae7a15..b5831c79dc 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1492,13 +1492,13 @@ (define-public qtwebsockets-5
 (define-public qtwebsockets
   (package
     (name "qtwebsockets")
-    (version "6.3.2")
+    (version "6.5.2")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "1smbvidaybphvsmaap9v1pbkibwmng11hb925g0ww4ghwzpxkb8q"))))
+                "0xjwifxj2ssshys6f6kjr6ri2vq1wfshxky6mcscjm7vvyqdfjr0"))))
     (build-system cmake-build-system)
     (arguments
      (list
-- 
2.41.0

Maxim Cournoyer wrote on 16 Aug 2023 14:10

[PATCH v2 17/59] gnu: qtwebchannel: Update to 6.5.2.

Recipients:(address . 65280@debbugs.gnu.org)(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)

Message-ID:83e9a175bf95b18b3fe81b5b35347a7a974e2705.1692187578.git.maxim.cournoyer@gmail.com

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

---

(no changes since v1)

gnu/packages/qt.scm | 4 ++--

1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (22 lines)diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index e7675a93bb..3f481d1729 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1876,13 +1876,13 @@ (define-public qtwebchannel-5
 (define-public qtwebchannel
   (package
     (name "qtwebchannel")
-    (version "6.3.2")
+    (version "6.5.2")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "0gqm09yqdq27kgb02idx5ycj14k5mjhh10ddp9jfs8lblimlgfni"))))
+                "0qwfnwva7v5f2g5is17yy66mnmc9c1yf9aagaw5qanskdvxdk261"))))
     (build-system cmake-build-system)
     (arguments
      (list
-- 
2.41.0

Maxim Cournoyer wrote on 16 Aug 2023 14:10

[PATCH v2 18/59] gnu: qtlottie: Update to 6.5.2.

Recipients:(address . 65280@debbugs.gnu.org)(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)

Message-ID:f656d50233d616057b6f9589da67b83ee929297c.1692187578.git.maxim.cournoyer@gmail.com

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

---

(no changes since v1)

gnu/packages/qt.scm | 4 ++--

1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (22 lines)diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 3f481d1729..c5b590e58c 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -2009,13 +2009,13 @@ (define-public qtlocation
 (define-public qtlottie
   (package
     (name "qtlottie")
-    (version "6.3.2")
+    (version "6.5.2")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "1c092hmf114r8jfdhkhxnn3vywj93mg33whzav47gr9mbza44icq"))))
+                "16z8fhaa40ig0cggb689zf8j3cid6fk6pmh91b8342ymy1fdqfh0"))))
     (build-system cmake-build-system)
     (arguments
      (list
-- 
2.41.0

Maxim Cournoyer wrote on 16 Aug 2023 14:10

[PATCH v2 19/59] gnu: qttools: Update to 6.5.2.

Recipients:(address . 65280@debbugs.gnu.org)(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)

Message-ID:ae6d028438baed2f6b2d17e87c1f671f8f8c95c4.1692187578.git.maxim.cournoyer@gmail.com

* gnu/packages/qt.scm (qttools): Update to 6.5.2.

---

(no changes since v1)

gnu/packages/qt.scm | 4 ++--

1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (22 lines)diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index c5b590e58c..4c8e7fd535 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -2062,13 +2062,13 @@ (define-public qttools-5
 (define-public qttools
   (package
     (name "qttools")
-    (version "6.3.2")
+    (version "6.5.2")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "1lmfk5bhgg4daxkqrhmx4iyln7pyiz40c9cp6plyp35nz8ppvc75"))))
+                "0ha3v488vnm4pgdpyjgf859sak0z2fwmbgcyivcd93qxflign7sm"))))
     (build-system cmake-build-system)
     (arguments
      (list
-- 
2.41.0

Maxim Cournoyer wrote on 16 Aug 2023 14:10

[PATCH v2 20/59] gnu: qttranslations: Update to 6.5.2.

Recipients:(address . 65280@debbugs.gnu.org)(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)

Message-ID:3c558b087e2f92f589dcfe60b6cbae69f9d82a50.1692187578.git.maxim.cournoyer@gmail.com

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

---

(no changes since v1)

gnu/packages/qt.scm | 4 ++--

1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (22 lines)diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 4c8e7fd535..6614daae62 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -2102,13 +2102,13 @@ (define-public qttools
 (define-public qttranslations
   (package
     (name "qttranslations")
-    (version "6.3.2")
+    (version "6.5.2")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "1h66n9cx4g65c9wrgp32h9gm3r47gyh1nrcn3ivbfbvngfawqxpg"))))
+                "1sxy2ljn5ajvn4yjb8fx86l56viyvqh5r9hf5x67azkmgrilaz1k"))))
     (build-system cmake-build-system)
     (arguments (list #:tests? #f))
     (native-inputs (list qtbase qttools))
-- 
2.41.0

Maxim Cournoyer wrote on 16 Aug 2023 14:10

[PATCH v2 21/59] gnu: qtpositioning: Update to 6.5.2.

Recipients:(address . 65280@debbugs.gnu.org)(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)

Message-ID:18ad3f7375fb4358dbc42e01c0932fd7dd8bb3d6.1692187578.git.maxim.cournoyer@gmail.com

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

---

(no changes since v1)

gnu/packages/qt.scm | 4 ++--

1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (22 lines)diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 6614daae62..4f736207b9 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -2266,13 +2266,13 @@ (define-public qtscxml
 (define-public qtpositioning
   (package
     (name "qtpositioning")
-    (version "6.3.2")
+    (version "6.5.2")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "0zh45lf164nzwl1hh96qm64nyw9wzzrnm5s7sx761glz54q6l5xz"))))
+                "1yhlfs8izc054qv1krf5qv6zzjlvmz013h74fwamn74dfh1kyjbh"))))
     (build-system cmake-build-system)
     (arguments
      (list
-- 
2.41.0

Maxim Cournoyer wrote on 16 Aug 2023 14:10

[PATCH v2 23/59] gnu: qtremoteobjects: Update to 6.5.2.

Recipients:(address . 65280@debbugs.gnu.org)(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)

Message-ID:a1f9d2ec54c2233657e6970f63a4793f85f08c43.1692187578.git.maxim.cournoyer@gmail.com

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

---

(no changes since v1)

gnu/packages/qt.scm | 4 ++--

1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (22 lines)diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index bec561d2a4..8360b16bb3 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -2399,13 +2399,13 @@ (define-public qtnetworkauth
 (define-public qtremoteobjects
   (package
     (name "qtremoteobjects")
-    (version "6.3.2")
+    (version "6.5.2")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "099b3vchi458i4fci9kfwan871jplqlk5l8q78mfnh33g80qnasi"))))
+                "0k29sk02n54vj1w6vh6xycsjpyfqlijc13fnxh1q7wpgg4gizx60"))))
     (build-system cmake-build-system)
     (arguments
      (list
-- 
2.41.0

Maxim Cournoyer wrote on 16 Aug 2023 14:10

[PATCH v2 22/59] gnu: qtnetworkauth: Update to 6.5.2.

Recipients:(address . 65280@debbugs.gnu.org)(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)

Message-ID:7efc416cacc68abfba95f1643633bfa0d88946c5.1692187578.git.maxim.cournoyer@gmail.com

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

---

(no changes since v1)

gnu/packages/qt.scm | 4 ++--

1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (22 lines)diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 4f736207b9..bec561d2a4 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -2379,13 +2379,13 @@ (define-public qtnetworkauth-5
 (define-public qtnetworkauth
   (package
     (name "qtnetworkauth")
-    (version "6.3.2")
+    (version "6.5.2")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "0mjnz87splyxq7jwydi5ws2aqb6j7czscrkns193w425x0dgy94l"))))
+                "0g18kh3zhcfi9ni8cqbbjdc1l6jf99ijv5shcl42jk6219b4pk2f"))))
     (build-system cmake-build-system)
     (arguments (list #:configure-flags #~(list "-DQT_BUILD_TESTS=ON")))
     (native-inputs (list perl))
-- 
2.41.0

Maxim Cournoyer wrote on 16 Aug 2023 14:10

[PATCH v2 24/59] gnu: qtwebengine: Update to 6.5.2.

Recipients:(address . 65280@debbugs.gnu.org)(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)

Message-ID:f34fa61635fe290d4b11d2259a9bafc741ccc2c8.1692187578.git.maxim.cournoyer@gmail.com

* gnu/packages/qt.scm (qtwebengine): Update to 6.5.2.

[source]: Update snippet.

[arguments]: Adjust comment in patch-paths phase. Remove link to closed issue

in #:configure-flags. Remove NSS link workaround.

---

(no changes since v1)

gnu/packages/qt.scm | 99 +++++++++++++++++++++++++++++----------------

1 file changed, 65 insertions(+), 34 deletions(-)

Toggle diff (266 lines)diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 8360b16bb3..f0acba41d6 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -2873,14 +2873,14 @@ (define-public qtwebengine-5
 (define-public qtwebengine
   (package
     (name "qtwebengine")
-    (version "6.3.2")
+    (version "6.5.2")
     (source
      (origin
        (method url-fetch)
        (uri (qt-url name version))
        (sha256
         (base32
-         "09j4w9ax8242d1yx3hmic7jcwidwdrn8sp7k89hj4l0n8mzkkd35"))
+         "17qxf3asyxq6kcqqvml170n7rnzih3nr4srp9r5v80pmas5l7jg7"))
        (modules '((ice-9 ftw)
                   (ice-9 match)
                   (srfi srfi-1)
@@ -2888,13 +2888,19 @@ (define-public qtwebengine
                   (guix build utils)))
        (snippet
         #~(begin
-           (let ((preserved-third-party-files
+            ;; Note: Anything under a 'third_party/' directory that needs to
+            ;; be preserved must be explicitly added below, otherwise it gets
+            ;; removed by the 'remove-third-party-files' code snippet included
+            ;; below.  It is useful to refer to the list used by
+            ;; ungoogled-chromium when upgrading, but not all of the items
+            ;; present in it will need to be reported here, as Qt already
+            ;; removes components its build doesn't use.
+            (let ((preserved-third-party-files
                   '("base/third_party/double_conversion"
                     "base/third_party/cityhash"
                     "base/third_party/cityhash_v103"
                     "base/third_party/dynamic_annotations"
                     "base/third_party/icu"
-                    "base/third_party/libevent"
                     "base/third_party/nspr"
                     "base/third_party/superfasthash"
                     "base/third_party/symbolize"
@@ -2909,6 +2915,7 @@ (define-public qtwebengine
                     "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/axe-core"
@@ -2931,27 +2938,36 @@ (define-public qtwebengine
                     "third_party/ced"
                     "third_party/cld_3"
                     "third_party/closure_compiler"
+                    "third_party/cpuinfo" ;BSD-2
                     "third_party/crashpad"
                     "third_party/crashpad/crashpad/third_party/lss"
                     "third_party/crashpad/crashpad/third_party/zlib"
                     "third_party/crc32c"
                     "third_party/dav1d"
                     "third_party/dawn"
-                    "third_party/dawn/third_party/tint"
+                    "third_party/dawn/third_party/gn/webgpu-cts"
+                    "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"
                     "third_party/devtools-frontend/src/front_end/third_party/chromium"
                     "third_party/devtools-frontend/src/front_end/third_party/codemirror"
+                    "third_party/devtools-frontend/src/front_end/third_party/codemirror.next"
                     "third_party/devtools-frontend/src/front_end/third_party/diff"
+                    "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/marked"
+                    "third_party/devtools-frontend/src/front_end/third_party/puppeteer"
                     "third_party/devtools-frontend/src/front_end/third_party/wasmparser"
                     "third_party/devtools-frontend/src/third_party/typescript"
+                    "third_party/distributed_point_functions"
+                    "third_party/dom_distiller_js"
                     "third_party/emoji-segmenter"
                     "third_party/fdlibm"
                     "third_party/ffmpeg/libavcodec/avcodec.h"
@@ -2963,7 +2979,11 @@ (define-public qtwebengine
                     "third_party/ffmpeg/libavutil/log.h"
                     "third_party/ffmpeg/libavutil/mathematics.h"
                     "third_party/ffmpeg/libavutil/opt.h"
+                    "third_party/fft2d"
+                    "third_party/flatbuffers"
                     "third_party/freetype"
+                    "third_party/gemmlowp" ;ASL2.0
+                    "third_party/google_input_tools" ;ASL2.0
                     "third_party/googletest"
                     "third_party/harfbuzz-ng"
                     "third_party/highway"
@@ -2971,6 +2991,7 @@ (define-public qtwebengine
                     "third_party/iccjpeg"
                     "third_party/icu" ;TODO: make pdfium use system version
                     "third_party/inspector_protocol"
+                    "third_party/ipcz" ;BSD-3
                     "third_party/jinja2"
                     "third_party/jsoncpp"
                     "third_party/jstemplate"
@@ -2979,42 +3000,45 @@ (define-public qtwebengine
                     "third_party/libaddressinput"
                     "third_party/libaom"
                     "third_party/libaom/source/libaom/third_party/fastfeat"
+                    "third_party/libaom/source/libaom/third_party/SVT-AV1" ;BSD-3
                     "third_party/libaom/source/libaom/third_party/vector"
                     "third_party/libaom/source/libaom/third_party/x86inc"
                     "third_party/libavif"
+                    "third_party/libevent"
                     "third_party/libgav1"
-                    "third_party/libgifcodec"
                     "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"
                     "third_party/libsync"
                     "third_party/libudev"
                     "third_party/liburlpattern"
                     "third_party/libvpx"
                     "third_party/libwebm"
-                    "third_party/libwebp/src/webp/decode.h"
-                    "third_party/libwebp/src/webp/demux.h"
-                    "third_party/libwebp/src/webp/encode.h"
-                    "third_party/libwebp/src/webp/format_constants.h"
-                    "third_party/libwebp/src/webp/mux.h"
-                    "third_party/libwebp/src/webp/mux_types.h"
-                    "third_party/libwebp/src/webp/types.h"
+                    "third_party/libwebp"
                     "third_party/libx11"
                     "third_party/libxcb-keysyms"
-                    "third_party/libxml/chromium"
+                    "third_party/libxml"
                     "third_party/libyuv"
+                    "third_party/libzip" ;BSD-3
                     "third_party/lottie"
                     "third_party/lss"
                     "third_party/mako"
                     "third_party/markupsafe"
                     "third_party/mesa_headers"
                     "third_party/metrics_proto"
+                    "third_party/minigbm" ;BSD-3
                     "third_party/modp_b64"
                     "third_party/nasm"
+                    "third_party/nearby" ;ASL2.0
                     "third_party/node"
+                    "third_party/omnibox_proto" ;BSD-3
                     "third_party/one_euro_filter"
+                    "third_party/openscreen" ;BSD-3
+                    "third_party/openscreen/src/third_party/tinycbor" ;Expat
+                    "third_party/openscreen/src/third_party/mozilla" ;MPL1.1/GPL2+/LGPL2.1+, BSD-3
                     "third_party/openh264"
                     "third_party/opus/src/include/opus.h"
                     "third_party/opus/src/include/opus_custom.h"
@@ -3028,31 +3052,46 @@ (define-public qtwebengine
                     "third_party/pdfium/third_party/bigint"
                     "third_party/pdfium/third_party/freetype"
                     "third_party/pdfium/third_party/lcms"
-                    "third_party/pdfium/third_party/libopenjpeg20"
+                    "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
                     "third_party/perfetto"
                     "third_party/perfetto/protos/third_party/chromium"
                     "third_party/pffft"
                     "third_party/ply"
                     "third_party/polymer"
+                    "third_party/private_membership" ;ASL2.0
+                    "third_party/private-join-and-compute" ;ASL2.0
                     "third_party/protobuf"
-                    "third_party/protobuf/third_party/six"
+                    "third_party/pthreadpool" ;BSD-2
                     "third_party/pyjson5"
+                    "third_party/qcms" ;Expat
                     "third_party/re2"
                     "third_party/rnnoise"
+                    "third_party/ruy" ;ASL2.0
+                    "third_party/s2cellid" ;ASL2.0
+                    "third_party/securemessage" ;ASL2.0
+                    "third_party/shell-encryption" ;ASL2.0
                     "third_party/skia"
-                    "third_party/skia/include/third_party/skcms/skcms.h"
                     "third_party/skia/include/third_party/vulkan"
-                    "third_party/skia/third_party/skcms"
+                    "third_party/skia/modules/skcms"
                     "third_party/skia/third_party/vulkanmemoryallocator"
                     "third_party/smhasher"
                     "third_party/snappy"
                     "third_party/speech-dispatcher"
                     "third_party/sqlite"
+                    "third_party/swiftshader" ;ASL2.0
+                    "third_party/swiftshader/third_party/llvm-10.0" ;ASL2.0, with LLVM exception
+                    "third_party/swiftshader/third_party/marl" ;ASL2.0
+                    "third_party/swiftshader/third_party/SPIRV-Headers" ;X11-style
+                    "third_party/swiftshader/third_party/SPIRV-Tools" ;ASL2.0
+                    "third_party/tensorflow-text" ;ASL2.0
+                    "third_party/tflite" ;ASL2.0
+                    "third_party/ukey2" ;ASL2.0
                     "third_party/usb_ids"
-                    "third_party/usrsctp"
+                    "third_party/utf" ;Expat
                     "third_party/vulkan-deps/glslang"
                     "third_party/vulkan-deps/spirv-headers"
                     "third_party/vulkan-deps/spirv-tools"
@@ -3076,13 +3115,15 @@ (define-public qtwebengine
                     "third_party/woff2"
                     "third_party/wuffs"
                     "third_party/x11proto"
+                    "third_party/xnnpack" ;BSD-3
                     "third_party/zlib" ;TODO: make pdfium use system version
+                    "third_party/zxcvbn-cpp" ;Expat
                     "url/third_party/mozilla"
+                    "v8/src/third_party/siphash"
                     "v8/src/third_party/utf8-decoder"
                     "v8/src/third_party/valgrind"
-                    "v8/src/third_party/siphash"
-                    "v8/third_party/v8/builtins"
-                    "v8/third_party/inspector_protocol")))
+                    "v8/third_party/inspector_protocol"
+                    "v8/third_party/v8/builtins")))
 
              (with-directory-excursion "src/3rdparty"
                (delete-file-recursively "ninja")
@@ -3123,15 +3164,8 @@ (define-public qtwebengine
       ;; some build time and resources.
       #:tests? #f
       #:configure-flags
-      ;; Use the CMake ninja generator, otherwise the build fails (see:
-      ;; https://bugreports.qt.io/browse/QTBUG-96897).
+      ;; Use the CMake ninja generator, otherwise the build fails.
       #~(list "-GNinja"
-              ;; Manually add the NSS library prefix to the linker
-              ;; search path, otherwise it fails to be linked (see:
-              ;; https://bugreports.qt.io/browse/QTBUG-105053).
-              (string-append "-DCMAKE_SHARED_LINKER_FLAGS=-L"
-                             (search-input-directory %build-inputs "lib/nss"))
-
               ;; The PDF renderer plugin fails to build with errors such as
               ;; "src/3rdparty/chromium/components/pdf
               ;; /renderer/pdf_accessibility_tree.cc:1373:39:
@@ -3187,10 +3221,7 @@ (define-public qtwebengine
               (substitute* "src/3rdparty/chromium/device/udev_linux/udev1_loader.cc"
                 (("libudev.so.1")
                  (search-input-file inputs "lib/libudev.so.1")))
-              ;; Patch the location of the X11 keywoard layouts, otherwise
-              ;; webengine *crashes* at run time when the default directory,
-              ;; '/usr/share/X11/xkb' is empty (see:
-              ;; https://bugreports.qt.io/browse/QTBUG-105124).
+              ;; Patch the location of the X11 keywoard layouts.
               (substitute* "src/3rdparty/chromium/ui/events/ozone/layout/xkb\
 /xkb_keyboard_layout_engine.cc"
                 (("/usr/share/X11/xkb")
-- 
2.41.0

Maxim Cournoyer wrote on 16 Aug 2023 14:10

[PATCH v2 25/59] gnu: Remove qtquickcontrols2.

Recipients:(address . 65280@debbugs.gnu.org)(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)

Message-ID:1b2763eb2b1fb62a07d3ebdc45455423a88963c9.1692187578.git.maxim.cournoyer@gmail.com

* gnu/packages/qt.scm (qtquickcontrols2): Delete variable.

(pyotherside) [inputs]: Remove qtquickcontrols2.

---

(no changes since v1)

gnu/packages/qt.scm | 8 +-------

1 file changed, 1 insertion(+), 7 deletions(-)

Toggle diff (28 lines)diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index f0acba41d6..0d84231cef 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -2180,12 +2180,6 @@ (define-public qtquickcontrols2-5
 and tray icons.  It falls back to Qt Widgets when a native implementation is
 not available.")))
 
-(define-public qtquickcontrols2
-  ;; qtquickcontrols2 still exist, but was merged into qtdeclarative.
-  ;; Unfortunately that hasn't been well communicated at all (see:
-  ;; https://bugreports.qt.io/browse/QTBUG-79454).
-  (deprecated-package "qtquickcontrols2" qtdeclarative))
-
 (define-public qtgraphicaleffects
   (package
     (inherit qtsvg-5)
@@ -3375,7 +3369,7 @@ (define-public pyotherside
             ;; installation prefix.
             (lambda _
               (invoke "make" "sub-src-install_subtargets"))))))
-    (inputs (list python qtdeclarative qtquickcontrols2 qtsvg))
+    (inputs (list python qtdeclarative qtsvg))
     (home-page "https://thp.io/2011/pyotherside/")
     (synopsis "Qt plugin providing access to a Python 3 interpreter from QML")
     (description "Pyotherside is a Qt plugin providing access to a Python 3
-- 
2.41.0

Maxim Cournoyer wrote on 16 Aug 2023 14:10

[PATCH v2 27/59] gnu: qtbase-5: Update to 5.15.10.

Recipients:(address . 65280@debbugs.gnu.org)(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)

Message-ID:cccbf481e5c69582acd05134471a1316fc1f13cf.1692187578.git.maxim.cournoyer@gmail.com

* gnu/packages/qt.scm (qtbase-5): Update to 5.15.10.

---

(no changes since v1)

gnu/packages/qt.scm | 4 ++--

1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (22 lines)diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index c858bab571..d1fdce8cf7 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -330,13 +330,13 @@ (define (qt-url component version)
 (define-public qtbase-5
   (package
     (name "qtbase")
-    (version "5.15.8")
+    (version "5.15.10")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "175ynjndpzsw69vnsq4swykn9f48568ww9b4z3yw7azkqwk13cdz"))
+                "1fcg3kx5akvj0kqxd99h5lv3kv4pw2cj0makmpvhpw90inqnrl60"))
               ;; Use TZDIR to avoid depending on package "tzdata".
               (patches (search-patches "qtbase-use-TZDIR.patch"
                                        "qtbase-moc-ignore-gcc-macro.patch"
-- 
2.41.0

Maxim Cournoyer wrote on 16 Aug 2023 14:10

[PATCH v2 28/59] gnu: qt3d-5: Update to 5.15.10.

Recipients:(address . 65280@debbugs.gnu.org)(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)

Message-ID:0799b257132a8f09c02f891da492387eb30dfe01.1692187578.git.maxim.cournoyer@gmail.com

* gnu/packages/qt.scm (qt3d-5): Update to 5.15.10.

---

(no changes since v1)

gnu/packages/qt.scm | 4 ++--

1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (22 lines)diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index d1fdce8cf7..33afadda15 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -906,13 +906,13 @@ (define-public qt3d-5
   (package
     (inherit qtbase-5)
     (name "qt3d")
-    (version "5.15.8")
+    (version "5.15.10")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "18hbv4l9w0czaxcch6af9130fgs4sf400xp0pfzl81c78fwrkfsb"))))
+                "0pwcjm0xxa4f3sg634bv2n61jmn852yr0y6qjvyp8dcvic90cp12"))))
     (propagated-inputs `())
     (native-inputs (list perl))
     (inputs (list mesa qtbase-5 vulkan-headers zlib))
-- 
2.41.0

Maxim Cournoyer wrote on 16 Aug 2023 14:10

[PATCH v2 29/59] gnu: qtsvg-5: Update to 5.15.10.

Recipients:(address . 65280@debbugs.gnu.org)(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)

Message-ID:52b1f9d8f614adbe89278c940481ac6b35b2ea83.1692187578.git.maxim.cournoyer@gmail.com

* gnu/packages/qt.scm (qtsvg-5): Update to 5.15.10.

---

(no changes since v1)

gnu/packages/qt.scm | 4 ++--

1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (22 lines)diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 33afadda15..3eed9fea12 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -998,13 +998,13 @@ (define-public qtsvg-5
   (package
     (inherit qtbase-5)
     (name "qtsvg")
-    (version "5.15.8")
+    (version "5.15.10")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "0qnmcvp5jap4qq9w7xak66g6fsb48q1lg02rn4lycvnhgwzblbww"))))
+                "1s2a00vqq0njwmd34pas7gmmlb9cjjq5dra1s1wpfxlabf1y64yg"))))
     (propagated-inputs `())
     (native-inputs (list perl))
     (inputs
-- 
2.41.0

Maxim Cournoyer wrote on 16 Aug 2023 14:10

[PATCH v2 31/59] gnu: qtx11extras: Update to 5.15.10.

Recipients:(address . 65280@debbugs.gnu.org)(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)

Message-ID:b54beeb261b0162e5c94d4366e44b4aa13a13aff.1692187578.git.maxim.cournoyer@gmail.com

* gnu/packages/qt.scm (qtx11extras): Update to 5.15.10.

---

(no changes since v1)

gnu/packages/qt.scm | 4 ++--

1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (22 lines)diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index f767c9e8f3..3a247d7a65 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1159,13 +1159,13 @@ (define-public qtimageformats
 (define-public qtx11extras
   (package (inherit qtsvg-5)
     (name "qtx11extras")
-    (version "5.15.8")
+    (version "5.15.10")
     (source (origin
              (method url-fetch)
              (uri (qt-url name version))
              (sha256
               (base32
-               "1gzmf0y2byzrgfbing7xk3cwlbk1cyjlhqjbfh8n37y09gg65maf"))))
+               "1x489lw3nx28p9cggdrr9n0l49w9y1mcpni9x91sic6wpyfx3p6p"))))
     (arguments
      (substitute-keyword-arguments (package-arguments qtsvg-5)
        ((#:tests? _ #f) #f))) ; TODO: Enable the tests
-- 
2.41.0

Maxim Cournoyer wrote on 16 Aug 2023 14:10

[PATCH v2 30/59] gnu: qtimageformats-5: Update to 5.15.10.

Recipients:(address . 65280@debbugs.gnu.org)(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)

Message-ID:0c805b2e1fe529bc1152ca9538cc5322ed47d8c1.1692187578.git.maxim.cournoyer@gmail.com

* gnu/packages/qt.scm (qtimageformats-5): Update to 5.15.10.

---

(no changes since v1)

gnu/packages/qt.scm | 4 ++--

1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (22 lines)diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 3eed9fea12..f767c9e8f3 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1098,13 +1098,13 @@ (define-public qtimageformats-5
   (package
     (inherit qtsvg-5)
     (name "qtimageformats")
-    (version "5.15.8")
+    (version "5.15.10")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "0c6fq9zcw5hbkiny56wx2fbm123x14l7habydv6zhvnhn3rhwi31"))
+                "1cniah8v8y514i68bmwgfi3xn3hzgpywcdnzrv789mk7qi48l92g"))
               (modules '((guix build utils)))
               (snippet
                '(begin
-- 
2.41.0

Maxim Cournoyer wrote on 16 Aug 2023 14:10

[PATCH v2 32/59] gnu: qtxmlpatterns: Update to 5.15.10.

Recipients:(address . 65280@debbugs.gnu.org)(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)

Message-ID:b51b39840c1a224cb4166245c4171e264a50e7dd.1692187578.git.maxim.cournoyer@gmail.com

* gnu/packages/qt.scm (qtxmlpatterns): Update to 5.15.10.

---

(no changes since v1)

gnu/packages/qt.scm | 4 ++--

1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (22 lines)diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 3a247d7a65..d73fe705fe 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1225,13 +1225,13 @@ (define-public qxlsx-qt5
 (define-public qtxmlpatterns
   (package (inherit qtsvg-5)
     (name "qtxmlpatterns")
-    (version "5.15.8")
+    (version "5.15.10")
     (source (origin
              (method url-fetch)
              (uri (qt-url name version))
              (sha256
               (base32
-               "1inf7ar32a557faqpwdsmafhz1p6k8hywpw3wbsdjlj74dkgdq35"))))
+               "03fss4lssi48d8gdj8inkj4qgmyzxbn7r4bm58ckbh5vl9rpamq3"))))
     (arguments
      (substitute-keyword-arguments (package-arguments qtsvg-5)
        ((#:phases phases)
-- 
2.41.0

Maxim Cournoyer wrote on 16 Aug 2023 14:10

[PATCH v2 33/59] gnu: qtdeclarative-5: Update to 5.15.10.

Recipients:(address . 65280@debbugs.gnu.org)(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)

Message-ID:890a447e59685845bcd22593c93a4b5763444174.1692187578.git.maxim.cournoyer@gmail.com

* gnu/packages/qt.scm (qtdeclarative-5): Update to 5.15.10.

---

(no changes since v1)

gnu/packages/qt.scm | 4 ++--

1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (22 lines)diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index d73fe705fe..0fade3cca0 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1254,13 +1254,13 @@ (define-public qtdeclarative-5
   (package
     (inherit qtsvg-5)
     (name "qtdeclarative")
-    (version "5.15.8")
+    (version "5.15.10")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "1kb8nj17vmnky0ayiwypim7kf6rmlmfcjf6gnrw8rydmp61w0vh2"))
+                "1x1xsdlxwpdxzrapk5q0adjwh48c6awd8nj4j51ig6y49hy4r6r3"))
               (patches (search-patches "qtdeclarative-5-disable-qmlcache.patch"))))
     (arguments
      (substitute-keyword-arguments (package-arguments qtsvg-5)
-- 
2.41.0

Maxim Cournoyer wrote on 16 Aug 2023 14:10

[PATCH v2 26/59] gnu: qt-creator: Update to 11.0.1.

Recipients:(address . 65280@debbugs.gnu.org)(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)

Message-ID:c11bdf3aaa2f6ff9476f4303025ae642e14e9da7.1692187578.git.maxim.cournoyer@gmail.com

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

[source]: Adjust snippet.

[arguments]: Adjust patch-paths phase. Disable the 'tst_process' failing

tests.

---

Changes in v2:

- Delete fix-tests-build phase

- Only one new test is now disabled

gnu/packages/qt.scm | 35 +++++++++++++++++++----------------

1 file changed, 19 insertions(+), 16 deletions(-)

Toggle diff (91 lines)diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 0d84231cef..c858bab571 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -4820,7 +4820,7 @@ (define-public clazy
 (define-public qt-creator
   (package
     (name "qt-creator")
-    (version "9.0.0")
+    (version "11.0.1")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -4834,7 +4834,6 @@ (define-public qt-creator
                            ;; Remove bundled libraries, where supported.
                            ;; TODO: package and unbundle litehtml
                            '("src/libs/3rdparty/yaml-cpp"
-                             "src/shared/qbs/src/shared/qtscript/src/3rdparty"
                              "tests/unit/unittest/3rdparty"
                              ;; Marketplace recommends nonfree extensions;
                              ;; remove it.
@@ -4845,7 +4844,7 @@ (define-public qt-creator
                             ((".*marketplace/marketplace.qbs.*") ""))))
               (sha256
                (base32
-                "1adyxs0cnqx14gwzkvh909c52449ia6y87n1r4qf6wwydhch43cs"))))
+                "0j90dv9micqsvj4r7iqd11szixr0mlpna4w5s2lnyqckjs6a0mm6"))))
     (build-system qt-build-system)
     (arguments
      (list
@@ -4861,25 +4860,17 @@ (define-public qt-creator
                              #$output "/lib/qtcreator"))
       #:phases
       #~(modify-phases %standard-phases
-          (add-after 'unpack 'fix-tests-build
-            (lambda _
-              ;; Add a missing link directive (see:
-              ;; https://bugreports.qt.io/browse/QTCREATORBUG-28434).
-              (substitute* "src/libs/tracing/CMakeLists.txt"
-                (("DEPENDS Utils Qt5::Qml Qt5::Quick")
-                 "DEPENDS Utils Qt5::Quick")
-                (("PUBLIC_DEPENDS Qt5::Widgets")
-                 "PUBLIC_DEPENDS Qt5::Widgets Qt5::Qml"))))
           (add-after 'unpack 'patch-paths
             (lambda* (#:key inputs #:allow-other-keys)
               (substitute* '("src/libs/utils/commandline.cpp"
                              "src/libs/utils/deviceshell.cpp")
                 (("/bin/sh")
                  (search-input-file inputs "bin/sh")))
-              (substitute* "src/libs/utils/qtcprocess.cpp"
+              (substitute* "src/libs/utils/process.cpp"
                 (("/usr/bin/env")
                  (search-input-file inputs "bin/env")))
-              (substitute* "tests/auto/utils/qtcprocess/tst_qtcprocess.cpp"
+              (substitute* '("tests/auto/utils/process/tst_process.cpp"
+                             "tests/auto/utils/commandline/tst_commandline.cpp")
                 (("/bin/sh")
                  (which "sh")))))
           (add-before 'build 'build-doc
@@ -4892,7 +4883,6 @@ (define-public qt-creator
               (invoke "cmake" "--install" "." "--prefix" #$output
                       "--component=html_docs")))
           (replace 'check
-            ;; Loosely based on .github/workflows/build_cmake.yml.
             (lambda* (#:key tests? parallel-tests? #:allow-other-keys)
               (when tests?
                 (invoke "xvfb-run"      ;for the 'renderpass' tests
@@ -4900,7 +4890,20 @@ (define-public qt-creator
                                          (number->string (parallel-job-count))
                                          "1")
                         "--label-exclude" "exclude_from_precheck"
-                        "--exclude-regex" "tst_perfdata"))))
+                        "-E"
+                        (string-append
+                         "("
+                         (string-join
+                          (list
+                           ;; The performance data tests require external
+                           ;; data.
+                           "tst_perfdata"
+                           ;; This test relies on counting processes, counts
+                           ;; only 0 of them instead of 5 for unknown reasons
+                           ;; (see:
+                           ;; https://bugreports.qt.io/browse/QTCREATORBUG-29495).
+                           "tst_process") "|")
+                         ")")))))
           (add-after 'qt-wrap 'wrap-bin
             ;; Make a few well-integrated tools readily available.
             (lambda* (#:key inputs outputs #:allow-other-keys)
-- 
2.41.0

Maxim Cournoyer wrote on 16 Aug 2023 14:10

[PATCH v2 34/59] gnu: qtconnectivity: Update to 5.15.10.

Recipients:(address . 65280@debbugs.gnu.org)(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)

Message-ID:fcbb9d29fd82d093e39047d36777ac122f0cafae.1692187578.git.maxim.cournoyer@gmail.com

* gnu/packages/qt.scm (qtconnectivity): Update to 5.15.10.

---

(no changes since v1)

gnu/packages/qt.scm | 4 ++--

1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (22 lines)diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 0fade3cca0..59b7250818 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1451,13 +1451,13 @@ (define-public qtconnectivity
   (package
     (inherit qtsvg-5)
     (name "qtconnectivity")
-    (version "5.15.8")
+    (version "5.15.10")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "1j6qgkg77ycwcjxnhh38i9np1z8pjsqrzvfk3zsyq07f6k563fnc"))))
+                "1sdrw67djfr8qi5wx3qhg8asq2c6f3v3mal3sms7dp7a2l1irnrz"))))
     (native-inputs
      (list perl pkg-config qtdeclarative-5))
     (inputs
-- 
2.41.0

Maxim Cournoyer wrote on 16 Aug 2023 14:10

[PATCH v2 35/59] gnu: qtwebsockets-5: Update to 5.15.10.

Recipients:(address . 65280@debbugs.gnu.org)(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)

Message-ID:cb915e1279d2bcb262c7ed1714913d4ba36403fe.1692187578.git.maxim.cournoyer@gmail.com

* gnu/packages/qt.scm (qtwebsockets-5): Update to 5.15.10.

---

(no changes since v1)

gnu/packages/qt.scm | 4 ++--

1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (22 lines)diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 59b7250818..74e0f972d1 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1469,13 +1469,13 @@ (define-public qtconnectivity
 (define-public qtwebsockets-5
   (package (inherit qtsvg-5)
     (name "qtwebsockets")
-    (version "5.15.8")
+    (version "5.15.10")
     (source (origin
              (method url-fetch)
              (uri (qt-url name version))
              (sha256
               (base32
-               "12h520lpj2pljgkyq36p1509mw4pxgb76n30d32kg52crjsk34pa"))))
+               "12nryr99cixwxc1mnb12sys7bp4xnm39nzq1mf2lajswkvdn559b"))))
     (arguments
      (substitute-keyword-arguments (package-arguments qtsvg-5)
        ((#:tests? _ #f) #f))) ; TODO: Enable the tests
-- 
2.41.0

Maxim Cournoyer wrote on 16 Aug 2023 14:10

[PATCH v2 37/59] gnu: qtmultimedia-5: Update to 5.15.10.

Recipients:(address . 65280@debbugs.gnu.org)(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)

Message-ID:6889e6f3a51156a5a9cc71786591af0584298147.1692187579.git.maxim.cournoyer@gmail.com

* gnu/packages/qt.scm (qtmultimedia-5): Update to 5.15.10.

---

(no changes since v1)

gnu/packages/qt.scm | 4 ++--

1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (22 lines)diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index b345d3bfb1..92112d987d 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1561,13 +1561,13 @@ (define-public qtmultimedia-5
   (package
     (inherit qtsvg-5)
     (name "qtmultimedia")
-    (version "5.15.8")
+    (version "5.15.10")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "1fz0ffpckvbg6qfhab2rrzfnvh4mlalqxcn0kbkd21mi44apjirk"))
+                "1di99ysjrgklx2jpsl0g0lqr9jh4l4p4a3hpi452qny6isyy01hi"))
               (modules '((guix build utils)))
               (snippet
                '(begin
-- 
2.41.0

Maxim Cournoyer wrote on 16 Aug 2023 14:10

[PATCH v2 38/59] gnu: qtsensors: Shorten line width.

Recipients:(address . 65280@debbugs.gnu.org)(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)

Message-ID:1947e758516aec782cd6c167354eee3858890084.1692187579.git.maxim.cournoyer@gmail.com

* gnu/packages/qt.scm (qtsensors): Shorten line width, for 'guix lint'.

---

(no changes since v1)

gnu/packages/qt.scm | 6 ++++--

1 file changed, 4 insertions(+), 2 deletions(-)

Toggle diff (20 lines)diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 92112d987d..52edb1516f 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1546,9 +1546,11 @@ (define-public qtsensors
         `(modify-phases ,phases
            (add-after 'unpack 'fix-tests
              (lambda _
-               (substitute* "tests/auto/qsensorgestures_gestures/tst_sensorgestures_gestures.cpp"
+               (substitute* "tests/auto/qsensorgestures_gestures\
+/tst_sensorgestures_gestures.cpp"
                  (("2000") "5000")      ;lengthen test timeout
-                 (("QTest::newRow(\"twist\") << \"twist\"") "")))))))) ;failing test
+                 ;; This test fails.
+                 (("QTest::newRow(\"twist\") << \"twist\"") ""))))))))
     (native-inputs
      (list perl qtdeclarative-5))
     (inputs (list qtbase-5))
-- 
2.41.0

Maxim Cournoyer wrote on 16 Aug 2023 14:10

[PATCH v2 39/59] gnu: qtmultimedia-5: Shorten maximum line width.

Recipients:(address . 65280@debbugs.gnu.org)(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)

Message-ID:c8a142579362060b9d6adcb67771a84f98b22a8b.1692187579.git.maxim.cournoyer@gmail.com

* gnu/packages/qt.scm (qtmultimedia-5): Shorten maximum line width, for 'guix

lint'.

---

(no changes since v1)

gnu/packages/qt.scm | 3 ++-

1 file changed, 2 insertions(+), 1 deletion(-)

Toggle diff (16 lines)diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 52edb1516f..c1cee17542 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1586,7 +1586,8 @@ (define-public qtmultimedia-5
              (lambda* (#:key outputs #:allow-other-keys)
                (let ((out (assoc-ref outputs "out")))
                  (invoke "qmake" "QT_BUILD_PARTS = libs tools tests"
-                         (string-append "QMAKE_LFLAGS_RPATH=-Wl,-rpath," out "/lib -Wl,-rpath,")
+                         (string-append "QMAKE_LFLAGS_RPATH=-Wl,-rpath,"
+                                        out "/lib -Wl,-rpath,")
                          (string-append "PREFIX=" out)))))))
        ((#:tests? _ #f) #f)))           ; TODO: Enable the tests
     (native-inputs
-- 
2.41.0

Maxim Cournoyer wrote on 16 Aug 2023 14:10

[PATCH v2 36/59] gnu: qtsensors: Update to 5.15.10.

Recipients:(address . 65280@debbugs.gnu.org)(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)

Message-ID:e29e5d2ef31cb3d20dde38c4e808135d1b71b48b.1692187578.git.maxim.cournoyer@gmail.com

* gnu/packages/qt.scm (qtsensors): Update to 5.15.10.

---

(no changes since v1)

gnu/packages/qt.scm | 4 ++--

1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (22 lines)diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 74e0f972d1..b345d3bfb1 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1532,13 +1532,13 @@ (define-public qtsensors
   (package
     (inherit qtsvg-5)
     (name "qtsensors")
-    (version "5.15.8")
+    (version "5.15.10")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "1fdpgbikvxjacyipcyac0czqhv96pvc75dl9cyafslws8m53fm56"))))
+                "00gzb7xcifi3ib5adi7s6h5wvc6v4f48nwb4g1pm0zq9sv22lg6d"))))
     (arguments
      (substitute-keyword-arguments (package-arguments qtsvg-5)
        ((#:parallel-tests? _ #f) #f)    ; can lead to race condition
-- 
2.41.0

Maxim Cournoyer wrote on 16 Aug 2023 14:10

[PATCH v2 40/59] gnu: qtwayland-5: Update to 5.15.10.

Recipients:(address . 65280@debbugs.gnu.org)(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)

Message-ID:ff4e44fba291606f478917d06a50fae5a33967b6.1692187579.git.maxim.cournoyer@gmail.com

* gnu/packages/qt.scm (qtwayland-5): Update to 5.15.10.

[source]: Remove qtwayland-gcc-11.patch patch.

* gnu/packages/patches/qtwayland-gcc-11.patch: Delete file.

* gnu/local.mk (dist_patch_DATA): De-register it.

---

(no changes since v1)

gnu/local.mk | 1 -

gnu/packages/patches/qtwayland-gcc-11.patch | 18 ------------------

gnu/packages/qt.scm | 7 +++----

3 files changed, 3 insertions(+), 23 deletions(-)

delete mode 100644 gnu/packages/patches/qtwayland-gcc-11.patch

Toggle diff (62 lines)diff --git a/gnu/local.mk b/gnu/local.mk
index f10fe292dc..87a9af894d 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1878,7 +1878,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/quagga-reproducible-build.patch          \
   %D%/packages/patches/quickswitch-fix-dmenu-check.patch	\
   %D%/packages/patches/quilt-grep-compat.patch 			\
-  %D%/packages/patches/qtwayland-gcc-11.patch			\
   %D%/packages/patches/qtwayland-dont-recreate-callbacks.patch	\
   %D%/packages/patches/qtwayland-cleanup-callbacks.patch	\
   %D%/packages/patches/ragel-char-signedness.patch		\
diff --git a/gnu/packages/patches/qtwayland-gcc-11.patch b/gnu/packages/patches/qtwayland-gcc-11.patch
deleted file mode 100644
index 06983ff2f3..0000000000
--- a/gnu/packages/patches/qtwayland-gcc-11.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Add missing import for newer libstdc++.
-
-Taken from upstream:
-
-  https://github.com/qt/qtwayland/commit/1aa6ec2c778504d96543f6cdc2b9199a7b066fc1
-
-diff --git a/tests/auto/client/shared/corecompositor.cpp b/tests/auto/client/shared/corecompositor.cpp
-index 5c6c83baa..fa9b7662a 100644
---- a/tests/auto/client/shared/corecompositor.cpp
-+++ b/tests/auto/client/shared/corecompositor.cpp
-@@ -27,6 +27,7 @@
- ****************************************************************************/
- 
- #include "corecompositor.h"
-+#include <thread>
- 
- namespace MockCompositor {
- 
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index c1cee17542..b71077e075 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1703,16 +1703,15 @@ (define-public qtwayland-5
   (package
     (inherit qtsvg-5)
     (name "qtwayland")
-    (version "5.15.8")
+    (version "5.15.10")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
-              (patches (search-patches "qtwayland-gcc-11.patch"
-                                       "qtwayland-dont-recreate-callbacks.patch"
+              (patches (search-patches "qtwayland-dont-recreate-callbacks.patch"
                                        "qtwayland-cleanup-callbacks.patch"))
               (sha256
                (base32
-                "0aa5jcvvap6qca6imdkhs1mhv5bnaxn466mmpl7x78jx1za7n3ps"))))
+                "1w9nclz1lfg5haq3m6ihils0kl2n1pqagdyh71ry1m281w8gvly8"))))
     (arguments
      (substitute-keyword-arguments (package-arguments qtsvg-5)
        ((#:phases phases)
-- 
2.41.0

Maxim Cournoyer wrote on 16 Aug 2023 14:10

[PATCH v2 41/59] gnu: qtserialport: Update to 5.15.10.

Recipients:(address . 65280@debbugs.gnu.org)(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)

Message-ID:a37513ad5940030a95deff44cac1a114a8fd92ac.1692187579.git.maxim.cournoyer@gmail.com

* gnu/packages/qt.scm (qtserialport): Update to 5.15.10.

---

(no changes since v1)

gnu/packages/qt.scm | 4 ++--

1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (22 lines)diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index b71077e075..8a4cf5ba9a 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1802,13 +1802,13 @@ (define-public qtserialport
   (package
     (inherit qtsvg-5)
     (name "qtserialport")
-    (version "5.15.8")
+    (version "5.15.10")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "04i8pdyml1sw4dkk9vyw2xy5bz3fp6f90fws7ag5y8iizfgs5v2v"))))
+                "1zk8y20bqibpvsxi1mqg1ry37xq55yw3m0isij4j9pc58lm4wvzw"))))
     (native-inputs (list perl))
     (inputs (list qtbase-5 eudev))
     (arguments
-- 
2.41.0

Maxim Cournoyer wrote on 16 Aug 2023 14:10

[PATCH v2 42/59] gnu: qtserialbus: Update to 5.15.10.

Recipients:(address . 65280@debbugs.gnu.org)(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)

Message-ID:d2a11e80c995ecac53e21f06adca1027fdb2405c.1692187579.git.maxim.cournoyer@gmail.com

* gnu/packages/qt.scm (qtserialbus): Update to 5.15.10.

---

(no changes since v1)

gnu/packages/qt.scm | 4 ++--

1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (22 lines)diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 8a4cf5ba9a..53a8ec7dc7 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1833,13 +1833,13 @@ (define-public qtserialbus
   (package
     (inherit qtsvg-5)
     (name "qtserialbus")
-    (version "5.15.8")
+    (version "5.15.10")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "0ws3pjbp4g8f49k8q0qa5hgyisbyk3m7kl8pwzkfws048glvz570"))))
+                "1i7zc5nlp9by0sr6qlls89zqm84sdxl1h4mr30dbxwsvvrqkmhf9"))))
     (arguments
      (substitute-keyword-arguments (package-arguments qtsvg-5)
        ((#:phases phases '%standard-phases)
-- 
2.41.0

Maxim Cournoyer wrote on 16 Aug 2023 14:10

[PATCH v2 43/59] gnu: qtwebchannel-5: Update to 5.15.10.

Recipients:(address . 65280@debbugs.gnu.org)(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)

Message-ID:e24cac81e6ae0a5d62b85b902aedfcd25e339330.1692187579.git.maxim.cournoyer@gmail.com

* gnu/packages/qt.scm (qtwebchannel-5): Update to 5.15.10.

---

(no changes since v1)

gnu/packages/qt.scm | 4 ++--

1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (22 lines)diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 53a8ec7dc7..431e18714e 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1860,13 +1860,13 @@ (define-public qtserialbus
 (define-public qtwebchannel-5
   (package (inherit qtsvg-5)
     (name "qtwebchannel")
-    (version "5.15.8")
+    (version "5.15.10")
     (source (origin
              (method url-fetch)
              (uri (qt-url name version))
              (sha256
               (base32
-               "1pfmy6fqis47awjb590r63y13vvsfm0fq70an3ylsknhyq3firgn"))))
+               "1rgziqprq0xvd57jfvd7ddkcddj3645ldn3xbq3n6w058bw04mz2"))))
     (native-inputs (list perl qtdeclarative-5 qtwebsockets-5))
     (inputs (list qtbase-5))
     (synopsis "Web communication library for Qt")
-- 
2.41.0

Maxim Cournoyer wrote on 16 Aug 2023 14:11

[PATCH v2 44/59] gnu: qtwebglplugin: Update to 5.15.10.

Recipients:(address . 65280@debbugs.gnu.org)(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)

Message-ID:a2171806e222d1f022f13657f85d3b0d4bcda7f5.1692187579.git.maxim.cournoyer@gmail.com

* gnu/packages/qt.scm (qtwebglplugin): Update to 5.15.10.

[description]: Double single space.

---

(no changes since v1)

gnu/packages/qt.scm | 6 +++---

1 file changed, 3 insertions(+), 3 deletions(-)

Toggle diff (31 lines)diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 431e18714e..300ba88cd4 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1916,13 +1916,13 @@ (define-public qtwebglplugin
   (package
     (inherit qtsvg-5)
     (name "qtwebglplugin")
-    (version "5.15.8")
+    (version "5.15.10")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "1gvzhgfn55kdp5g11fg5yja5xb6wghx5sfc8vfp8zzpxnak7pbn1"))))
+                "12kcvq5y5rpivxrn0p43gdkk3yysdi7bk904jgd3wk67gl0bda8r"))))
     (arguments
      (substitute-keyword-arguments (package-arguments qtsvg-5)
        ((#:phases phases)
@@ -1935,7 +1935,7 @@ (define-public qtwebglplugin
     (inputs (list mesa qtbase-5 qtdeclarative-5 qtwebsockets-5 zlib))
     (synopsis "QPA plugin for running applications via a browser using
 streamed WebGL commands")
-    (description "Qt back end that uses WebGL for rendering. It allows Qt
+    (description "Qt back end that uses WebGL for rendering.  It allows Qt
 applications (with some limitations) to run in a web browser that supports
 WebGL.  WebGL is a JavaScript API for rendering 2D and 3D graphics within any
 compatible web browser without the use of plug-ins.  The API is similar to
-- 
2.41.0

Maxim Cournoyer wrote on 16 Aug 2023 14:11

[PATCH v2 45/59] gnu: qtwebview: Update to 5.15.10.

Recipients:(address . 65280@debbugs.gnu.org)(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)

Message-ID:1564b5a558bde96e41fa1e76e894613b7e3c9c73.1692187579.git.maxim.cournoyer@gmail.com

* gnu/packages/qt.scm (qtwebview): Update to 5.15.10.

---

(no changes since v1)

gnu/packages/qt.scm | 4 ++--

1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (22 lines)diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 300ba88cd4..b0a372c4cc 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1945,13 +1945,13 @@ (define-public qtwebview
   (package
     (inherit qtsvg-5)
     (name "qtwebview")
-    (version "5.15.8")
+    (version "5.15.10")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "1b03dzlff840n2i53r105c7sv91ivwzxn7ldpgnhiyrhr897i9kj"))))
+                "00446917v1djh18lqsk1q5bhgfsfyz06q4zvna96xalwvl3ccn14"))))
     (native-inputs (list perl))
     (inputs (list qtbase-5 qtdeclarative-5))
     (synopsis "Display web content in a QML application")
-- 
2.41.0

Maxim Cournoyer wrote on 16 Aug 2023 14:11

[PATCH v2 46/59] gnu: qtlocation: Update to 5.15.10.

Recipients:(address . 65280@debbugs.gnu.org)(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)

Message-ID:de74f7a6b87bca2ba771b2cfea957fca73d45c5c.1692187579.git.maxim.cournoyer@gmail.com

* gnu/packages/qt.scm (qtlocation): Update to 5.15.10.

---

(no changes since v1)

gnu/packages/qt.scm | 4 ++--

1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (22 lines)diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index b0a372c4cc..eb14b6b152 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1987,13 +1987,13 @@ (define-public qtlocation
   (package
     (inherit qtsvg-5)
     (name "qtlocation")
-    (version "5.15.8")
+    (version "5.15.10")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "0r16qxy0pfpwvna4gpz67jk3qv3qizfd659kc9iwdh8bhz7lpjrw"))))
+                "0cvcpf0grwqnk6jxhrwm9xxm3dyc6lqvmb1np7fvkhkzjimx45l8"))))
     (arguments
      (substitute-keyword-arguments (package-arguments qtsvg-5)
        ((#:tests? _ #f) #f)             ; TODO: Enable the tests
-- 
2.41.0

Maxim Cournoyer wrote on 16 Aug 2023 14:11

[PATCH v2 47/59] gnu: qttools-5: Update to 5.15.10.

Recipients:(address . 65280@debbugs.gnu.org)(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)

Message-ID:9e5c3b3d1ebab8118040565939935d7d4a61754b.1692187579.git.maxim.cournoyer@gmail.com

* gnu/packages/qt.scm (qttools-5): Update to 5.15.10.

---

(no changes since v1)

gnu/packages/qt.scm | 4 ++--

1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (22 lines)diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index eb14b6b152..099a05f43b 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -2044,13 +2044,13 @@ (define-public qttools-5
   (package
     (inherit qtsvg-5)
     (name "qttools")
-    (version "5.15.8")
+    (version "5.15.10")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "1i79fwsn799x3n3jidp3f4gz9d5vi9gg6p8g8lbswb832gggigm3"))))
+                "1bkx2sc5hyldarc7w76ymv7dlcna3ib9r2kp67jdqcf856bnrx36"))))
     (arguments
      (substitute-keyword-arguments (package-arguments qtsvg-5)
        ((#:tests? _ #f) #f)))           ; TODO: Enable the tests
-- 
2.41.0

Maxim Cournoyer wrote on 16 Aug 2023 14:11

[PATCH v2 48/59] gnu: qtscript: Update to 5.15.10.

Recipients:(address . 65280@debbugs.gnu.org)(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)

Message-ID:d17e47b58a9d2c6c9fa6afa63181a5c13b6f8b2b.1692187579.git.maxim.cournoyer@gmail.com

* gnu/packages/qt.scm (qtscript): Update to 5.15.10.

---

(no changes since v1)

gnu/packages/qt.scm | 4 ++--

1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (22 lines)diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 099a05f43b..5fd4947d3a 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -2126,13 +2126,13 @@ (define-public qtscript
   (package
     (inherit qtsvg-5)
     (name "qtscript")
-    (version "5.15.8")
+    (version "5.15.10")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "0rjj1pn0fwdq0qz0nzisxza671ywfrq5cv6iplywfyflh7q4dmcs"))
+                "0fvhjsn41f6gx7bmvifxl61fdk6mg9lc6wgnwsfz2kyx0r2wsbb4"))
               (patches (search-patches "qtscript-disable-tests.patch"))))
     (native-inputs (list perl qttools-5))
     (inputs (list qtbase-5))
-- 
2.41.0

Maxim Cournoyer wrote on 16 Aug 2023 14:11

[PATCH v2 49/59] gnu: qtquickcontrols-5: Update to 5.15.10.

Recipients:(address . 65280@debbugs.gnu.org)(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)

Message-ID:c9103c78621151923ebc43f9c7427a15bc3ad0ad.1692187579.git.maxim.cournoyer@gmail.com

* gnu/packages/qt.scm (qtquickcontrols-5): Update to 5.15.10.

---

(no changes since v1)

gnu/packages/qt.scm | 4 ++--

1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (22 lines)diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 5fd4947d3a..91b4f069d9 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -2145,13 +2145,13 @@ (define-public qtquickcontrols-5
   (package
     (inherit qtsvg-5)
     (name "qtquickcontrols")
-    (version "5.15.8")
+    (version "5.15.10")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "0yp47bpkfckms76vw0hrwnzchy8iak23ih6w9pnwrnjkmbc65drc"))))
+                "1szgm7d8d2lllq19iyf4ggif933bprgsgmp4wzyg0mwq21rnwsm0"))))
     (arguments
      (substitute-keyword-arguments (package-arguments qtsvg-5)
        ((#:tests? _ #f) #f)))           ; TODO: Enable the tests
-- 
2.41.0

Maxim Cournoyer wrote on 16 Aug 2023 14:11

[PATCH v2 50/59] gnu: qtquickcontrols2-5: Update to 5.15.10.

Recipients:(address . 65280@debbugs.gnu.org)(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)

Message-ID:35170daed0899701d1349bef0ccfb2828aa2d5a9.1692187579.git.maxim.cournoyer@gmail.com

* gnu/packages/qt.scm (qtquickcontrols2-5): Update to 5.15.10.

---

(no changes since v1)

gnu/packages/qt.scm | 4 ++--

1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (22 lines)diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 91b4f069d9..e4d1cd6a85 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -2165,13 +2165,13 @@ (define-public qtquickcontrols2-5
   (package
     (inherit qtsvg-5)
     (name "qtquickcontrols2")
-    (version "5.15.8")
+    (version "5.15.10")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "058dkj6272za47vnz3mxsmwsj85gxf6g0ski645fphk8s3jp2bk5"))))
+                "13pw0ah7ydkl27pvqwdjw8rc3cxgag7jr0a12g1iw0z9zs94r5cp"))))
     (arguments
      (substitute-keyword-arguments (package-arguments qtsvg-5)
        ((#:tests? _ #f) #f)))           ; TODO: Enable the tests
-- 
2.41.0

Maxim Cournoyer wrote on 16 Aug 2023 14:11

[PATCH v2 51/59] gnu: qtgraphicaleffects: Update to 5.15.10.

Recipients:(address . 65280@debbugs.gnu.org)(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)

Message-ID:24f577c0a4daadbeebffa7f2fec881eaeaec383a.1692187579.git.maxim.cournoyer@gmail.com

* gnu/packages/qt.scm (qtgraphicaleffects): Update to 5.15.10.

---

(no changes since v1)

gnu/packages/qt.scm | 4 ++--

1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (22 lines)diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index e4d1cd6a85..f56cf2e09a 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -2186,13 +2186,13 @@ (define-public qtgraphicaleffects
   (package
     (inherit qtsvg-5)
     (name "qtgraphicaleffects")
-    (version "5.15.8")
+    (version "5.15.10")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "0wypji8i19kjq18qd92z8kkd3fj2n0d5hgh6xiza96833afvibj9"))))
+                "01f0glgc74595llfdfmapc3hqw3lqj8lcdmabm0mmnplnabb2b5b"))))
     (arguments
      (substitute-keyword-arguments (package-arguments qtsvg-5)
        ((#:tests? _ #f) #f)))           ; TODO: Enable the tests
-- 
2.41.0

Maxim Cournoyer wrote on 16 Aug 2023 14:11

[PATCH v2 52/59] gnu: qtgamepad: Update to 5.15.10.

Recipients:(address . 65280@debbugs.gnu.org)(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)

Message-ID:4d52225dc309a6a242befea5aa4fd697728a4939.1692187579.git.maxim.cournoyer@gmail.com

* gnu/packages/qt.scm (qtgamepad): Update to 5.15.10.

---

(no changes since v1)

gnu/packages/qt.scm | 4 ++--

1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (22 lines)diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index f56cf2e09a..c71a6e9030 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -2209,13 +2209,13 @@ (define-public qtgamepad
   (package
     (inherit qtsvg-5)
     (name "qtgamepad")
-    (version "5.15.8")
+    (version "5.15.10")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "0vgxprgk7lak209wsg2ljzfkpwgjzscpbxmj5fyvvwm2pbnpspvk"))))
+                "0xkaib238x1lj6agf4gywgy69826zpxqlda361wlchwasyrbw238"))))
     (native-inputs (list perl pkg-config))
     (inputs
      (list fontconfig
-- 
2.41.0

Maxim Cournoyer wrote on 16 Aug 2023 14:11

[PATCH v2 53/59] gnu: qtscxml: Update to 5.15.10.

Recipients:(address . 65280@debbugs.gnu.org)(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)

Message-ID:f1c5a45b19123b7ae6a15f70405e07643a284fcb.1692187579.git.maxim.cournoyer@gmail.com

* gnu/packages/qt.scm (qtscxml): Update to 5.15.10.

---

(no changes since v1)

gnu/packages/qt.scm | 4 ++--

1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (22 lines)diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index c71a6e9030..e2d3354b3e 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -2235,13 +2235,13 @@ (define-public qtscxml
   (package
     (inherit qtsvg-5)
     (name "qtscxml")
-    (version "5.15.8")
+    (version "5.15.10")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "17j6npvgr8q3lyrqmvfh1n47mkhfzk18r998hcjm2w75xj46km1n"))
+                "10lxvdxdkxr2vldhqdp4bk38r7q9j0jy54lrqw9whnyj3y5wgzzi"))
               (modules '((guix build utils)))
               (snippet
                '(begin
-- 
2.41.0

Maxim Cournoyer wrote on 16 Aug 2023 14:11

[PATCH v2 54/59] gnu: qtpurchasing: Update to 5.15.10.

Recipients:(address . 65280@debbugs.gnu.org)(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)

Message-ID:a0cc97c20fc7f650948f2fd601712124c1d46486.1692187579.git.maxim.cournoyer@gmail.com

* gnu/packages/qt.scm (qtpurchasing): Update to 5.15.10.

---

(no changes since v1)

gnu/packages/qt.scm | 4 ++--

1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (22 lines)diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index e2d3354b3e..bdae1b227d 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -2293,13 +2293,13 @@ (define-public qtpurchasing
   (package
     (inherit qtsvg-5)
     (name "qtpurchasing")
-    (version "5.15.8")
+    (version "5.15.10")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "0bjky5ncg9yhz4a63g3jl1r5pa6i09f6g8wgzs591mhybrbmhcw8"))))
+                "0gzxzcr9x45nd90481hdbj5shvaax00qjr1kx3lkcp13187pyacb"))))
     (inputs (list qtbase-5 qtdeclarative-5))
     (synopsis "Qt Purchasing module")
     (description "The Qt Purchasing module provides and in-app API for
-- 
2.41.0

Maxim Cournoyer wrote on 16 Aug 2023 14:11

[PATCH v2 55/59] gnu: qtcharts: Update to 5.15.10.

Recipients:(address . 65280@debbugs.gnu.org)(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)

Message-ID:f05d0ceb1d2918dd4379d2684a64664b370abed4.1692187579.git.maxim.cournoyer@gmail.com

* gnu/packages/qt.scm (qtcharts): Update to 5.15.10.

[description]: Double single space.

---

(no changes since v1)

gnu/packages/qt.scm | 10 +++++-----

1 file changed, 5 insertions(+), 5 deletions(-)

Toggle diff (35 lines)diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index bdae1b227d..108dcc1221 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -2309,13 +2309,13 @@ (define-public qtcharts
   (package
     (inherit qtsvg-5)
     (name "qtcharts")
-    (version "5.15.8")
+    (version "5.15.10")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "1q11ank69l9qw3iks2svr0g2g6pzng9v8p87dpsmjs988f4ysmll"))))
+                "0ax1qab1ibibk2bbwmlmsni7j4y821jzvcvrr63iz6pcw94vwx6h"))))
     (arguments
      (substitute-keyword-arguments (package-arguments qtsvg-5)
        ((#:phases phases)
@@ -2329,9 +2329,9 @@ (define-public qtcharts
     (synopsis "Qt Charts module")
     (description "The Qt Charts module provides a set of easy to use chart
 components.  It uses the Qt Graphics View Framework, therefore charts can be
-easily integrated to modern user interfaces.  Qt Charts can be used as QWidgets,
-QGraphicsWidget, or QML types. Users can easily create impressive graphs by
-selecting one of the charts themes.")
+easily integrated to modern user interfaces.  Qt Charts can be used as
+QWidgets, QGraphicsWidget, or QML types.  Users can easily create impressive
+graphs by selecting one of the charts themes.")
     (license license:gpl3)))
 
 (define-public qtdatavis3d
-- 
2.41.0

Maxim Cournoyer wrote on 16 Aug 2023 14:11

[PATCH v2 56/59] gnu: qtdatavis3d: Update to 5.15.10.

Recipients:(address . 65280@debbugs.gnu.org)(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)

Message-ID:cb5f9c12ddcc842413c1c844f5726bf062d8017b.1692187579.git.maxim.cournoyer@gmail.com

* gnu/packages/qt.scm (qtdatavis3d): Update to 5.15.10.

[description]: Double single space.

---

(no changes since v1)

gnu/packages/qt.scm | 8 ++++----

1 file changed, 4 insertions(+), 4 deletions(-)

Toggle diff (33 lines)diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 108dcc1221..23ae55e77f 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -2338,22 +2338,22 @@ (define-public qtdatavis3d
   (package
     (inherit qtsvg-5)
     (name "qtdatavis3d")
-    (version "5.15.8")
+    (version "5.15.10")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "1mr2kdshahxrkjs9wlgpr59jbqvyvlax16rlnca4iq00w3v5hrdh"))))
+                "1lhy6l0hlm8mc21k7bwzkgnj6nn6x1f0h2imk8wqjjcvb5g605g5"))))
     (arguments
      (substitute-keyword-arguments (package-arguments qtsvg-5)
        ((#:tests? _ #f) #f))) ; TODO: Enable the tests
     (inputs (list qtbase-5 qtdeclarative-5))
     (synopsis "Qt Data Visualization module")
     (description "The Qt Data Visualization module provides a way to visualize
-data in 3D as bar, scatter, and surface graphs. It is especially useful for
+data in 3D as bar, scatter, and surface graphs.  It is especially useful for
 visualizing depth maps and large quantities of rapidly changing data, such as
-data received from multiple sensors. The look and feel of graphs can be
+data received from multiple sensors.  The look and feel of graphs can be
 customized by using themes or by adding custom items and labels to them.")
     (license license:gpl3)))
 
-- 
2.41.0

Maxim Cournoyer wrote on 16 Aug 2023 14:11

[PATCH v2 57/59] gnu: qtnetworkauth-5: Update to 5.15.10.

Recipients:(address . 65280@debbugs.gnu.org)(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)

Message-ID:035e4a46b449a35aa67f406fd948f0eeac6a80f3.1692187579.git.maxim.cournoyer@gmail.com

* gnu/packages/qt.scm (qtnetworkauth-5): Update to 5.15.10.

---

(no changes since v1)

gnu/packages/qt.scm | 4 ++--

1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (22 lines)diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 23ae55e77f..06699e70c7 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -2360,13 +2360,13 @@ (define-public qtdatavis3d
 (define-public qtnetworkauth-5
   (package (inherit qtsvg-5)
     (name "qtnetworkauth")
-    (version "5.15.8")
+    (version "5.15.10")
     (source (origin
              (method url-fetch)
              (uri (qt-url name version))
              (sha256
               (base32
-               "0fsmpjwkzzy3281shld7gs1gj217smb1f8ai63gdvnkp0jb2fhc5"))))
+               "0qf9dqh7rlbyi3fl7610zb86yqxwaq5m3zvwp2c8w1sa0m8jcili"))))
     (inputs (list qtbase-5))
     (synopsis "Qt Network Authorization module")
     (description "The Qt Network Authorization module provides an
-- 
2.41.0

Maxim Cournoyer wrote on 16 Aug 2023 14:11

[PATCH v2 58/59] gnu: qtspeech: Update to 5.15.10.

Recipients:(address . 65280@debbugs.gnu.org)(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)

Message-ID:cb4ceeeb24da54f7550ffef3d0d1fb78e06c0e04.1692187579.git.maxim.cournoyer@gmail.com

* gnu/packages/qt.scm (qtspeech): Update to 5.15.10.

---

(no changes since v1)

gnu/packages/qt.scm | 4 ++--

1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (22 lines)diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 06699e70c7..52290f1322 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -2433,13 +2433,13 @@ (define-public qtspeech
   (package
     (inherit qtsvg-5)
     (name "qtspeech")
-    (version "5.15.8")
+    (version "5.15.10")
     (source (origin
               (method url-fetch)
               (uri (qt-url name version))
               (sha256
                (base32
-                "1q56lyj7s05sx52j5z6gcs000mni4c7mb7qyq4lfval7c06hw5p6"))))
+                "1qscnqxnm9yvfa0i6xnz04xrhlxf08v3xkas8ng790camr34pwwa"))))
     (arguments
      (substitute-keyword-arguments (package-arguments qtsvg-5)
        ((#:tests? _ #f) #f))) ; TODO: Enable the tests
-- 
2.41.0

Maxim Cournoyer wrote on 16 Aug 2023 14:11

[PATCH v2 59/59] gnu: qtwebengine-5: Update to 5.15.10.

Recipients:(address . 65280@debbugs.gnu.org)(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)

Message-ID:7db63686babb8d1837bc9ef83bc64fca7f53882f.1692187579.git.maxim.cournoyer@gmail.com

* gnu/packages/qt.scm (qtwebengine-5): Update to 5.15.10.

[source]: Update snippet to preserve the whole openh264 third party directory.

---

(no changes since v1)

gnu/packages/qt.scm | 6 +++---

1 file changed, 3 insertions(+), 3 deletions(-)

Toggle diff (32 lines)diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 52290f1322..2c59fc23c4 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -2541,14 +2541,14 @@ (define-public qtwebengine-5
   (package
     (inherit qtsvg-5)
     (name "qtwebengine")
-    (version "5.15.8")
+    (version "5.15.10")
     (source
      (origin
        (method url-fetch)
        (uri (qt-url name version))
        (sha256
         (base32
-         "1qv15g5anhlfsdwnjxy21vc3zxxm8149vysi774l93iab6mxqmjg"))
+         "1rz6vbmr1aydmixayazmpsy7v2naq25l72q1gmvrhf9yf69584q8"))
        (modules '((ice-9 ftw)
                   (ice-9 match)
                   (srfi srfi-1)
@@ -2641,7 +2641,7 @@ (define-public qtwebengine-5
                      "third_party/nasm"
                      "third_party/node"
                      "third_party/one_euro_filter"
-                     "third_party/openh264/src/codec/api/svc"
+                     "third_party/openh264"
                      "third_party/opus"
                      "third_party/ots"
                      "third_party/pdfium"
-- 
2.41.0

Maxim Cournoyer wrote on 16 Aug 2023 14:19

Re: bug#65280: [PATCH v2 00/59] Refresh Qt 5 and 6 packages

Recipients:(name . ???)(address . iyzsong@envs.net)

Message-ID:87y1ibi3ig.fsf_-_@gmail.com

Hi ???,

??? <iyzsong@envs.net> writes:

Toggle quote (38 lines)> Maxim Cournoyer <maxim.cournoyer@gmail.com> writes:
>
>> This series refreshes our modern Qt 6 packages to their latest release,
>> 6.5.2.  It also adds some tooling for the Qt team in the form of two manifests
>> to select all the core Qt 5 packages or the other core packages.
>>
>>
>> Maxim Cournoyer (26):
>>   gnu: qt: Revert to use individual versions instead of %qt5-version.
>>   gnu: qtdeclarative: Disable QML cache to avoid stale cache issues.
>>   etc: Add Qt manifests for Qt maintenance.
>>   gnu: qtbase: Update to 6.5.2.
>>   gnu: qtbase: Enable zstd support.
>>   gnu: qt5compat: Update to 6.5.2.
>>   gnu: qtsvg: Update to 6.5.2.
>>   gnu: qtimageformats: Rename variable to qtimageformats-5.
>>   gnu: qtimageformats-5: Fix indentation.
>>   gnu: Add qtimageformats.
>>   gnu: Add qtlanguageserver.
>>   gnu: qtdeclarative: Update to 6.5.2.
>>   gnu: qtwebsockets: Update to 6.5.2.
>>   gnu: qtshadertools: Update to 6.5.2.
>>   gnu: qtmultimedia: Update to 6.5.2.
>>   gnu: qtwayland: Update to 6.5.2.
>>   gnu: qtwebchannel: Update to 6.5.2.
>>   gnu: qtlottie: Update to 6.5.2.
>>   gnu: qttools: Update to 6.5.2.
>>   gnu: qttranslations: Update to 6.5.2.
>>   gnu: qtpositioning: Update to 6.5.2.
>>   gnu: qtnetworkauth: Update to 6.5.2.
>>   gnu: qtremoteobjects: Update to 6.5.2.
>>   gnu: qtwebengine: Update to 6.5.2.
>>   gnu: Remove qtquickcontrols2.
>>   gnu: qt-creator: Update to 11.0.1.
>>
>
> All look good to me, thanks!

Thanks! I've decided to update our Qt 5 as well, included in a V2; I've

tested building all of these version 5.15.10 packages except qtwebengine

which is requires too much RAM to build on my desktop. The new commits

are:

Toggle snippet (35 lines)0027-gnu-qtbase-5-Update-to-5.15.10.patch
0028-gnu-qt3d-5-Update-to-5.15.10.patch
0029-gnu-qtsvg-5-Update-to-5.15.10.patch
0030-gnu-qtimageformats-5-Update-to-5.15.10.patch
0031-gnu-qtx11extras-Update-to-5.15.10.patch
0032-gnu-qtxmlpatterns-Update-to-5.15.10.patch
0033-gnu-qtdeclarative-5-Update-to-5.15.10.patch
0034-gnu-qtconnectivity-Update-to-5.15.10.patch
0035-gnu-qtwebsockets-5-Update-to-5.15.10.patch
0036-gnu-qtsensors-Update-to-5.15.10.patch
0037-gnu-qtmultimedia-5-Update-to-5.15.10.patch
0038-gnu-qtsensors-Shorten-line-width.patch
0039-gnu-qtmultimedia-5-Shorten-maximum-line-width.patch
0040-gnu-qtwayland-5-Update-to-5.15.10.patch
0041-gnu-qtserialport-Update-to-5.15.10.patch
0042-gnu-qtserialbus-Update-to-5.15.10.patch
0043-gnu-qtwebchannel-5-Update-to-5.15.10.patch
0044-gnu-qtwebglplugin-Update-to-5.15.10.patch
0045-gnu-qtwebview-Update-to-5.15.10.patch
0046-gnu-qtlocation-Update-to-5.15.10.patch
0047-gnu-qttools-5-Update-to-5.15.10.patch
0048-gnu-qtscript-Update-to-5.15.10.patch
0049-gnu-qtquickcontrols-5-Update-to-5.15.10.patch
0050-gnu-qtquickcontrols2-5-Update-to-5.15.10.patch
0051-gnu-qtgraphicaleffects-Update-to-5.15.10.patch
0052-gnu-qtgamepad-Update-to-5.15.10.patch
0053-gnu-qtscxml-Update-to-5.15.10.patch
0054-gnu-qtpurchasing-Update-to-5.15.10.patch
0055-gnu-qtcharts-Update-to-5.15.10.patch
0056-gnu-qtdatavis3d-Update-to-5.15.10.patch
0057-gnu-qtnetworkauth-5-Update-to-5.15.10.patch
0058-gnu-qtspeech-Update-to-5.15.10.patch
0059-gnu-qtwebengine-5-Update-to-5.15.10.patch

Could you please take a look?  They are mostly bumps to the version and
hash of each package and fixes for 'guix lint'.

-- 
Thanks,
Maxim

Andreas Enge wrote on 17 Aug 2023 12:51

Re: [bug#65280] [PATCH 01/26] gnu: qt: Revert to use individual versions instead of %qt5-version.

Recipients:(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)

Message-ID:ZN37o_pnKKP13r-e@jurong

Hello,

Am Mon, Aug 14, 2023 at 12:29:11AM -0400 schrieb Maxim Cournoyer:

Toggle quote (4 lines)

> Rationale: using a variable for the version field currently hinders automatic

> upgrades via 'guix refresh':

> qtbase: no `version' field in source; skipping

could this not be considered a bug in "guix refresh"? For updating, I find

it much clearer to keep the version in one place and then bump it with a

one-line commit to try a comprehensive upgrade.

I do not know how it works inside Guile, but I really thought the two

would be completely equivalent and create the exact same package object,

which would then be analysed by "guix refresh".

Andreas

??? wrote on 17 Aug 2023 13:56

Re: bug#65280: [PATCH v2 00/59] Refresh Qt 5 and 6 packages

Recipients:(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)

Message-ID:87il9dnaq4.fsf@envs.net

Maxim Cournoyer <maxim.cournoyer@gmail.com> writes:

Toggle quote (43 lines)> [...]
> Thanks!  I've decided to update our Qt 5 as well, included in a V2; I've
> tested building all of these version 5.15.10 packages except qtwebengine
> which is requires too much RAM to build on my desktop.  The new commits
> are:
>
> 0027-gnu-qtbase-5-Update-to-5.15.10.patch
> 0028-gnu-qt3d-5-Update-to-5.15.10.patch
> 0029-gnu-qtsvg-5-Update-to-5.15.10.patch
> 0030-gnu-qtimageformats-5-Update-to-5.15.10.patch
> 0031-gnu-qtx11extras-Update-to-5.15.10.patch
> 0032-gnu-qtxmlpatterns-Update-to-5.15.10.patch
> 0033-gnu-qtdeclarative-5-Update-to-5.15.10.patch
> 0034-gnu-qtconnectivity-Update-to-5.15.10.patch
> 0035-gnu-qtwebsockets-5-Update-to-5.15.10.patch
> 0036-gnu-qtsensors-Update-to-5.15.10.patch
> 0037-gnu-qtmultimedia-5-Update-to-5.15.10.patch
> 0038-gnu-qtsensors-Shorten-line-width.patch
> 0039-gnu-qtmultimedia-5-Shorten-maximum-line-width.patch
> 0040-gnu-qtwayland-5-Update-to-5.15.10.patch
> 0041-gnu-qtserialport-Update-to-5.15.10.patch
> 0042-gnu-qtserialbus-Update-to-5.15.10.patch
> 0043-gnu-qtwebchannel-5-Update-to-5.15.10.patch
> 0044-gnu-qtwebglplugin-Update-to-5.15.10.patch
> 0045-gnu-qtwebview-Update-to-5.15.10.patch
> 0046-gnu-qtlocation-Update-to-5.15.10.patch
> 0047-gnu-qttools-5-Update-to-5.15.10.patch
> 0048-gnu-qtscript-Update-to-5.15.10.patch
> 0049-gnu-qtquickcontrols-5-Update-to-5.15.10.patch
> 0050-gnu-qtquickcontrols2-5-Update-to-5.15.10.patch
> 0051-gnu-qtgraphicaleffects-Update-to-5.15.10.patch
> 0052-gnu-qtgamepad-Update-to-5.15.10.patch
> 0053-gnu-qtscxml-Update-to-5.15.10.patch
> 0054-gnu-qtpurchasing-Update-to-5.15.10.patch
> 0055-gnu-qtcharts-Update-to-5.15.10.patch
> 0056-gnu-qtdatavis3d-Update-to-5.15.10.patch
> 0057-gnu-qtnetworkauth-5-Update-to-5.15.10.patch
> 0058-gnu-qtspeech-Update-to-5.15.10.patch
> 0059-gnu-qtwebengine-5-Update-to-5.15.10.patch
>
> Could you please take a look?  They are mostly bumps to the version and
> hash of each package and fixes for 'guix lint'.

Yes, those look great to me too! Thanks.

Maxim Cournoyer wrote on 17 Aug 2023 15:45

Re: [bug#65280] [PATCH 01/26] gnu: qt: Revert to use individual versions instead of %qt5-version.

Recipients:(name . Andreas Enge)(address . andreas@enge.fr)

Message-ID:875y5dhjej.fsf@gmail.com

Hi Andreas!

Andreas Enge <andreas@enge.fr> writes:

Toggle quote (11 lines)> Hello,
>
> Am Mon, Aug 14, 2023 at 12:29:11AM -0400 schrieb Maxim Cournoyer:
>> Rationale: using a variable for the version field currently hinders automatic
>> upgrades via 'guix refresh':
>>    qtbase: no `version' field in source; skipping
>
> could this not be considered a bug in "guix refresh"? For updating, I find
> it much clearer to keep the version in one place and then bump it with a
> one-line commit to try a comprehensive upgrade.

We can teach 'guix refresh' to do anything, with some efforts :-).  I'm
a bit split on the question; on one hand, you can't really update Qt
components in a piece meal fashion (I wouldn't expect that to work, but
I haven't tried).  On the other hand, it would lead to a very large
commit that would be dense to review and stray away from our one package
change / one commit convention, which benefits from existing tooling
such as 'guix refresh' as well as other local hacks I use [0].

So I guess I'm in favor of the status quo, but would welcome a more
capable 'guix refresh' nonetheless.

[0]  https://notabug.org/apteryx/guix-api-examples/src/master/command-line-hacks.

-- 
Thanks,
Maxim

Maxim Cournoyer wrote on 17 Aug 2023 15:47

Re: bug#65280: [PATCH v2 00/59] Refresh Qt 5 and 6 packages

Recipients:(name . ???)(address . iyzsong@envs.net)

Message-ID:871qg1hjbt.fsf@gmail.com

Hello ???,

??? <iyzsong@envs.net> writes:

Toggle quote (47 lines)> Maxim Cournoyer <maxim.cournoyer@gmail.com> writes:
>
>> [...]
>> Thanks!  I've decided to update our Qt 5 as well, included in a V2; I've
>> tested building all of these version 5.15.10 packages except qtwebengine
>> which is requires too much RAM to build on my desktop.  The new commits
>> are:
>>
>> 0027-gnu-qtbase-5-Update-to-5.15.10.patch
>> 0028-gnu-qt3d-5-Update-to-5.15.10.patch
>> 0029-gnu-qtsvg-5-Update-to-5.15.10.patch
>> 0030-gnu-qtimageformats-5-Update-to-5.15.10.patch
>> 0031-gnu-qtx11extras-Update-to-5.15.10.patch
>> 0032-gnu-qtxmlpatterns-Update-to-5.15.10.patch
>> 0033-gnu-qtdeclarative-5-Update-to-5.15.10.patch
>> 0034-gnu-qtconnectivity-Update-to-5.15.10.patch
>> 0035-gnu-qtwebsockets-5-Update-to-5.15.10.patch
>> 0036-gnu-qtsensors-Update-to-5.15.10.patch
>> 0037-gnu-qtmultimedia-5-Update-to-5.15.10.patch
>> 0038-gnu-qtsensors-Shorten-line-width.patch
>> 0039-gnu-qtmultimedia-5-Shorten-maximum-line-width.patch
>> 0040-gnu-qtwayland-5-Update-to-5.15.10.patch
>> 0041-gnu-qtserialport-Update-to-5.15.10.patch
>> 0042-gnu-qtserialbus-Update-to-5.15.10.patch
>> 0043-gnu-qtwebchannel-5-Update-to-5.15.10.patch
>> 0044-gnu-qtwebglplugin-Update-to-5.15.10.patch
>> 0045-gnu-qtwebview-Update-to-5.15.10.patch
>> 0046-gnu-qtlocation-Update-to-5.15.10.patch
>> 0047-gnu-qttools-5-Update-to-5.15.10.patch
>> 0048-gnu-qtscript-Update-to-5.15.10.patch
>> 0049-gnu-qtquickcontrols-5-Update-to-5.15.10.patch
>> 0050-gnu-qtquickcontrols2-5-Update-to-5.15.10.patch
>> 0051-gnu-qtgraphicaleffects-Update-to-5.15.10.patch
>> 0052-gnu-qtgamepad-Update-to-5.15.10.patch
>> 0053-gnu-qtscxml-Update-to-5.15.10.patch
>> 0054-gnu-qtpurchasing-Update-to-5.15.10.patch
>> 0055-gnu-qtcharts-Update-to-5.15.10.patch
>> 0056-gnu-qtdatavis3d-Update-to-5.15.10.patch
>> 0057-gnu-qtnetworkauth-5-Update-to-5.15.10.patch
>> 0058-gnu-qtspeech-Update-to-5.15.10.patch
>> 0059-gnu-qtwebengine-5-Update-to-5.15.10.patch
>>
>> Could you please take a look?  They are mostly bumps to the version and
>> hash of each package and fixes for 'guix lint'.
>
> Yes, those look great to me too!  Thanks.

Thank you!

I'll open the merge request already, although it seems QA is a bit

behind and hasn't provided any insights into the branch yet -- I had

manually built all but one package and don't expect Qt applications to

break on a patch level update.

Thanks,

Maxim

Maxim Cournoyer wrote on 22 Aug 2023 18:36

Re: bug#65280: [PATCH 00/26] Refresh Qt 6 packages

Recipients:(address . 65280-done@debbugs.gnu.org)

Message-ID:87msyjavb4.fsf@gmail.com

Hi,

Maxim Cournoyer <maxim.cournoyer@gmail.com> writes:

Toggle quote (4 lines)

> This series refreshes our modern Qt 6 packages to their latest release,

> 6.5.2. It also adds some tooling for the Qt team in the form of two manifests

> to select all the core Qt 5 packages or the other core packages.

The qt-updates branch has now been merged. Thanks for your attention!

Thanks,

Maxim

Closed

Your comment

This issue is archived.

To comment on this conversation send an email to 65280@debbugs.gnu.org

is:open	open issues
is:done	closed issues
submitter:<who>	search issue submitter
author:<who>	search by message author
date:yesterday..now	search by issue date
mdate:3m..2d	search by message date