* [bug#70096] Request for merging "qt-team" branch
@ 2024-03-31 0:21 Maxim Cournoyer
2024-04-04 7:39 ` bug#70096: " Christopher Baines
2024-04-06 2:27 ` [bug#70096] " Zheng Junjie
0 siblings, 2 replies; 4+ messages in thread
From: Maxim Cournoyer @ 2024-03-31 0:21 UTC (permalink / raw)
To: 70096; +Cc: 宋文武, Zheng Junjie
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
^ permalink raw reply [flat|nested] 4+ messages in thread
* bug#70096: Request for merging "qt-team" branch
2024-03-31 0:21 [bug#70096] Request for merging "qt-team" branch Maxim Cournoyer
@ 2024-04-04 7:39 ` Christopher Baines
2024-04-06 2:27 ` [bug#70096] " Zheng Junjie
1 sibling, 0 replies; 4+ messages in thread
From: Christopher Baines @ 2024-04-04 7:39 UTC (permalink / raw)
To: Maxim Cournoyer; +Cc: 宋文武, Zheng Junjie, 70096-done
[-- Attachment #1: Type: text/plain, Size: 760 bytes --]
Maxim Cournoyer <maxim.cournoyer@gmail.com> writes:
> 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
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 987 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* [bug#70096] Request for merging "qt-team" branch
2024-03-31 0:21 [bug#70096] Request for merging "qt-team" branch Maxim Cournoyer
2024-04-04 7:39 ` bug#70096: " Christopher Baines
@ 2024-04-06 2:27 ` Zheng Junjie
2024-04-06 15:46 ` Maxim Cournoyer
1 sibling, 1 reply; 4+ messages in thread
From: Zheng Junjie @ 2024-04-06 2:27 UTC (permalink / raw)
To: Maxim Cournoyer; +Cc: 宋文武, 70096
[-- Attachment #1.1: Type: text/plain, Size: 792 bytes --]
Maxim Cournoyer <maxim.cournoyer@gmail.com> writes:
> 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
https://git.savannah.gnu.org/cgit/guix.git/commit/?id=a499d1772df63784e7df1767e58ca1dd5a4b1124
have a error.
[-- Attachment #1.2: 0001-build-qt-utils-Use-QML_IMPORT_PATH-for-Qt-6.patch --]
[-- Type: text/x-patch, Size: 1914 bytes --]
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(-)
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
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [bug#70096] Request for merging "qt-team" branch
2024-04-06 2:27 ` [bug#70096] " Zheng Junjie
@ 2024-04-06 15:46 ` Maxim Cournoyer
0 siblings, 0 replies; 4+ messages in thread
From: Maxim Cournoyer @ 2024-04-06 15:46 UTC (permalink / raw)
To: Zheng Junjie; +Cc: 宋文武, 70096-done
Hi Zheng,
Zheng Junjie <zhengjunjie@iscas.ac.cn> writes:
[...]
> 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
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-04-06 15:47 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-03-31 0:21 [bug#70096] Request for merging "qt-team" branch Maxim Cournoyer
2024-04-04 7:39 ` bug#70096: " Christopher Baines
2024-04-06 2:27 ` [bug#70096] " Zheng Junjie
2024-04-06 15:46 ` 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).