From unknown Tue Aug 19 05:11:26 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#51030] [core-updates-frozen] build: qt-utils: Don't wrap .X-real files. Resent-From: Brendan Tildesley Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 05 Oct 2021 11:02:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 51030 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 51030@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16334317007727 (code B ref -1); Tue, 05 Oct 2021 11:02:02 +0000 Received: (at submit) by debbugs.gnu.org; 5 Oct 2021 11:01:40 +0000 Received: from localhost ([127.0.0.1]:39180 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mXiCZ-00020Z-SI for submit@debbugs.gnu.org; Tue, 05 Oct 2021 07:01:40 -0400 Received: from lists.gnu.org ([209.51.188.17]:40350) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mXiCW-00020Q-OV for submit@debbugs.gnu.org; Tue, 05 Oct 2021 07:01:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57834) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mXiCV-0005KG-Um for guix-patches@gnu.org; Tue, 05 Oct 2021 07:01:36 -0400 Received: from mout-p-101.mailbox.org ([80.241.56.151]:56980) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_CHACHA20_POLY1305:256) (Exim 4.90_1) (envelope-from ) id 1mXiCQ-0007lS-9W for guix-patches@gnu.org; Tue, 05 Oct 2021 07:01:32 -0400 Received: from smtp1.mailbox.org (smtp1.mailbox.org [IPv6:2001:67c:2050:105:465:1:1:0]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-101.mailbox.org (Postfix) with ESMTPS id 4HNvlk3540zQkBW for ; Tue, 5 Oct 2021 13:01:22 +0200 (CEST) X-Virus-Scanned: amavisd-new at heinlein-support.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=brendan.scot; s=MBO0001; t=1633431680; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KhFykUdMVvf/nkJ5P5FwdXyhCLAZzvsZ4c71UztQPIA=; b=x+O6YNonXVnpDbUBxcld4DYREFAkh4S8RWo/I+oE7up2SkiNRNdc3JrTC75uY6wdk69RPM uimhau2S6mYBcBQ3SmBDsGU5q6rLv0bBQb1bTf6KHlbdOWEKHFIlMLe3duIiUK9wgjTdhH f+sQoknHtIA8VDnBHZc7aWL9XusTUbSYcpSsa3EGRDR4WbQGoLALZgTmPSSYkSp7EPY9pW vRRW/k13/ExQrsWapueD1RwKo1e6hyZIm4uhxH5a1oPjFONdgz4X6af3t2DfduJg2QMr9S 9sposPFFkN6lnx8l+w8A6die/G3ECbPCST9MFvVYCu6RHDzWl90QTaPPbZY96w== From: Brendan Tildesley Date: Tue, 5 Oct 2021 22:01:06 +1100 Message-Id: <20211005110106.11814-1-mail@brendan.scot> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 568EC18B6 Received-SPF: pass client-ip=80.241.56.151; envelope-from=mail@brendan.scot; helo=mout-p-101.mailbox.org X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.6 (-) 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: -2.6 (--) * guix/build/qt-utils.scm (find-files-to-wrap): Exclude already wrapped programs. This is forbidden in wrap-program now due to a738a663a99. --- guix/build/qt-utils.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/guix/build/qt-utils.scm b/guix/build/qt-utils.scm index c2b80cab7d..e86442b79f 100644 --- a/guix/build/qt-utils.scm +++ b/guix/build/qt-utils.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2020 Jakub Kądziołka ;;; Copyright © 2021 Ludovic Courtès ;;; Copyright © 2021 Maxim Cournoyer +;;; Copyright © 2021 Brendan Tildesley ;;; ;;; This file is part of GNU Guix. ;;; @@ -133,7 +134,10 @@ add a dependency of that output on Qt." (define (find-files-to-wrap output-dir) (append-map (lambda (dir) - (if (directory-exists? dir) (find-files dir ".*") (list))) + (if (directory-exists? dir) + (find-files dir (lambda (file stat) + (not (wrapped-program? file)))) + (list))) (list (string-append output-dir "/bin") (string-append output-dir "/sbin") (string-append output-dir "/libexec") -- 2.33.0 From unknown Tue Aug 19 05:11:26 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Brendan Tildesley Subject: bug#51030: closed (Re: bug#51030: [core-updates-frozen] build: qt-utils: Don't wrap .X-real files.) Message-ID: References: <8735o1rkj1.fsf@gmail.com> <20211005110106.11814-1-mail@brendan.scot> X-Gnu-PR-Message: they-closed 51030 X-Gnu-PR-Package: guix-patches Reply-To: 51030@debbugs.gnu.org Date: Fri, 12 Nov 2021 05:50:01 +0000 Content-Type: multipart/mixed; boundary="----------=_1636696201-4528-1" This is a multi-part message in MIME format... ------------=_1636696201-4528-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #51030: [core-updates-frozen] build: qt-utils: Don't wrap .X-real files. which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 51030@debbugs.gnu.org. --=20 51030: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D51030 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1636696201-4528-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 51030-done) by debbugs.gnu.org; 12 Nov 2021 05:49:24 +0000 Received: from localhost ([127.0.0.1]:42988 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mlPRD-0001A1-R7 for submit@debbugs.gnu.org; Fri, 12 Nov 2021 00:49:24 -0500 Received: from mail-qt1-f177.google.com ([209.85.160.177]:36468) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mlPRB-00019n-Ih for 51030-done@debbugs.gnu.org; Fri, 12 Nov 2021 00:49:22 -0500 Received: by mail-qt1-f177.google.com with SMTP id t11so7527604qtw.3 for <51030-done@debbugs.gnu.org>; Thu, 11 Nov 2021 21:49:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version:content-transfer-encoding; bh=sg4DikTT7daAPugeq6k+ZSb1QpW7lJun+lA+PBzuxPI=; b=noqz0exMFSLaAqlv5uwX3QJgiKFUub7NwEI7M8HMwK5VkM0NfqAruXbuo03CUe3ZX2 Fur9BrEXXm0DPD4B/y/HI0C1Y8p6hyJGRjiS6lRBefmZmQqT7AcwID4Ne+VD/V5nfDOz EMzlEdurC04qFU7K5tTMMszM2Pe/BKuaYbgHZGQhOEBY7vRMVTXM7S4pUVCEhhA8kn01 AkoehfJr4HxbxAiEig+6Zf4n0pJOSW576quFjbjpTKTJKjxGO4yvavqzgvetVOfp7sGB YBjubkkjqvjlWlf0PEvOnJps5KTYi2+fBqAfMf6pGRep8LHyK2wHKXh7CdrYcJp5Uj1Z 0B/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version:content-transfer-encoding; bh=sg4DikTT7daAPugeq6k+ZSb1QpW7lJun+lA+PBzuxPI=; b=KFvfWHtcz7dF1yrdyamE2tMuywJOm6HiUJfhK6zCOFY8WeXnvHxsJTa5aeydDRxaa6 qKTWfWuXyWvtAVfus31ElADheorgGu1Gd4NlYqVBcOP1crKyWCl2DJW0aHzE2byNJUAh /dK+1VCbPXVM4Prk35toMKQypAFExBBpv8pxDHAihKgRiILYRlhiLGvlSsQBTILkaUSw hDVFhMx7LC4FrmXSfZ0nDsc27I0Yxp1BG2tOeujaUcoAxtMTLsk7WXRZN6OwAHmhAvv7 X5wcvGU2lOVybqLEDqMe6o1Fpa2QPeFIdQzL264Y8mQdh93RaJhQqVBoOUiseextDxHH XIGQ== X-Gm-Message-State: AOAM530aWvX7Y7hzhqfSCaCv2mIyNH9miqJLl+ZD20q/8OzT5njU8Fsw 0a43CBuxXOWRFbgInzyv/tZl/Zp7G5QOuA9Y X-Google-Smtp-Source: ABdhPJx/VzxKHKwjKm7WefWaF1K364hZAAGth/R0n8TV4h/3jICdalF4YHdSosPcGSLnsg6TUQuaOg== X-Received: by 2002:ac8:580b:: with SMTP id g11mr13321266qtg.272.1636696155830; Thu, 11 Nov 2021 21:49:15 -0800 (PST) Received: from hurd (dsl-10-133-155.b2b2c.ca. [72.10.133.155]) by smtp.gmail.com with ESMTPSA id de13sm2302951qkb.81.2021.11.11.21.49.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Nov 2021 21:49:15 -0800 (PST) From: Maxim Cournoyer To: Brendan Tildesley Subject: Re: bug#51030: [core-updates-frozen] build: qt-utils: Don't wrap .X-real files. References: <20211005110106.11814-1-mail@brendan.scot> Date: Fri, 12 Nov 2021 00:49:06 -0500 In-Reply-To: <20211005110106.11814-1-mail@brendan.scot> (Brendan Tildesley's message of "Tue, 5 Oct 2021 22:01:06 +1100") Message-ID: <8735o1rkj1.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) 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: 51030-done Cc: 51030-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 (-) Hello, Brendan Tildesley writes: > * guix/build/qt-utils.scm (find-files-to-wrap): Exclude already wrapped > programs. This is forbidden in wrap-program now due to a738a663a99. > --- > guix/build/qt-utils.scm | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) > > diff --git a/guix/build/qt-utils.scm b/guix/build/qt-utils.scm > index c2b80cab7d..e86442b79f 100644 > --- a/guix/build/qt-utils.scm > +++ b/guix/build/qt-utils.scm > @@ -4,6 +4,7 @@ > ;;; Copyright =C2=A9 2020 Jakub K=C4=85dzio=C5=82ka > ;;; Copyright =C2=A9 2021 Ludovic Court=C3=A8s > ;;; Copyright =C2=A9 2021 Maxim Cournoyer > +;;; Copyright =C2=A9 2021 Brendan Tildesley > ;;; > ;;; This file is part of GNU Guix. > ;;; > @@ -133,7 +134,10 @@ add a dependency of that output on Qt." > (define (find-files-to-wrap output-dir) > (append-map > (lambda (dir) > - (if (directory-exists? dir) (find-files dir ".*") (list))) > + (if (directory-exists? dir) > + (find-files dir (lambda (file stat) > + (not (wrapped-program? file)))) > + (list))) > (list (string-append output-dir "/bin") > (string-append output-dir "/sbin") > (string-append output-dir "/libexec") That's been merged in core-updates-frozen with commit 3dfe45c3f10e31a016b22127eede8099ca4f4b8f. Thank you! Closing. Maxim ------------=_1636696201-4528-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 5 Oct 2021 11:01:40 +0000 Received: from localhost ([127.0.0.1]:39180 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mXiCZ-00020Z-SI for submit@debbugs.gnu.org; Tue, 05 Oct 2021 07:01:40 -0400 Received: from lists.gnu.org ([209.51.188.17]:40350) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mXiCW-00020Q-OV for submit@debbugs.gnu.org; Tue, 05 Oct 2021 07:01:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57834) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mXiCV-0005KG-Um for guix-patches@gnu.org; Tue, 05 Oct 2021 07:01:36 -0400 Received: from mout-p-101.mailbox.org ([80.241.56.151]:56980) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_CHACHA20_POLY1305:256) (Exim 4.90_1) (envelope-from ) id 1mXiCQ-0007lS-9W for guix-patches@gnu.org; Tue, 05 Oct 2021 07:01:32 -0400 Received: from smtp1.mailbox.org (smtp1.mailbox.org [IPv6:2001:67c:2050:105:465:1:1:0]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-101.mailbox.org (Postfix) with ESMTPS id 4HNvlk3540zQkBW for ; Tue, 5 Oct 2021 13:01:22 +0200 (CEST) X-Virus-Scanned: amavisd-new at heinlein-support.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=brendan.scot; s=MBO0001; t=1633431680; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KhFykUdMVvf/nkJ5P5FwdXyhCLAZzvsZ4c71UztQPIA=; b=x+O6YNonXVnpDbUBxcld4DYREFAkh4S8RWo/I+oE7up2SkiNRNdc3JrTC75uY6wdk69RPM uimhau2S6mYBcBQ3SmBDsGU5q6rLv0bBQb1bTf6KHlbdOWEKHFIlMLe3duIiUK9wgjTdhH f+sQoknHtIA8VDnBHZc7aWL9XusTUbSYcpSsa3EGRDR4WbQGoLALZgTmPSSYkSp7EPY9pW vRRW/k13/ExQrsWapueD1RwKo1e6hyZIm4uhxH5a1oPjFONdgz4X6af3t2DfduJg2QMr9S 9sposPFFkN6lnx8l+w8A6die/G3ECbPCST9MFvVYCu6RHDzWl90QTaPPbZY96w== From: Brendan Tildesley To: guix-patches@gnu.org Subject: [core-updates-frozen] build: qt-utils: Don't wrap .X-real files. Date: Tue, 5 Oct 2021 22:01:06 +1100 Message-Id: <20211005110106.11814-1-mail@brendan.scot> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 568EC18B6 Received-SPF: pass client-ip=80.241.56.151; envelope-from=mail@brendan.scot; helo=mout-p-101.mailbox.org X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.6 (-) X-Debbugs-Envelope-To: submit 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: -2.6 (--) * guix/build/qt-utils.scm (find-files-to-wrap): Exclude already wrapped programs. This is forbidden in wrap-program now due to a738a663a99. --- guix/build/qt-utils.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/guix/build/qt-utils.scm b/guix/build/qt-utils.scm index c2b80cab7d..e86442b79f 100644 --- a/guix/build/qt-utils.scm +++ b/guix/build/qt-utils.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2020 Jakub Kądziołka ;;; Copyright © 2021 Ludovic Courtès ;;; Copyright © 2021 Maxim Cournoyer +;;; Copyright © 2021 Brendan Tildesley ;;; ;;; This file is part of GNU Guix. ;;; @@ -133,7 +134,10 @@ add a dependency of that output on Qt." (define (find-files-to-wrap output-dir) (append-map (lambda (dir) - (if (directory-exists? dir) (find-files dir ".*") (list))) + (if (directory-exists? dir) + (find-files dir (lambda (file stat) + (not (wrapped-program? file)))) + (list))) (list (string-append output-dir "/bin") (string-append output-dir "/sbin") (string-append output-dir "/libexec") -- 2.33.0 ------------=_1636696201-4528-1--