From patchwork Sun Sep 13 05:45:55 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brendan Tildesley X-Patchwork-Id: 24106 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 AC7A127BBE8; Sun, 13 Sep 2020 06:47:17 +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_H4,RCVD_IN_MSPIKE_WL,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 5891C27BBE7 for ; Sun, 13 Sep 2020 06:47:17 +0100 (BST) Received: from localhost ([::1]:35806 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kHKr6-0004RD-Ga for patchwork@mira.cbaines.net; Sun, 13 Sep 2020 01:47:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58422) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kHKqt-0004Q2-Da for guix-patches@gnu.org; Sun, 13 Sep 2020 01:47:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:37804) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kHKqt-00027c-0p for guix-patches@gnu.org; Sun, 13 Sep 2020 01:47:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kHKqs-0000w4-VS for guix-patches@gnu.org; Sun, 13 Sep 2020 01:47:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#43367] [PATCH 3/5] glib-or-gtk-build-system: Don't double wrap programs. Resent-From: Brendan Tildesley Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 13 Sep 2020 05:47:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 43367 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 43367@debbugs.gnu.org Received: via spool by 43367-submit@debbugs.gnu.org id=B43367.15999759883518 (code B ref 43367); Sun, 13 Sep 2020 05:47:02 +0000 Received: (at 43367) by debbugs.gnu.org; 13 Sep 2020 05:46:28 +0000 Received: from localhost ([127.0.0.1]:49343 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kHKqJ-0000uW-Q5 for submit@debbugs.gnu.org; Sun, 13 Sep 2020 01:46:28 -0400 Received: from mout-p-201.mailbox.org ([80.241.56.171]:31064) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kHKqI-0000ty-EN for 43367@debbugs.gnu.org; Sun, 13 Sep 2020 01:46:26 -0400 Received: from smtp2.mailbox.org (smtp2.mailbox.org [IPv6:2001:67c:2050:105:465:1:2: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-201.mailbox.org (Postfix) with ESMTPS id 4Bpz4r2WVCzQkkJ for <43367@debbugs.gnu.org>; Sun, 13 Sep 2020 07:46:20 +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=1599975978; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=GDXmgOMbs3D4zP72xGN8NM0+tHTbLwgy8rtz/dY09vc=; b=Q3wAc9i6clSohE6FlxhTwVtb5fhf1WjqlYPWrbSVWIQROUV0Ml+HilP/NSJKkAqPClpuuX yMfjhxQZFbqI/4tWNQOQtRQ95a+fmnb0tJlde25Ah6Y2gcVoMOR5CAu11ijTWR8KMh1iif R4S0XeIVOAj+GUhzkduqhFSx9t2slSgL0R5MWla+jBjzhGsL1jlyVr5NHPHpXlMHzu/jBS OpiCk4LxjHZiKGY7QMGdH2HIj9L1lU0EFjzNCKIOLiCdUiaiFTLj3XyQRkg8CxWzceksmE KciWrR9MflDrbNvZOjtvSDG3RJwrljevigkrPF/Mhy2595VQji0EGueN9TlpNQ== Received: from smtp2.mailbox.org ([80.241.60.241]) by spamfilter04.heinlein-hosting.de (spamfilter04.heinlein-hosting.de [80.241.56.122]) (amavisd-new, port 10030) with ESMTP id SavwKnaseiS0 for <43367@debbugs.gnu.org>; Sun, 13 Sep 2020 07:46:17 +0200 (CEST) From: Brendan Tildesley Date: Sun, 13 Sep 2020 15:45:55 +1000 Message-Id: <20200913054557.12911-3-mail@brendan.scot> In-Reply-To: <20200913054557.12911-1-mail@brendan.scot> References: <83311dc4-6e9b-e70b-e379-9993bfcd0554@brendan.scot> <20200913054557.12911-1-mail@brendan.scot> MIME-Version: 1.0 X-MBO-SPAM-Probability: * X-Rspamd-Score: 0.53 / 15.00 / 15.00 X-Rspamd-Queue-Id: 631E8271 X-Rspamd-UID: 6ce4ee 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/glib-or-gtk-build-system.scm (wrap-all-programs): If a package definition was modified to insert an additional wrap phase before glib-or-gtk...'s wrap phase instead of after, glib-or-gtk...'s wrap phase will double wrap the .X-real file from the earlier wrap phase. Filtering out such wrapped programs means these .X-real files should fix this and mean packagers don't have to worry about ensuring their wrap phases are put afterwards. --- guix/build/glib-or-gtk-build-system.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/guix/build/glib-or-gtk-build-system.scm b/guix/build/glib-or-gtk-build-system.scm index ba680fd1a9..ccb3138fe2 100644 --- a/guix/build/glib-or-gtk-build-system.scm +++ b/guix/build/glib-or-gtk-build-system.scm @@ -142,8 +142,9 @@ add a dependency of that output on GLib and GTK+." (unless (member output glib-or-gtk-wrap-excluded-outputs) (let* ((bindir (string-append directory "/bin")) (libexecdir (string-append directory "/libexec")) - (bin-list (append (find-files bindir ".*") - (find-files libexecdir ".*"))) + (bin-list (filter (negate wrapped-program?) + (append (find-files bindir ".*") + (find-files libexecdir ".*")))) (datadirs (data-directories (alist-cons output directory inputs))) (gtk-mod-dirs (gtk-module-directories