GNU bug report logs - #51030
[core-updates-frozen] build: qt-utils: Don't wrap .X-real files.

Previous Next

Package: guix-patches;

Reported by: Brendan Tildesley <mail <at> brendan.scot>

Date: Tue, 5 Oct 2021 11:02:02 UTC

Severity: normal

Done: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>

Bug is archived. No further changes may be made.

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 51030 in the body.
You can then email your comments to 51030 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

View this report as an mbox folder, status mbox, maintainer mbox


Report forwarded to guix-patches <at> gnu.org:
bug#51030; Package guix-patches. (Tue, 05 Oct 2021 11:02:02 GMT) Full text and rfc822 format available.

Acknowledgement sent to Brendan Tildesley <mail <at> brendan.scot>:
New bug report received and forwarded. Copy sent to guix-patches <at> gnu.org. (Tue, 05 Oct 2021 11:02:02 GMT) Full text and rfc822 format available.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Brendan Tildesley <mail <at> brendan.scot>
To: guix-patches <at> gnu.org
Subject: [core-updates-frozen] build: qt-utils: Don't wrap .X-real files.
Date: Tue,  5 Oct 2021 22:01:06 +1100
* 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 <kuba <at> kadziolka.net>
 ;;; Copyright © 2021 Ludovic Courtès <ludo <at> gnu.org>
 ;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
+;;; Copyright © 2021 Brendan Tildesley <mail <at> brendan.scot>
 ;;;
 ;;; 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





Reply sent to Maxim Cournoyer <maxim.cournoyer <at> gmail.com>:
You have taken responsibility. (Fri, 12 Nov 2021 05:50:01 GMT) Full text and rfc822 format available.

Notification sent to Brendan Tildesley <mail <at> brendan.scot>:
bug acknowledged by developer. (Fri, 12 Nov 2021 05:50:01 GMT) Full text and rfc822 format available.

Message #10 received at 51030-done <at> debbugs.gnu.org (full text, mbox):

From: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
To: Brendan Tildesley <mail <at> brendan.scot>
Cc: 51030-done <at> debbugs.gnu.org
Subject: Re: bug#51030: [core-updates-frozen] build: qt-utils: Don't wrap
 .X-real files.
Date: Fri, 12 Nov 2021 00:49:06 -0500
Hello,

Brendan Tildesley <mail <at> brendan.scot> 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 © 2020 Jakub Kądziołka <kuba <at> kadziolka.net>
>  ;;; Copyright © 2021 Ludovic Courtès <ludo <at> gnu.org>
>  ;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
> +;;; Copyright © 2021 Brendan Tildesley <mail <at> brendan.scot>
>  ;;;
>  ;;; 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




bug archived. Request was from Debbugs Internal Request <help-debbugs <at> gnu.org> to internal_control <at> debbugs.gnu.org. (Fri, 10 Dec 2021 12:24:07 GMT) Full text and rfc822 format available.

This bug report was last modified 2 years and 99 days ago.

Previous Next


GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.