Request for merging "qt-team" branch

  • Done
  • quality assurance status badge
Details
3 participants
  • Christopher Baines
  • Maxim Cournoyer
  • Zheng Junjie
Owner
unassigned
Submitted by
Maxim Cournoyer
Severity
normal
M
M
Maxim Cournoyer wrote on 31 Mar 01:21 +0100
(name . guix-patches)(address . guix-patches@gnu.org)
8734s7z1wk.fsf@gmail.com
Hi,

I've been applying Qt 6.6.2 patches submit by Zheng, I believe for
upcoming upgrades to KDE. It was also needed by Jami, which is upgraded
on the branch as well.

The patches are mostly straightforward upgrades; there are a few new
packages added for Jami and related upgrades, as well as fixes for
gwenview (which was already broken but which Cuirass had me believe was
a new failure :-)).

I've tested Jami, which appears to be more stable than our current
version (no crash thus far), and minus the usual OpenGL artifacts caused
by nouveau (as far as I understand), all looks good.

--
Thanks,
Maxim
C
C
Christopher Baines wrote on 4 Apr 09:39 +0200
(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)
87plv5inkq.fsf@cbaines.net
Maxim Cournoyer <maxim.cournoyer@gmail.com> writes:

Toggle quote (13 lines)
> I've been applying Qt 6.6.2 patches submit by Zheng, I believe for
> upcoming upgrades to KDE. It was also needed by Jami, which is upgraded
> on the branch as well.
>
> The patches are mostly straightforward upgrades; there are a few new
> packages added for Jami and related upgrades, as well as fixes for
> gwenview (which was already broken but which Cuirass had me believe was
> a new failure :-)).
>
> I've tested Jami, which appears to be more stable than our current
> version (no crash thus far), and minus the usual OpenGL artifacts caused
> by nouveau (as far as I understand), all looks good.

Looks like this was pushed to master as
188d18fc47f0d38edfe06e3e5834fa8587bd300b.

Thanks,

Chris
-----BEGIN PGP SIGNATURE-----

iQKlBAEBCgCPFiEEPonu50WOcg2XVOCyXiijOwuE9XcFAmYOWSVfFIAAAAAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF
ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcRHG1haWxAY2Jh
aW5lcy5uZXQACgkQXiijOwuE9XdJOBAAi+jbjAZxCAHf6f8BxDKxjnP4jx618y3g
n/oVEmNZQMkgxS9WSmuUsXVJegcqlq+VldYibS+LsfixghwYRpj8qGV30KY8sS2I
4aGvI4ZJTu4B3BnLEhgulokPG46CWoD1ibg6w73tUBJmdok42tyNX960Dev4hcLQ
gXea97SYMGXvCRjaZcp9yw/kTz+yor1hygp8ezGTvAfWm2TXLjGDFFuHQHf/qosU
+5MMPQB9wjg489/cKlE/+1QAu3lShvC1pyLDeEHnr1TFVywMO60Acm8AOc+8bKMr
E2HLvHP8jYKITIuux/BTjToc1602YRWwn7m71g5bh/E/2gU16Jisu2MV7DFN7jnl
XpSvac9JGtUWpb/Bl0pR3XkZmBCJfqG23RlFNexNSa4Oh7IpbuQYVSwhR27d09VV
JghrqOaq0m9lW+O5JG6sKJHOfxhDWFnsqQibgQt7jtILVAOXfnrCjYlJGVOfR+hQ
zTX24wFYba8YghkqUraNVYJp11OUXyI6tyWM3d5hIPVqWymC3Be3IERfiaAzHULm
tcyu2iElAzG1mwluzEmvW7j0E31w8zsvdY9W0VHSjIqiD4x/6OHeIIAKJG6C4/va
nLPr9EUqRSmAOexPtFx1Ot705FgtwqntVihhCKOTqh+hb/unBnXzZXzQUEGFt8o0
JtYDA99EqDg=
=/FV4
-----END PGP SIGNATURE-----

Closed
Z
Z
Zheng Junjie wrote on 6 Apr 04:27 +0200
(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)
871q7jjk2v.fsf@iscas.ac.cn
Maxim Cournoyer <maxim.cournoyer@gmail.com> writes:

Toggle quote (16 lines)
> Hi,
>
> I've been applying Qt 6.6.2 patches submit by Zheng, I believe for
> upcoming upgrades to KDE. It was also needed by Jami, which is upgraded
> on the branch as well.
>
> The patches are mostly straightforward upgrades; there are a few new
> packages added for Jami and related upgrades, as well as fixes for
> gwenview (which was already broken but which Cuirass had me believe was
> a new failure :-)).
>
> I've tested Jami, which appears to be more stable than our current
> version (no crash thus far), and minus the usual OpenGL artifacts caused
> by nouveau (as far as I understand), all looks good.


look like
have a error.
From d087c9f89cb42878185a3041bde84ec95a8a996c Mon Sep 17 00:00:00 2001
Message-ID: <d087c9f89cb42878185a3041bde84ec95a8a996c.1712369943.git.zhengjunjie@iscas.ac.cn>
From: Zheng Junjie <zhengjunjie@iscas.ac.cn>
Date: Sat, 6 Apr 2024 10:12:21 +0800
Subject: [PATCH] build: qt-utils: Use QML_IMPORT_PATH for Qt 6.

This follow a499d1772df63784e7df1767e58ca1dd5a4b1124.

* guix/build/qt-utils.scm (variables-for-wrapping): Use QML_IMPORT_PATH
instead of QML2_IMPORT_PATH when the major version is greater or equal to 6.

