From unknown Sun Jun 22 03:58:00 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#70096 <70096@debbugs.gnu.org> To: bug#70096 <70096@debbugs.gnu.org> Subject: Status: Request for merging "qt-team" branch Reply-To: bug#70096 <70096@debbugs.gnu.org> Date: Sun, 22 Jun 2025 10:58:00 +0000 retitle 70096 Request for merging "qt-team" branch reassign 70096 guix-patches submitter 70096 Maxim Cournoyer severity 70096 normal thanks From debbugs-submit-bounces@debbugs.gnu.org Sat Mar 30 20:22:09 2024 Received: (at submit) by debbugs.gnu.org; 31 Mar 2024 00:22:09 +0000 Received: from localhost ([127.0.0.1]:46347 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rqixd-00086z-DK for submit@debbugs.gnu.org; Sat, 30 Mar 2024 20:22:09 -0400 Received: from lists.gnu.org ([2001:470:142::17]:50794) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rqixX-00086I-95 for submit@debbugs.gnu.org; Sat, 30 Mar 2024 20:22:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rqixN-0002i2-Kr for guix-patches@gnu.org; Sat, 30 Mar 2024 20:21:53 -0400 Received: from mail-qv1-xf34.google.com ([2607:f8b0:4864:20::f34]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rqixK-0006oL-PP for guix-patches@gnu.org; Sat, 30 Mar 2024 20:21:52 -0400 Received: by mail-qv1-xf34.google.com with SMTP id 6a1803df08f44-6990014a57bso3070256d6.2 for ; Sat, 30 Mar 2024 17:21:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1711844509; x=1712449309; darn=gnu.org; h=mime-version:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to; bh=/DZLItVMUz5/jSNl6nf+GxNO9nqNzE1ZARBBIzFSQG8=; b=dMHMOvM1LsZF2izm7E+p00g5909PTgM8YCdhdxf+qaGAp7LrIyFdD9gc/yzd1Y1OMz jvdUbz/cFfSscExWxs+X+uY0V7pbr6Nm8mkzZaSOjFD1tEY5/ZKzI5RroaW1ht63CAVx JMPwVGHRt4pLwRSxT7B9Px/sXCN/qx2AxuuVXhNyf/s+2z5C4hYGEGt8vsxr5vP7i9y+ efHD+HWEcBxTF5CUrT8W/XCaaEzOTybWbEuVft8sLYz0ervL2w4BMqYpEoqwybFFVPIO i1OLJdd+uGOSNmMxl6Ww+MxwewHeYKZuwwIXFuXzINHnsH9oksmi92bq8s1u8dWjwYAg eFug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711844509; x=1712449309; h=mime-version:message-id:date:subject:cc:to:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=/DZLItVMUz5/jSNl6nf+GxNO9nqNzE1ZARBBIzFSQG8=; b=Ej6UGWOR/U/v17b5hCyUUoHQPo2J3N+eeTwFhmCvaQSGS59kch4j74S+sbb+OMKMU2 BcqkISqajS1wqfI8raduSxTjV6JS7e5TMTxDc4eddOiungXEiqjAmf3dNl7KN1mJNhFv 7EtYh2ADi6sONb+yw1UKbrPVleVrpve+535eYRLWPipGNHVv8hzGUMSHlSfs+lGRt6JE CHK2Asuj7ZQnSOFaHmSqhcUGp68AW9QWzJOLmhojgjI+0BC5kLIJLhScMXyHqhxDaqc6 /Qbi2G5ni6SB+dJwYvwZ2gywouzTPz2++RcKrtQsA8s/lQAwiI4EOOc3RQtD8aTT9t34 2lBg== X-Gm-Message-State: AOJu0YxeghRPf9xglJBx7yjdx6GFZt6y/sBk9rHND/MsMgsmA2CDMYkl qBD/B/Ms9KZs0FuaoGCkXCYy8jClRJ/GQjHy1FxTid8Q7p89cJ9KgH2RXc2r X-Google-Smtp-Source: AGHT+IH0UaVVw6J/l9g90+pa2v99dFQhHHmFXlHEyPjBXtGgSEncKaxAbWgwJD4hMZpZrR0Sx62hzA== X-Received: by 2002:a0c:c548:0:b0:696:7567:ef74 with SMTP id y8-20020a0cc548000000b006967567ef74mr5967128qvi.27.1711844509374; Sat, 30 Mar 2024 17:21:49 -0700 (PDT) Received: from hurd (dsl-151-182.b2b2c.ca. [66.158.151.182]) by smtp.gmail.com with ESMTPSA id 11-20020a05621420cb00b006986c3f3d21sm3082373qve.116.2024.03.30.17.21.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 30 Mar 2024 17:21:48 -0700 (PDT) From: Maxim Cournoyer To: guix-patches Subject: Request for merging "qt-team" branch Date: Sat, 30 Mar 2024 20:21:47 -0400 Message-ID: <8734s7z1wk.fsf@gmail.com> MIME-Version: 1.0 Content-Type: text/plain Received-SPF: pass client-ip=2607:f8b0:4864:20::f34; envelope-from=maxim.cournoyer@gmail.com; helo=mail-qv1-xf34.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 1.0 (+) X-Debbugs-Envelope-To: submit Cc: =?utf-8?B?5a6L5paH5q2m?= , Zheng Junjie X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.0 (/) 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 From debbugs-submit-bounces@debbugs.gnu.org Thu Apr 04 03:39:29 2024 Received: (at 70096-done) by debbugs.gnu.org; 4 Apr 2024 07:39:29 +0000 Received: from localhost ([127.0.0.1]:60436 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rsHh2-0004Kh-Ny for submit@debbugs.gnu.org; Thu, 04 Apr 2024 03:39:28 -0400 Received: from mira.cbaines.net ([2a01:7e00:e000:2f8:fd4d:b5c7:13fb:3d27]:35749) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rsHh0-0004Jr-9w for 70096-done@debbugs.gnu.org; Thu, 04 Apr 2024 03:39:27 -0400 Received: from localhost (unknown [212.132.255.10]) by mira.cbaines.net (Postfix) with ESMTPSA id B887127BBE2; Thu, 4 Apr 2024 08:39:18 +0100 (BST) Received: from felis (localhost.lan [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id b250c7f5; Thu, 4 Apr 2024 07:39:17 +0000 (UTC) From: Christopher Baines To: Maxim Cournoyer Subject: Re: [bug#70096] Request for merging "qt-team" branch In-Reply-To: <8734s7z1wk.fsf@gmail.com> (Maxim Cournoyer's message of "Sat, 30 Mar 2024 20:21:47 -0400") References: <8734s7z1wk.fsf@gmail.com> User-Agent: mu4e 1.12.2; emacs 29.3 Date: Thu, 04 Apr 2024 08:39:17 +0100 Message-ID: <87plv5inkq.fsf@cbaines.net> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 70096-done Cc: =?utf-8?B?5a6L5paH5q2m?= , Zheng Junjie , 70096-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain Maxim Cournoyer 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 --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----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----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Fri Apr 05 22:34:27 2024 Received: (at 70096) by debbugs.gnu.org; 6 Apr 2024 02:34:27 +0000 Received: from localhost ([127.0.0.1]:37888 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rsvsx-0001X8-7n for submit@debbugs.gnu.org; Fri, 05 Apr 2024 22:34:27 -0400 Received: from smtp81.cstnet.cn ([159.226.251.81]:58086 helo=cstnet.cn) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rsvsr-0001WG-R4 for 70096@debbugs.gnu.org; Fri, 05 Apr 2024 22:34:25 -0400 Received: from m (unknown [111.0.51.68]) by APP-03 (Coremail) with SMTP id rQCowAAXOCWdtBBmPzOyAQ--.15890S2; Sat, 06 Apr 2024 10:34:06 +0800 (CST) References: <8734s7z1wk.fsf@gmail.com> User-agent: mu4e 1.10.8; emacs 30.0.50 From: Zheng Junjie To: Maxim Cournoyer Subject: Re: [bug#70096] Request for merging "qt-team" branch Date: Sat, 06 Apr 2024 10:27:47 +0800 In-reply-to: <8734s7z1wk.fsf@gmail.com> Message-ID: <871q7jjk2v.fsf@iscas.ac.cn> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-CM-TRANSID: rQCowAAXOCWdtBBmPzOyAQ--.15890S2 X-Coremail-Antispam: 1UD129KBjvdXoW7JF4rKFWrKF1kAr4DJrWxXrb_yoW3CwbEgr 45K395Gws7ta18AayYgFWDA3yjvr4DZFyUAa18XrZxGa4rZrZxtrWrCwn3KF45KFWSy3W3 Xry8Ww12q3Z0vjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUb7xYjsxI4VWkKwAYFVCjjxCrM7AC8VAFwI0_Jr0_Gr1l1xkIjI8I 6I8E6xAIw20EY4v20xvaj40_Wr0E3s1l1IIY67AEw4v_Jr0_Jr4l8cAvFVAK0II2c7xJM2 8CjxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVWUJVWUCwA2z4x0Y4vE2Ix0 cI8IcVCY1x0267AKxVWUJVW8JwA2z4x0Y4vEx4A2jsIE14v26F4j6r4UJwA2z4x0Y4vEx4 A2jsIEc7CjxVAFwI0_Gr0_Gr1UM2AIxVAIcxkEcVAq07x20xvEncxIr21le4C267I2x7xF 54xIwI1l5I8CrVACY4xI64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I 8E87Iv67AKxVWUJVW8JwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IY64vIr41l42xK82IY c2Ij64vIr41l4I8I3I0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAqx4xG67AKxVWUJVWUGwC20s 026x8GjcxK67AKxVWUGVWUWwC2zVAF1VAY17CE14v26r1Y6r17MIIYrxkI7VAKI48JMIIF 0xvE2Ix0cI8IcVAFwI0_Jr0_JF4lIxAIcVC0I7IYx2IY6xkF7I0E14v26r1j6r4UMIIF0x vE42xK8VAvwI8IcIk0rVWUJVWUCwCI42IY6I8E87Iv67AKxVWUJVW8JwCI42IY6I8E87Iv 6xkF7I0E14v26r1j6r4UYxBIdaVFxhVjvjDU0xZFpf9x07bOoGdUUUUU= X-Originating-IP: [111.0.51.68] X-CM-SenderInfo: x2kh0wxmxqyx3h6l2u1dvotugofq/ X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 70096 Cc: =?utf-8?B?5a6L5paH5q2m?= , 70096@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain Maxim Cournoyer 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. --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: inline; filename=0001-build-qt-utils-Use-QML_IMPORT_PATH-for-Qt-6.patch Content-Transfer-Encoding: quoted-printable From=20d087c9f89cb42878185a3041bde84ec95a8a996c Mon Sep 17 00:00:00 2001 Message-ID: From: Zheng Junjie 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 =2D-- 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 =2D-- a/guix/build/qt-utils.scm +++ b/guix/build/qt-utils.scm @@ -5,6 +5,7 @@ ;;; Copyright =C2=A9 2021 Ludovic Court=C3=A8s ;;; Copyright =C2=A9 2021, 2022, 2023, 2024 Maxim Cournoyer ;;; Copyright =C2=A9 2021 Brendan Tildesley +;;; Copyright =C2=A9 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)) =2D `(,(if (>=3D 6 (string->number qt-major-version)) + `(,(if (>=3D (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 =2D-=20 2.41.0 --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----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----- --==-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Sat Apr 06 11:46:38 2024 Received: (at 70096-done) by debbugs.gnu.org; 6 Apr 2024 15:46:38 +0000 Received: from localhost ([127.0.0.1]:40645 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rt8FY-0005DX-T1 for submit@debbugs.gnu.org; Sat, 06 Apr 2024 11:46:38 -0400 Received: from mail-pf1-x429.google.com ([2607:f8b0:4864:20::429]:59787) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rt8FS-0005C7-5D for 70096-done@debbugs.gnu.org; Sat, 06 Apr 2024 11:46:35 -0400 Received: by mail-pf1-x429.google.com with SMTP id d2e1a72fcca58-6ece8991654so2780094b3a.3 for <70096-done@debbugs.gnu.org>; Sat, 06 Apr 2024 08:46:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1712418378; x=1713023178; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:user-agent:message-id:date :references:in-reply-to:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=WIzPKVClfg5U0PJ3S9H1NeEvSeFFzHAgU4ZKqCWtOkY=; b=nSSK4oooRlGMQ0If7GIt3s/OZqMcCEDzK+gm2JO1Y8qr3aFdROXOK3Uhu29VSBeDeG hMF5nsMx+SRTD8pl9g0syXhpQ9AZ3Vi/JRv44ht04pMsYlbyDtx+ZrzGW6luIFaHfRhN tXV3uL6jJ6aBr0YAuL3+HjsiNW+cNV0cCZXFK5DrVk7L9N8PKCInSsv2WmmJDLT2qTo5 W1CWq5Ao3rCU82juwHfxytQaFfi13ZONP8zF9pMdPKgxJ1PLVRsbEBGsSDk27JLLR3r9 JeWAJlTklHmqreass71x9US2b14e2Vy9fmBEooaQOM0WE64OmtrUXRi4IFQjax27/lHE kB+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712418378; x=1713023178; h=content-transfer-encoding:mime-version:user-agent:message-id:date :references:in-reply-to:subject:cc:to:from:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=WIzPKVClfg5U0PJ3S9H1NeEvSeFFzHAgU4ZKqCWtOkY=; b=FuP8EqkPjELc37g6Cl6hM2bSNLbF4LpuJwXtLDgnDMLwLT2p29gWwZM6DcKcUKKrTy qMnlsqTZnR+Ma7jpZAM67U7vrZypsO8b9G4qeF/1D8WQia5WjsR7TH4R1jRKpmWpsVKG ODOZ0h+uMkFUFG6SztrVvezvvLJODga8WiEpQeWgRJ8WTT6MJcZnfXtFhWFnL/n0zgFv RYlD5R3aLgVRo0NkaJMHMmgv3SpP+YlpHtjOipoymNppT8yAnWMDmeaNp0lQ+Mk57XqT WXSUllf7SG5yW3IUUUiecTm8f+fIx9pcUHziKRs/I5uOdr2el7GKibPAyxHk/xoiSiHd IgFw== X-Gm-Message-State: AOJu0YwEj04lWTOqIvbwa8+b3eInsPR/aBdCnvDRs3ipJnO9FKpj7Cxt S5MF3UsMWu+S8eYJzIDSNpUZ+DsFiq31JrG6hnofSKCkgORQioy3 X-Google-Smtp-Source: AGHT+IGeoCyrKmPun7uxzTKRct+Fq0wrgLCINONhf0R8MTQ4RcTGbCuR2PcpnAq/KEEJZrfsbwAmiw== X-Received: by 2002:a05:6a20:6f91:b0:1a3:9f87:f389 with SMTP id gv17-20020a056a206f9100b001a39f87f389mr6313091pzb.38.1712418378026; Sat, 06 Apr 2024 08:46:18 -0700 (PDT) Received: from hurd (dsl-154-241.b2b2c.ca. [66.158.154.241]) by smtp.gmail.com with ESMTPSA id p5-20020ad451c5000000b006990499de91sm1528597qvq.51.2024.04.06.08.46.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 06 Apr 2024 08:46:17 -0700 (PDT) From: Maxim Cournoyer To: Zheng Junjie Subject: Re: [bug#70096] Request for merging "qt-team" branch In-Reply-To: <871q7jjk2v.fsf@iscas.ac.cn> (Zheng Junjie's message of "Sat, 06 Apr 2024 10:27:47 +0800") References: <8734s7z1wk.fsf@gmail.com> <871q7jjk2v.fsf@iscas.ac.cn> Date: Sat, 06 Apr 2024 11:46:15 -0400 Message-ID: <87a5m6try0.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 70096-done Cc: =?utf-8?B?5a6L5paH5q2m?= , 70096-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi Zheng, Zheng Junjie 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 =C2=A9 2021 Ludovic Court=C3=A8s > ;;; Copyright =C2=A9 2021, 2022, 2023, 2024 Maxim Cournoyer > ;;; Copyright =C2=A9 2021 Brendan Tildesley > +;;; Copyright =C2=A9 2024 Zheng Junjie <873216071@qq.com> > ;;; > ;;; This file is part of GNU Guix. > ;;; > @@ -89,7 +90,7 @@ (define* (variables-for-wrapping base-directories outpu= t-directory > '("XDG_CONFIG_DIRS" suffix directory "/etc/xdg") > `("QT_PLUGIN_PATH" prefix directory > ,(format #f "/lib/qt~a/plugins" qt-major-version)) > - `(,(if (>=3D 6 (string->number qt-major-version)) > + `(,(if (>=3D (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. --=20 Thanks, Maxim From unknown Sun Jun 22 03:58:00 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Sun, 05 May 2024 11:24:13 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator