* [bug#65280] [PATCH 01/26] gnu: qt: Revert to use individual versions instead of %qt5-version.
[not found] <cover.1691987375.git.maxim.cournoyer@gmail.com>
@ 2023-08-14 4:29 ` Maxim Cournoyer
2023-08-17 10:51 ` Andreas Enge
2023-08-14 4:29 ` [bug#65280] [PATCH 02/26] gnu: qtdeclarative: Disable QML cache to avoid stale cache issues Maxim Cournoyer
` (24 subsequent siblings)
25 siblings, 1 reply; 28+ messages in thread
From: Maxim Cournoyer @ 2023-08-14 4:29 UTC (permalink / raw)
To: 65280
Cc: Maxim Cournoyer, Andreas Enge, Maxim Cournoyer,
宋文武
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(-)
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
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [bug#65280] [PATCH 02/26] gnu: qtdeclarative: Disable QML cache to avoid stale cache issues.
[not found] <cover.1691987375.git.maxim.cournoyer@gmail.com>
2023-08-14 4:29 ` [bug#65280] [PATCH 01/26] gnu: qt: Revert to use individual versions instead of %qt5-version Maxim Cournoyer
@ 2023-08-14 4:29 ` Maxim Cournoyer
2023-08-14 4:29 ` [bug#65280] [PATCH 03/26] etc: Add Qt manifests for Qt maintenance Maxim Cournoyer
` (23 subsequent siblings)
25 siblings, 0 replies; 28+ messages in thread
From: Maxim Cournoyer @ 2023-08-14 4:29 UTC (permalink / raw)
To: 65280
Cc: Maxim Cournoyer, Distopico Vegan, Andreas Enge, Maxim Cournoyer,
宋文武
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
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
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [bug#65280] [PATCH 03/26] etc: Add Qt manifests for Qt maintenance.
[not found] <cover.1691987375.git.maxim.cournoyer@gmail.com>
2023-08-14 4:29 ` [bug#65280] [PATCH 01/26] gnu: qt: Revert to use individual versions instead of %qt5-version Maxim Cournoyer
2023-08-14 4:29 ` [bug#65280] [PATCH 02/26] gnu: qtdeclarative: Disable QML cache to avoid stale cache issues Maxim Cournoyer
@ 2023-08-14 4:29 ` Maxim Cournoyer
2023-08-14 4:29 ` [bug#65280] [PATCH 04/26] gnu: qtbase: Update to 6.5.2 Maxim Cournoyer
` (22 subsequent siblings)
25 siblings, 0 replies; 28+ messages in thread
From: Maxim Cournoyer @ 2023-08-14 4:29 UTC (permalink / raw)
To: 65280; +Cc: Maxim Cournoyer
* 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
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
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [bug#65280] [PATCH 04/26] gnu: qtbase: Update to 6.5.2.
[not found] <cover.1691987375.git.maxim.cournoyer@gmail.com>
` (2 preceding siblings ...)
2023-08-14 4:29 ` [bug#65280] [PATCH 03/26] etc: Add Qt manifests for Qt maintenance Maxim Cournoyer
@ 2023-08-14 4:29 ` Maxim Cournoyer
2023-08-14 4:29 ` [bug#65280] [PATCH 05/26] gnu: qtbase: Enable zstd support Maxim Cournoyer
` (21 subsequent siblings)
25 siblings, 0 replies; 28+ messages in thread
From: Maxim Cournoyer @ 2023-08-14 4:29 UTC (permalink / raw)
To: 65280
Cc: Maxim Cournoyer, Andreas Enge, Maxim Cournoyer,
宋文武
* 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(-)
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
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [bug#65280] [PATCH 05/26] gnu: qtbase: Enable zstd support.
[not found] <cover.1691987375.git.maxim.cournoyer@gmail.com>
` (3 preceding siblings ...)
2023-08-14 4:29 ` [bug#65280] [PATCH 04/26] gnu: qtbase: Update to 6.5.2 Maxim Cournoyer
@ 2023-08-14 4:29 ` Maxim Cournoyer
2023-08-14 4:29 ` [bug#65280] [PATCH 06/26] gnu: qt5compat: Update to 6.5.2 Maxim Cournoyer
` (20 subsequent siblings)
25 siblings, 0 replies; 28+ messages in thread
From: Maxim Cournoyer @ 2023-08-14 4:29 UTC (permalink / raw)
To: 65280
Cc: Maxim Cournoyer, Andreas Enge, Maxim Cournoyer,
宋文武
* gnu/packages/qt.scm (qtbase) [inputs]: Add zstd:lib.
---
gnu/packages/qt.scm | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
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
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [bug#65280] [PATCH 06/26] gnu: qt5compat: Update to 6.5.2.
[not found] <cover.1691987375.git.maxim.cournoyer@gmail.com>
` (4 preceding siblings ...)
2023-08-14 4:29 ` [bug#65280] [PATCH 05/26] gnu: qtbase: Enable zstd support Maxim Cournoyer
@ 2023-08-14 4:29 ` Maxim Cournoyer
2023-08-14 4:29 ` [bug#65280] [PATCH 07/26] gnu: qtsvg: " Maxim Cournoyer
` (19 subsequent siblings)
25 siblings, 0 replies; 28+ messages in thread
From: Maxim Cournoyer @ 2023-08-14 4:29 UTC (permalink / raw)
To: 65280
Cc: Maxim Cournoyer, Andreas Enge, Maxim Cournoyer,
宋文武
* gnu/packages/qt.scm (qt5compat): Update to 6.5.2.
---
gnu/packages/qt.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 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
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [bug#65280] [PATCH 07/26] gnu: qtsvg: Update to 6.5.2.
[not found] <cover.1691987375.git.maxim.cournoyer@gmail.com>
` (5 preceding siblings ...)
2023-08-14 4:29 ` [bug#65280] [PATCH 06/26] gnu: qt5compat: Update to 6.5.2 Maxim Cournoyer
@ 2023-08-14 4:29 ` Maxim Cournoyer
2023-08-14 4:29 ` [bug#65280] [PATCH 08/26] gnu: qtimageformats: Rename variable to qtimageformats-5 Maxim Cournoyer
` (18 subsequent siblings)
25 siblings, 0 replies; 28+ messages in thread
From: Maxim Cournoyer @ 2023-08-14 4:29 UTC (permalink / raw)
To: 65280
Cc: Maxim Cournoyer, Andreas Enge, Maxim Cournoyer,
宋文武
* gnu/packages/qt.scm (qtsvg): Update to 6.5.2.
---
gnu/packages/qt.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 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
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [bug#65280] [PATCH 08/26] gnu: qtimageformats: Rename variable to qtimageformats-5.
[not found] <cover.1691987375.git.maxim.cournoyer@gmail.com>
` (6 preceding siblings ...)
2023-08-14 4:29 ` [bug#65280] [PATCH 07/26] gnu: qtsvg: " Maxim Cournoyer
@ 2023-08-14 4:29 ` Maxim Cournoyer
2023-08-14 4:29 ` [bug#65280] [PATCH 09/26] gnu: qtimageformats-5: Fix indentation Maxim Cournoyer
` (17 subsequent siblings)
25 siblings, 0 replies; 28+ messages in thread
From: Maxim Cournoyer @ 2023-08-14 4:29 UTC (permalink / raw)
To: 65280
Cc: Maxim Cournoyer, Andreas Enge, Efraim Flashner, Eric Bavier,
Maxim Cournoyer, 宋文武
* 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(-)
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
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [bug#65280] [PATCH 09/26] gnu: qtimageformats-5: Fix indentation.
[not found] <cover.1691987375.git.maxim.cournoyer@gmail.com>
` (7 preceding siblings ...)
2023-08-14 4:29 ` [bug#65280] [PATCH 08/26] gnu: qtimageformats: Rename variable to qtimageformats-5 Maxim Cournoyer
@ 2023-08-14 4:29 ` Maxim Cournoyer
2023-08-14 4:29 ` [bug#65280] [PATCH 10/26] gnu: Add qtimageformats Maxim Cournoyer
` (16 subsequent siblings)
25 siblings, 0 replies; 28+ messages in thread
From: Maxim Cournoyer @ 2023-08-14 4:29 UTC (permalink / raw)
To: 65280
Cc: Maxim Cournoyer, Andreas Enge, Maxim Cournoyer,
宋文武
* gnu/packages/qt.scm (qtimageformats-5): Fix indentation.
---
gnu/packages/qt.scm | 21 +++++++++++----------
1 file changed, 11 insertions(+), 10 deletions(-)
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
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [bug#65280] [PATCH 10/26] gnu: Add qtimageformats.
[not found] <cover.1691987375.git.maxim.cournoyer@gmail.com>
` (8 preceding siblings ...)
2023-08-14 4:29 ` [bug#65280] [PATCH 09/26] gnu: qtimageformats-5: Fix indentation Maxim Cournoyer
@ 2023-08-14 4:29 ` Maxim Cournoyer
2023-08-14 4:29 ` [bug#65280] [PATCH 11/26] gnu: Add qtlanguageserver Maxim Cournoyer
` (15 subsequent siblings)
25 siblings, 0 replies; 28+ messages in thread
From: Maxim Cournoyer @ 2023-08-14 4:29 UTC (permalink / raw)
To: 65280
Cc: Maxim Cournoyer, Andreas Enge, Maxim Cournoyer,
宋文武
* gnu/packages/qt.scm (qtimageformats): New variable.
---
gnu/packages/qt.scm | 34 ++++++++++++++++++++++++++++++++++
1 file changed, 34 insertions(+)
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
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [bug#65280] [PATCH 11/26] gnu: Add qtlanguageserver.
[not found] <cover.1691987375.git.maxim.cournoyer@gmail.com>
` (9 preceding siblings ...)
2023-08-14 4:29 ` [bug#65280] [PATCH 10/26] gnu: Add qtimageformats Maxim Cournoyer
@ 2023-08-14 4:29 ` Maxim Cournoyer
2023-08-14 4:29 ` [bug#65280] [PATCH 12/26] gnu: qtdeclarative: Update to 6.5.2 Maxim Cournoyer
` (14 subsequent siblings)
25 siblings, 0 replies; 28+ messages in thread
From: Maxim Cournoyer @ 2023-08-14 4:29 UTC (permalink / raw)
To: 65280
Cc: Maxim Cournoyer, Andreas Enge, Maxim Cournoyer,
宋文武
* gnu/packages/qt.scm (qtlanguageserver): New variable.
---
gnu/packages/qt.scm | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
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
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [bug#65280] [PATCH 12/26] gnu: qtdeclarative: Update to 6.5.2.
[not found] <cover.1691987375.git.maxim.cournoyer@gmail.com>
` (10 preceding siblings ...)
2023-08-14 4:29 ` [bug#65280] [PATCH 11/26] gnu: Add qtlanguageserver Maxim Cournoyer
@ 2023-08-14 4:29 ` Maxim Cournoyer
2023-08-14 4:29 ` [bug#65280] [PATCH 13/26] gnu: qtwebsockets: " Maxim Cournoyer
` (13 subsequent siblings)
25 siblings, 0 replies; 28+ messages in thread
From: Maxim Cournoyer @ 2023-08-14 4:29 UTC (permalink / raw)
To: 65280
Cc: Maxim Cournoyer, Andreas Enge, Maxim Cournoyer,
宋文武
* 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(-)
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
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [bug#65280] [PATCH 13/26] gnu: qtwebsockets: Update to 6.5.2.
[not found] <cover.1691987375.git.maxim.cournoyer@gmail.com>
` (11 preceding siblings ...)
2023-08-14 4:29 ` [bug#65280] [PATCH 12/26] gnu: qtdeclarative: Update to 6.5.2 Maxim Cournoyer
@ 2023-08-14 4:29 ` Maxim Cournoyer
2023-08-14 4:29 ` [bug#65280] [PATCH 14/26] gnu: qtshadertools: " Maxim Cournoyer
` (12 subsequent siblings)
25 siblings, 0 replies; 28+ messages in thread
From: Maxim Cournoyer @ 2023-08-14 4:29 UTC (permalink / raw)
To: 65280
Cc: Maxim Cournoyer, Andreas Enge, Maxim Cournoyer,
宋文武
* gnu/packages/qt.scm (qtwebsockets): Update to 6.5.2.
---
gnu/packages/qt.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 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
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [bug#65280] [PATCH 14/26] gnu: qtshadertools: Update to 6.5.2.
[not found] <cover.1691987375.git.maxim.cournoyer@gmail.com>
` (12 preceding siblings ...)
2023-08-14 4:29 ` [bug#65280] [PATCH 13/26] gnu: qtwebsockets: " Maxim Cournoyer
@ 2023-08-14 4:29 ` Maxim Cournoyer
2023-08-14 4:29 ` [bug#65280] [PATCH 15/26] gnu: qtmultimedia: " Maxim Cournoyer
` (11 subsequent siblings)
25 siblings, 0 replies; 28+ messages in thread
From: Maxim Cournoyer @ 2023-08-14 4:29 UTC (permalink / raw)
To: 65280
Cc: Maxim Cournoyer, Andreas Enge, Maxim Cournoyer,
宋文武
* gnu/packages/qt.scm (qtshadertools): Update to 6.5.2.
---
gnu/packages/qt.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 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
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [bug#65280] [PATCH 15/26] gnu: qtmultimedia: Update to 6.5.2.
[not found] <cover.1691987375.git.maxim.cournoyer@gmail.com>
` (13 preceding siblings ...)
2023-08-14 4:29 ` [bug#65280] [PATCH 14/26] gnu: qtshadertools: " Maxim Cournoyer
@ 2023-08-14 4:29 ` Maxim Cournoyer
2023-08-14 4:29 ` [bug#65280] [PATCH 16/26] gnu: qtwayland: " Maxim Cournoyer
` (10 subsequent siblings)
25 siblings, 0 replies; 28+ messages in thread
From: Maxim Cournoyer @ 2023-08-14 4:29 UTC (permalink / raw)
To: 65280
Cc: Maxim Cournoyer, Andreas Enge, Maxim Cournoyer,
宋文武
* gnu/packages/qt.scm (qtmultimedia): Update to 6.5.2.
---
gnu/packages/qt.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 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
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [bug#65280] [PATCH 16/26] gnu: qtwayland: Update to 6.5.2.
[not found] <cover.1691987375.git.maxim.cournoyer@gmail.com>
` (14 preceding siblings ...)
2023-08-14 4:29 ` [bug#65280] [PATCH 15/26] gnu: qtmultimedia: " Maxim Cournoyer
@ 2023-08-14 4:29 ` Maxim Cournoyer
2023-08-14 4:29 ` [bug#65280] [PATCH 17/26] gnu: qtwebchannel: " Maxim Cournoyer
` (9 subsequent siblings)
25 siblings, 0 replies; 28+ messages in thread
From: Maxim Cournoyer @ 2023-08-14 4:29 UTC (permalink / raw)
To: 65280
Cc: Maxim Cournoyer, Andreas Enge, Maxim Cournoyer,
宋文武
* gnu/packages/qt.scm (qtwayland): Update to 6.5.2.
---
gnu/packages/qt.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 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
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [bug#65280] [PATCH 17/26] gnu: qtwebchannel: Update to 6.5.2.
[not found] <cover.1691987375.git.maxim.cournoyer@gmail.com>
` (15 preceding siblings ...)
2023-08-14 4:29 ` [bug#65280] [PATCH 16/26] gnu: qtwayland: " Maxim Cournoyer
@ 2023-08-14 4:29 ` Maxim Cournoyer
2023-08-14 4:29 ` [bug#65280] [PATCH 18/26] gnu: qtlottie: " Maxim Cournoyer
` (8 subsequent siblings)
25 siblings, 0 replies; 28+ messages in thread
From: Maxim Cournoyer @ 2023-08-14 4:29 UTC (permalink / raw)
To: 65280
Cc: Maxim Cournoyer, Andreas Enge, Maxim Cournoyer,
宋文武
* gnu/packages/qt.scm (qtwebchannel): Update to 6.5.2.
---
gnu/packages/qt.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 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
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [bug#65280] [PATCH 18/26] gnu: qtlottie: Update to 6.5.2.
[not found] <cover.1691987375.git.maxim.cournoyer@gmail.com>
` (16 preceding siblings ...)
2023-08-14 4:29 ` [bug#65280] [PATCH 17/26] gnu: qtwebchannel: " Maxim Cournoyer
@ 2023-08-14 4:29 ` Maxim Cournoyer
2023-08-14 4:29 ` [bug#65280] [PATCH 19/26] gnu: qttools: " Maxim Cournoyer
` (7 subsequent siblings)
25 siblings, 0 replies; 28+ messages in thread
From: Maxim Cournoyer @ 2023-08-14 4:29 UTC (permalink / raw)
To: 65280
Cc: Maxim Cournoyer, Andreas Enge, Maxim Cournoyer,
宋文武
* gnu/packages/qt.scm (qtlottie): Update to 6.5.2.
---
gnu/packages/qt.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 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
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [bug#65280] [PATCH 19/26] gnu: qttools: Update to 6.5.2.
[not found] <cover.1691987375.git.maxim.cournoyer@gmail.com>
` (17 preceding siblings ...)
2023-08-14 4:29 ` [bug#65280] [PATCH 18/26] gnu: qtlottie: " Maxim Cournoyer
@ 2023-08-14 4:29 ` Maxim Cournoyer
2023-08-14 4:29 ` [bug#65280] [PATCH 20/26] gnu: qttranslations: " Maxim Cournoyer
` (6 subsequent siblings)
25 siblings, 0 replies; 28+ messages in thread
From: Maxim Cournoyer @ 2023-08-14 4:29 UTC (permalink / raw)
To: 65280
Cc: Maxim Cournoyer, Andreas Enge, Maxim Cournoyer,
宋文武
* gnu/packages/qt.scm (qttools): Update to 6.5.2.
---
gnu/packages/qt.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 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
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [bug#65280] [PATCH 20/26] gnu: qttranslations: Update to 6.5.2.
[not found] <cover.1691987375.git.maxim.cournoyer@gmail.com>
` (18 preceding siblings ...)
2023-08-14 4:29 ` [bug#65280] [PATCH 19/26] gnu: qttools: " Maxim Cournoyer
@ 2023-08-14 4:29 ` Maxim Cournoyer
2023-08-14 4:29 ` [bug#65280] [PATCH 21/26] gnu: qtpositioning: " Maxim Cournoyer
` (5 subsequent siblings)
25 siblings, 0 replies; 28+ messages in thread
From: Maxim Cournoyer @ 2023-08-14 4:29 UTC (permalink / raw)
To: 65280
Cc: Maxim Cournoyer, Andreas Enge, Maxim Cournoyer,
宋文武
* gnu/packages/qt.scm (qttranslations): Update to 6.5.2.
---
gnu/packages/qt.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 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
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [bug#65280] [PATCH 21/26] gnu: qtpositioning: Update to 6.5.2.
[not found] <cover.1691987375.git.maxim.cournoyer@gmail.com>
` (19 preceding siblings ...)
2023-08-14 4:29 ` [bug#65280] [PATCH 20/26] gnu: qttranslations: " Maxim Cournoyer
@ 2023-08-14 4:29 ` Maxim Cournoyer
2023-08-14 4:29 ` [bug#65280] [PATCH 22/26] gnu: qtnetworkauth: " Maxim Cournoyer
` (4 subsequent siblings)
25 siblings, 0 replies; 28+ messages in thread
From: Maxim Cournoyer @ 2023-08-14 4:29 UTC (permalink / raw)
To: 65280
Cc: Maxim Cournoyer, Andreas Enge, Maxim Cournoyer,
宋文武
* gnu/packages/qt.scm (qtpositioning): Update to 6.5.2.
---
gnu/packages/qt.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 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
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [bug#65280] [PATCH 22/26] gnu: qtnetworkauth: Update to 6.5.2.
[not found] <cover.1691987375.git.maxim.cournoyer@gmail.com>
` (20 preceding siblings ...)
2023-08-14 4:29 ` [bug#65280] [PATCH 21/26] gnu: qtpositioning: " Maxim Cournoyer
@ 2023-08-14 4:29 ` Maxim Cournoyer
2023-08-14 4:29 ` [bug#65280] [PATCH 23/26] gnu: qtremoteobjects: " Maxim Cournoyer
` (3 subsequent siblings)
25 siblings, 0 replies; 28+ messages in thread
From: Maxim Cournoyer @ 2023-08-14 4:29 UTC (permalink / raw)
To: 65280
Cc: Maxim Cournoyer, Andreas Enge, Maxim Cournoyer,
宋文武
* gnu/packages/qt.scm (qtnetworkauth): Update to 6.5.2.
---
gnu/packages/qt.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 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
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [bug#65280] [PATCH 23/26] gnu: qtremoteobjects: Update to 6.5.2.
[not found] <cover.1691987375.git.maxim.cournoyer@gmail.com>
` (21 preceding siblings ...)
2023-08-14 4:29 ` [bug#65280] [PATCH 22/26] gnu: qtnetworkauth: " Maxim Cournoyer
@ 2023-08-14 4:29 ` Maxim Cournoyer
2023-08-14 4:29 ` [bug#65280] [PATCH 24/26] gnu: qtwebengine: " Maxim Cournoyer
` (2 subsequent siblings)
25 siblings, 0 replies; 28+ messages in thread
From: Maxim Cournoyer @ 2023-08-14 4:29 UTC (permalink / raw)
To: 65280
Cc: Maxim Cournoyer, Andreas Enge, Maxim Cournoyer,
宋文武
* gnu/packages/qt.scm (qtremoteobjects): Update to 6.5.2.
---
gnu/packages/qt.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 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
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [bug#65280] [PATCH 24/26] gnu: qtwebengine: Update to 6.5.2.
[not found] <cover.1691987375.git.maxim.cournoyer@gmail.com>
` (22 preceding siblings ...)
2023-08-14 4:29 ` [bug#65280] [PATCH 23/26] gnu: qtremoteobjects: " Maxim Cournoyer
@ 2023-08-14 4:29 ` Maxim Cournoyer
2023-08-14 4:29 ` [bug#65280] [PATCH 25/26] gnu: Remove qtquickcontrols2 Maxim Cournoyer
2023-08-14 4:29 ` [bug#65280] [PATCH 26/26] gnu: qt-creator: Update to 11.0.1 Maxim Cournoyer
25 siblings, 0 replies; 28+ messages in thread
From: Maxim Cournoyer @ 2023-08-14 4:29 UTC (permalink / raw)
To: 65280
Cc: Maxim Cournoyer, Andreas Enge, Maxim Cournoyer,
宋文武
* gnu/packages/qt.scm (qtwebengine): Update to 6.5.2.
---
gnu/packages/qt.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 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
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [bug#65280] [PATCH 25/26] gnu: Remove qtquickcontrols2.
[not found] <cover.1691987375.git.maxim.cournoyer@gmail.com>
` (23 preceding siblings ...)
2023-08-14 4:29 ` [bug#65280] [PATCH 24/26] gnu: qtwebengine: " Maxim Cournoyer
@ 2023-08-14 4:29 ` Maxim Cournoyer
2023-08-14 4:29 ` [bug#65280] [PATCH 26/26] gnu: qt-creator: Update to 11.0.1 Maxim Cournoyer
25 siblings, 0 replies; 28+ messages in thread
From: Maxim Cournoyer @ 2023-08-14 4:29 UTC (permalink / raw)
To: 65280
Cc: Maxim Cournoyer, Andreas Enge, Maxim Cournoyer,
宋文武
* gnu/packages/qt.scm (qtquickcontrols2): Delete variable.
(pyotherside) [inputs]: Remove qtquickcontrols2.
---
gnu/packages/qt.scm | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
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
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [bug#65280] [PATCH 26/26] gnu: qt-creator: Update to 11.0.1.
[not found] <cover.1691987375.git.maxim.cournoyer@gmail.com>
` (24 preceding siblings ...)
2023-08-14 4:29 ` [bug#65280] [PATCH 25/26] gnu: Remove qtquickcontrols2 Maxim Cournoyer
@ 2023-08-14 4:29 ` Maxim Cournoyer
25 siblings, 0 replies; 28+ messages in thread
From: Maxim Cournoyer @ 2023-08-14 4:29 UTC (permalink / raw)
To: 65280
Cc: Maxim Cournoyer, Andreas Enge, Maxim Cournoyer,
宋文武
* 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(-)
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
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [bug#65280] [PATCH 01/26] gnu: qt: Revert to use individual versions instead of %qt5-version.
2023-08-14 4:29 ` [bug#65280] [PATCH 01/26] gnu: qt: Revert to use individual versions instead of %qt5-version Maxim Cournoyer
@ 2023-08-17 10:51 ` Andreas Enge
2023-08-17 13:45 ` Maxim Cournoyer
0 siblings, 1 reply; 28+ messages in thread
From: Andreas Enge @ 2023-08-17 10:51 UTC (permalink / raw)
To: Maxim Cournoyer; +Cc: 65280, 宋文武
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.
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
^ permalink raw reply [flat|nested] 28+ messages in thread
* [bug#65280] [PATCH 01/26] gnu: qt: Revert to use individual versions instead of %qt5-version.
2023-08-17 10:51 ` Andreas Enge
@ 2023-08-17 13:45 ` Maxim Cournoyer
0 siblings, 0 replies; 28+ messages in thread
From: Maxim Cournoyer @ 2023-08-17 13:45 UTC (permalink / raw)
To: Andreas Enge; +Cc: 65280, 宋文武
Hi Andreas!
Andreas Enge <andreas@enge.fr> writes:
> 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
^ permalink raw reply [flat|nested] 28+ messages in thread
end of thread, other threads:[~2023-08-17 13:46 UTC | newest]
Thread overview: 28+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
[not found] <cover.1691987375.git.maxim.cournoyer@gmail.com>
2023-08-14 4:29 ` [bug#65280] [PATCH 01/26] gnu: qt: Revert to use individual versions instead of %qt5-version Maxim Cournoyer
2023-08-17 10:51 ` Andreas Enge
2023-08-17 13:45 ` Maxim Cournoyer
2023-08-14 4:29 ` [bug#65280] [PATCH 02/26] gnu: qtdeclarative: Disable QML cache to avoid stale cache issues Maxim Cournoyer
2023-08-14 4:29 ` [bug#65280] [PATCH 03/26] etc: Add Qt manifests for Qt maintenance Maxim Cournoyer
2023-08-14 4:29 ` [bug#65280] [PATCH 04/26] gnu: qtbase: Update to 6.5.2 Maxim Cournoyer
2023-08-14 4:29 ` [bug#65280] [PATCH 05/26] gnu: qtbase: Enable zstd support Maxim Cournoyer
2023-08-14 4:29 ` [bug#65280] [PATCH 06/26] gnu: qt5compat: Update to 6.5.2 Maxim Cournoyer
2023-08-14 4:29 ` [bug#65280] [PATCH 07/26] gnu: qtsvg: " Maxim Cournoyer
2023-08-14 4:29 ` [bug#65280] [PATCH 08/26] gnu: qtimageformats: Rename variable to qtimageformats-5 Maxim Cournoyer
2023-08-14 4:29 ` [bug#65280] [PATCH 09/26] gnu: qtimageformats-5: Fix indentation Maxim Cournoyer
2023-08-14 4:29 ` [bug#65280] [PATCH 10/26] gnu: Add qtimageformats Maxim Cournoyer
2023-08-14 4:29 ` [bug#65280] [PATCH 11/26] gnu: Add qtlanguageserver Maxim Cournoyer
2023-08-14 4:29 ` [bug#65280] [PATCH 12/26] gnu: qtdeclarative: Update to 6.5.2 Maxim Cournoyer
2023-08-14 4:29 ` [bug#65280] [PATCH 13/26] gnu: qtwebsockets: " Maxim Cournoyer
2023-08-14 4:29 ` [bug#65280] [PATCH 14/26] gnu: qtshadertools: " Maxim Cournoyer
2023-08-14 4:29 ` [bug#65280] [PATCH 15/26] gnu: qtmultimedia: " Maxim Cournoyer
2023-08-14 4:29 ` [bug#65280] [PATCH 16/26] gnu: qtwayland: " Maxim Cournoyer
2023-08-14 4:29 ` [bug#65280] [PATCH 17/26] gnu: qtwebchannel: " Maxim Cournoyer
2023-08-14 4:29 ` [bug#65280] [PATCH 18/26] gnu: qtlottie: " Maxim Cournoyer
2023-08-14 4:29 ` [bug#65280] [PATCH 19/26] gnu: qttools: " Maxim Cournoyer
2023-08-14 4:29 ` [bug#65280] [PATCH 20/26] gnu: qttranslations: " Maxim Cournoyer
2023-08-14 4:29 ` [bug#65280] [PATCH 21/26] gnu: qtpositioning: " Maxim Cournoyer
2023-08-14 4:29 ` [bug#65280] [PATCH 22/26] gnu: qtnetworkauth: " Maxim Cournoyer
2023-08-14 4:29 ` [bug#65280] [PATCH 23/26] gnu: qtremoteobjects: " Maxim Cournoyer
2023-08-14 4:29 ` [bug#65280] [PATCH 24/26] gnu: qtwebengine: " Maxim Cournoyer
2023-08-14 4:29 ` [bug#65280] [PATCH 25/26] gnu: Remove qtquickcontrols2 Maxim Cournoyer
2023-08-14 4:29 ` [bug#65280] [PATCH 26/26] gnu: qt-creator: Update to 11.0.1 Maxim Cournoyer
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).