Change-Id: I2dd1d426aef117105708cc4004078deaa28c15cd
---
guix/build/qt-utils.scm | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

Toggle diff (28 lines)
diff --git a/guix/build/qt-utils.scm b/guix/build/qt-utils.scm
index 8962c0edb8..d7609b9f21 100644
--- a/guix/build/qt-utils.scm
+++ b/guix/build/qt-utils.scm
@@ -5,6 +5,7 @@
;;; Copyright © 2021 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2021, 2022, 2023, 2024 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2021 Brendan Tildesley <mail@brendan.scot>
+;;; Copyright © 2024 Zheng Junjie <873216071@qq.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -89,7 +90,7 @@ (define* (variables-for-wrapping base-directories output-directory
'("XDG_CONFIG_DIRS" suffix directory "/etc/xdg")
`("QT_PLUGIN_PATH" prefix directory
,(format #f "/lib/qt~a/plugins" qt-major-version))
- `(,(if (>= 6 (string->number qt-major-version))
+ `(,(if (>= (string->number qt-major-version) 6)
"QML_IMPORT_PATH"
"QML2_IMPORT_PATH")
prefix directory ,(format #f "/lib/qt~a/qml" qt-major-version))

base-commit: 6844a31733c9b5bf05196ba9742c325dbf3fe916
prerequisite-patch-id: 6183d199c58355eea1a85e1f1fe51f2f5fe44f65
prerequisite-patch-id: 01393e9870809c723a878e1ea7d3e15e3bfff267
prerequisite-patch-id: d93572d1797da3325ef119cac412c2dd6f12c136
--
2.41.0
-----BEGIN PGP SIGNATURE-----

iQIzBAEBCgAdFiEEfr6klGDOXiwIdX/bO1qpk+Gi3/AFAmYQtJgACgkQO1qpk+Gi
3/CgwRAAnpKPlNiUToSUlLzR5VUxSl9im7QSY+DFsdfj3ei8X4kLKTrYuF6pAJTC
0OuZzhC+pTp3DKsmFS7S1p7IBqbkyiHCCT8JQ6uAhvTLmEpDsHHxC3p/ZZz4l8Th
R+q/uTNneP6XDmABPOU3mmX/8vwnf2+Mbm921Jf9tCQiJD40k0LNtySlubVEGgH+
zROYuvrQQbI0NLEsOjFhvuTTLhP97gVpLNFSIDe+TBD9o9/ms5vDOnrLWgBmG3h6
EooLPCx0V39mHflmotnczAJPsTz+Liv+MHnvoOCCpeHyiKsgDwFl/wH/GddyMW6Q
n8N4ZkJjzEfD8NNEWXrWEfXie/7m315ZgRIz5kj+/kvgdK+LwHUpOS8ei63CSuxr
So6DghdIXoviTKGc0LqMNLxzqBnKebwjtCfOqn8iaSJ8LTVCRIxDLBxLTV45gQcu
HipOO/QiqBCC6rO2FcIX6aHqm6yImvUu3WG5vbwyiQ1gQSpy6UZtdQtfPlohXmnC
2bCYYOGl+eKhSxTOTna2SVxFJq8O1GDwQThPTuIO733BkLI8cs4Kl/GgsISbg5WU
M+xXVyRiWgAe/qKhd8kVjnZa0bhGPvWC5Es8nzHYDW8kt3XoPQPzMfxSqscfVLs+
+PVNZ2RRIo37e+p9QODc/FafS0RyqL8I+1Y9wCDGSeZ8vkxy04s=
=sT/X
-----END PGP SIGNATURE-----

M
M
Maxim Cournoyer wrote on 6 Apr 17:46 +0200
(name . Zheng Junjie)(address . zhengjunjie@iscas.ac.cn)
87a5m6try0.fsf@gmail.com
Hi Zheng,

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

[...]

Toggle quote (22 lines)
> diff --git a/guix/build/qt-utils.scm b/guix/build/qt-utils.scm
> index 8962c0edb8..d7609b9f21 100644
> --- a/guix/build/qt-utils.scm
> +++ b/guix/build/qt-utils.scm
> @@ -5,6 +5,7 @@
> ;;; Copyright © 2021 Ludovic Courtès <ludo@gnu.org>
> ;;; Copyright © 2021, 2022, 2023, 2024 Maxim Cournoyer <maxim.cournoyer@gmail.com>
> ;;; Copyright © 2021 Brendan Tildesley <mail@brendan.scot>
> +;;; Copyright © 2024 Zheng Junjie <873216071@qq.com>
> ;;;
> ;;; This file is part of GNU Guix.
> ;;;
> @@ -89,7 +90,7 @@ (define* (variables-for-wrapping base-directories output-directory
> '("XDG_CONFIG_DIRS" suffix directory "/etc/xdg")
> `("QT_PLUGIN_PATH" prefix directory
> ,(format #f "/lib/qt~a/plugins" qt-major-version))
> - `(,(if (>= 6 (string->number qt-major-version))
> + `(,(if (>= (string->number qt-major-version) 6)
> "QML_IMPORT_PATH"
> "QML2_IMPORT_PATH")
> prefix directory ,(format #f "/lib/qt~a/qml" qt-major-version))

How embarrassing :-). Thanks for the quick fix. I'll apply it shortly.

--
Thanks,
Maxim
Closed
?
Your comment

This issue is archived.

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

To respond to this issue using the mumi CLI, first switch to it
mumi current 70096
Then, you may apply the latest patchset in this issue (with sign off)
mumi am -- -s
Or, compose a reply to this issue
mumi compose
Or, send patches to this issue
mumi send-email *.patch