From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms1.migadu.com with LMTPS id +Dj9Deq0EGZoPQAAqHPOHw:P1 (envelope-from ) for ; Sat, 06 Apr 2024 04:35:22 +0200 Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id +Dj9Deq0EGZoPQAAqHPOHw (envelope-from ) for ; Sat, 06 Apr 2024 04:35:22 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1712370922; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:in-reply-to:in-reply-to:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post; bh=IvhbcZChhZkoPyX1GrY59h6q+ujP8w1jftfn6gWAZKE=; b=O5e2b5oofCPy2Ggdy36aJZ3nUNmOZmuMidN8dsDkwgGXRQ+RdgBjX/vARdLu/AjK0ZdXqP 8AGH6B0+qv/uC6chZi61Dic4/oF9/ixZWJ+26YzbsLDtaKX7Q+u8qNYh5U2svEmKSTF+AH 8ZZBcR9LQkUMv+BVCkWiZOpU68jOb8dBzkeleLloYdhKVILeSt2pO4t5XCNqYm9TG4jweP SSbdhWDWxaXBrj4w6GuKTjF+TqbGEAbYmPn8AsTlzIOe1BKEKdUUbn+K/LEsdYvbmoiNsT ZB1mqfP7LoelAYV0fTlzoDKlR/OsRHizOaslwdorW7g8qLqOhL8/MK46/uTXOg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1712370922; a=rsa-sha256; cv=none; b=i0zfqYEHnBmgmApY8VlRxtX2sQpCxKhtjLMAweQZboyDjxKwVtqmNAP8UEOvLXpIoNJlQ2 cnfD6JHT428b7N1q7rcJcCD3rbRjM3WrnNaeruqDye28LAijL6EFykTzyWqiRu70lYRLX+ U6t5JWHGdzfClnRyyvlvWtT06J73O81LEPkq7oqBPiYzPcosvh+R2QwulpWDysvTq7JVbj u+wzaCiKxd/VTaaaeULr2pLzJmyQQqFd0bEfm8EUnBeOuP9ExTHGOx9rnt1rT4SEpvloNs 61H/b8pESS0C++S/6vBECje1r2ay1V3Nr3L7QjR8urmvnBL3JHJjYn/7yqwOQw== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 866A51F61 for ; Sat, 06 Apr 2024 04:35:19 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rsvtV-0005jn-6L; Fri, 05 Apr 2024 22:35:01 -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 1rsvtQ-0005jV-K3 for guix-patches@gnu.org; Fri, 05 Apr 2024 22:34:56 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rsvtQ-0003TR-CJ for guix-patches@gnu.org; Fri, 05 Apr 2024 22:34:56 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rsvtV-0001aO-T0 for guix-patches@gnu.org; Fri, 05 Apr 2024 22:35:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70096] Request for merging "qt-team" branch Resent-From: Zheng Junjie Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 06 Apr 2024 02:35:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70096 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Maxim Cournoyer Cc: =?UTF-8?Q?=E5=AE=8B=E6=96=87=E6=AD=A6?= , 70096@debbugs.gnu.org Received: via spool by 70096-submit@debbugs.gnu.org id=B70096.17123708675902 (code B ref 70096); Sat, 06 Apr 2024 02:35:01 +0000 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 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-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -8.46 X-Migadu-Scanner: mx11.migadu.com X-Spam-Score: -8.46 X-Migadu-Queue-Id: 866A51F61 X-TUID: 0GvU9OH6Kbyh --==-=-= 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----- --==-=-=--