From patchwork Sat Apr 6 02:27:47 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Z572 X-Patchwork-Id: 62762 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 9A73727BBEA; Sat, 6 Apr 2024 03:35:21 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id D71FB27BBE9 for ; Sat, 6 Apr 2024 03:35:19 +0100 (BST) 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?b?5a6L5paH5q2m?= , 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 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches 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. From d087c9f89cb42878185a3041bde84ec95a8a996c 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 --- 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 ;;; Copyright © 2021, 2022, 2023, 2024 Maxim Cournoyer ;;; Copyright © 2021 Brendan Tildesley +;;; 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