From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
To: Zheng Junjie <zhengjunjie@iscas.ac.cn>
Cc: 宋文武 <iyzsong@member.fsf.org>, 70096-done@debbugs.gnu.org
Subject: [bug#70096] Request for merging "qt-team" branch
Date: Sat, 06 Apr 2024 11:46:15 -0400 [thread overview]
Message-ID: <87a5m6try0.fsf@gmail.com> (raw)
In-Reply-To: <871q7jjk2v.fsf@iscas.ac.cn> (Zheng Junjie's message of "Sat, 06 Apr 2024 10:27:47 +0800")
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
prev parent reply other threads:[~2024-04-06 15:47 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
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 [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87a5m6try0.fsf@gmail.com \
--to=maxim.cournoyer@gmail.com \
--cc=70096-done@debbugs.gnu.org \
--cc=iyzsong@member.fsf.org \
--cc=zhengjunjie@iscas.ac.cn \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).