bug#51030: closed ([core-updates-frozen] build: qt-utils: Don't wrap .X-real files.)

[GNU bug Tracking System]

Your message dated Fri, 12 Nov 2021 00:49:06 -0500
with message-id <8735o1rkj1.fsf@gmail.com>
and subject line Re: bug#51030: [core-updates-frozen] build: qt-utils: Don't 
wrap .X-real files.
has caused the debbugs.gnu.org bug report #51030,
regarding [core-updates-frozen] build: qt-utils: Don't wrap .X-real files.
to be marked as done.

(If you believe you have received this mail in error, please contact
help-debbugs@gnu.org.)


-- 
51030: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=51030
GNU Bug Tracking System
Contact help-debbugs@gnu.org with problems
> --- Begin Message ---
>
>
>
> 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@kadziolka.net>
>  ;;; Copyright © 2021 Ludovic Courtès <ludo@gnu.org>
>  ;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
> +;;; Copyright © 2021 Brendan Tildesley <mail@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
>
>
>
>
> --- End Message ---
> --- Begin Message ---
>
>
>
> 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
>
>
>
>
> User-agent: 
>
> Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux)
>
>
>
>
> Hello,
>
> Brendan Tildesley <mail@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@kadziolka.net>
> >  ;;; Copyright © 2021 Ludovic Courtès <ludo@gnu.org>
> >  ;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
> > +;;; Copyright © 2021 Brendan Tildesley <mail@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
>
>
> --- End Message ---