From patchwork Fri Oct 15 09:29:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Brendan Tildesley X-Patchwork-Id: 33882 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 A203A27BBE3; Fri, 15 Oct 2021 10:37:42 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 3C1AC27BBE1 for ; Fri, 15 Oct 2021 10:37:42 +0100 (BST) Received: from localhost ([::1]:35780 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mbJen-0005as-8c for patchwork@mira.cbaines.net; Fri, 15 Oct 2021 05:37:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40630) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mbJZL-0004Rc-BW for guix-patches@gnu.org; Fri, 15 Oct 2021 05:32:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54856) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mbJZK-0006Uj-Vn for guix-patches@gnu.org; Fri, 15 Oct 2021 05:32:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mbJZK-0005dy-RB for guix-patches@gnu.org; Fri, 15 Oct 2021 05:32:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50862] [PATCH core-updates-frozen 01/19] 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: Fri, 15 Oct 2021 09:32:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50862 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50862@debbugs.gnu.org Received: via spool by 50862-submit@debbugs.gnu.org id=B50862.163429029121499 (code B ref 50862); Fri, 15 Oct 2021 09:32:02 +0000 Received: (at 50862) by debbugs.gnu.org; 15 Oct 2021 09:31:31 +0000 Received: from localhost ([127.0.0.1]:38134 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mbJYo-0005ab-L5 for submit@debbugs.gnu.org; Fri, 15 Oct 2021 05:31:31 -0400 Received: from mout-p-101.mailbox.org ([80.241.56.151]:14512) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mbJYm-0005a5-Ju for 50862@debbugs.gnu.org; Fri, 15 Oct 2021 05:31:29 -0400 Received: from smtp102.mailbox.org (smtp102.mailbox.org [IPv6:2001:67c:2050:105:465:1:3: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 4HW1HG114YzQjgG for <50862@debbugs.gnu.org>; Fri, 15 Oct 2021 11:31: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=1634290278; 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: in-reply-to:in-reply-to:references:references; bh=KhFykUdMVvf/nkJ5P5FwdXyhCLAZzvsZ4c71UztQPIA=; b=TGdwy/tmkUa2m1fxJa1BYq47AjwpvRoDPYGxTtT6VicPuEA08H7fN4QkfDwuXlimQDXNQW 6rQS7muyN+mtSr4ckXY6UgT+tu5pZYziuhXisS+6xsS8xy8EvNyCByTMVfWPFO/I181Ac6 pV6kOC5bSyVVjSnuZlk8sNZqmiFKvbM2owDmW2XuC+yuiq9Qe8J7vRi5Hxa8EveBdxvaSL 3OWEcWqxMhrZiR1OZrsX3m5Y/1psEwQPvD1RSLueBAEOJ8Xf/IOEsPcRgwHE80Y6RvJFG5 HtaX9ix9NJnS9YKSw7xxRfdMOoAxxT/L88uSlzW74P4l1PFlS7YeyAoCOPk2AA== From: Brendan Tildesley Date: Fri, 15 Oct 2021 20:29:57 +1100 Message-Id: <20211015093015.5834-2-mail@brendan.scot> In-Reply-To: <20211015093015.5834-1-mail@brendan.scot> References: <20211015093015.5834-1-mail@brendan.scot> MIME-Version: 1.0 X-Rspamd-Queue-Id: E566E26C 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" X-getmail-retrieved-from-mailbox: Patches * 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")