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 0CRRCotuEWZsBQEAqHPOHw:P1 (envelope-from ) for ; Sat, 06 Apr 2024 17:47:23 +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 0CRRCotuEWZsBQEAqHPOHw (envelope-from ) for ; Sat, 06 Apr 2024 17:47:23 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=nSSK4ooo; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=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=1712418442; 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: content-transfer-encoding:content-transfer-encoding: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:dkim-signature; bh=WIzPKVClfg5U0PJ3S9H1NeEvSeFFzHAgU4ZKqCWtOkY=; b=Oa3t6Hr3lhSvAuUJkcSKodO2kmEKhlQbuoYw4vcjSOg8iab0XpGkamEb5IKiMS3jDUCtlB xm05Pgqs370osBi8akSfww3wJlcqvs/oKVLWBJqsUG1xUzOFY4hKe/YgtlO7tqFxfEpoT1 VqAkB1t3UZN+jb+Ab1d73SrJcX07ljbX8R6yD+kscqxclZfKXeDQXm2rfuLYoWbFBHaRGy s1JM5UNuDuytcxtlRAY6WfENxNPhm4gB8flhrGcDXd3VvPiBGlbd7g3ej3F0bf5eAQpUx8 DUcHwqD8k1gds1o8pFpLKQf+AoaPwMFwXfKd1dML2+rWrLx53v/4piAyk3Ci+Q== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=nSSK4ooo; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=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=1712418442; a=rsa-sha256; cv=none; b=aUlxjStxBjZoNVlkv1/xZ1xn3pt/3tOglHo60ksX1i4ZfQwI3ucna0Pu/vkatpQqK4LCub cbYONt4t6MKy8DP3Bvdwf1TK4cr4fg3ce5so1pMuOCAwoxWR1eDOwl5uVNlaqhKwkj4uUW jSVH9lFTau7tstQm2O5d2hAJfYgp+u3Hmfj2eEgfbG1pdJKoItuIiy2VgtjPxUiWUMcRYq kDS86lUNz9aeZON4f5y+UWYE+8SaOItG6eB5FFajnxODWNxt6YZmOqmU20g+f28b8tD9ot UfpH1szQi5wcN9eVKtjGruQR24XfdRYb3oMcm6z4lODPz2/iMAGbmDYLD/AU0Q== 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 CA18169EB for ; Sat, 06 Apr 2024 17:47:22 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rt8Fv-0000S5-3X; Sat, 06 Apr 2024 11:46:59 -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 1rt8Ft-0000QQ-Bn for guix-patches@gnu.org; Sat, 06 Apr 2024 11:46:57 -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 1rt8Fs-0005Jp-4c for guix-patches@gnu.org; Sat, 06 Apr 2024 11:46:57 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rt8Fy-0005GB-9x for guix-patches@gnu.org; Sat, 06 Apr 2024 11:47:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70096] Request for merging "qt-team" branch Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 06 Apr 2024 15:47:02 +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: Zheng Junjie Cc: =?UTF-8?Q?=E5=AE=8B=E6=96=87=E6=AD=A6?= , 70096-done@debbugs.gnu.org Received: via spool by 70096-done@debbugs.gnu.org id=D70096.171241839820076 (code D ref 70096); Sat, 06 Apr 2024 15:47:02 +0000 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 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-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: -5.26 X-Migadu-Scanner: mx11.migadu.com X-Spam-Score: -5.26 X-Migadu-Queue-Id: CA18169EB X-TUID: FVXxcIHcj5zM 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