GNU bug report logs - #65699
[PATCH gnome-team 0/7] Update Nautilus and Console

Previous Next

Full log

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

From: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
To: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
Cc: rg <at> raghavgururajan.name, 65699 <at> debbugs.gnu.org
Subject: Re: [bug#65699] [PATCH gnome-team 5/7] gnu: nautilus: Update to 44.2.
Date: Tue, 05 Sep 2023 18:59:07 +0200

Am Montag, dem 04.09.2023 um 23:31 -0400 schrieb Maxim Cournoyer:
> Hi,
> 
> Liliana Marie Prikler <liliana.prikler <at> gmail.com> writes:
> 
> > * gnu/packages/gnome.scm (nautilus): Update to 44.2.
> > [#:phases]: Add ‘hardcode-tracker’.
> > Adjust ‘skip-gtk-update-icon-cache’ accordingly.
> > [inputs]: Remove gtk+ and libhandy.
> > Add gtk and libadwaita.
> > * gnu/packages/patches/nautilus-extension-search-path.patch: Adjust
> > accordingly.
> > ---
> >  gnu/packages/gnome.scm                        | 24 ++++---
> >  .../nautilus-extension-search-path.patch      | 64 +++++++++++----
> > ----
> >  2 files changed, 52 insertions(+), 36 deletions(-)
> > 
> > diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
> > index 0d52058eb4..d550b204c3 100644
> > --- a/gnu/packages/gnome.scm
> > +++ b/gnu/packages/gnome.scm
> > @@ -9619,7 +9619,7 @@ (define-public tracker-miners
> >  (define-public nautilus
> >    (package
> >      (name "nautilus")
> > -    (version "42.2")
> > +    (version "44.2")
> >      (source (origin
> >                (method url-fetch)
> >                (uri (string-append "mirror://gnome/sources/" name
> > "/"
> > @@ -9627,7 +9627,7 @@ (define-public nautilus
> >                                    name "-" version ".tar.xz"))
> >                (sha256
> >                 (base32
> > -               
> > "1cncyiyh79w1id6a6s2f0rxmgwl65lp4ml4afa0z35jrnwp2s8cr"))
> > +               
> > "1rfkh43iw4bqv36ccznl3lh9g0p9pa8xqyjk167qlvar4xchcji7"))
> >                (patches
> >                 (search-patches "nautilus-extension-search-
> > path.patch"))))
> >      (build-system meson-build-system)
> > @@ -9636,6 +9636,13 @@ (define-public nautilus
> >        #:glib-or-gtk? #t
> >        #:phases
> >        #~(modify-phases %standard-phases
> > +          (add-after 'unpack 'hardcode-tracker
> > +            (lambda* (#:key inputs #:allow-other-keys)
> > +              (substitute* "src/nautilus-tag-manager.c"
> > +                (("\"tracker3\"")
> > +                 (string-append "\""
> > +                                (search-input-file inputs
> > "/bin/tracker3")
> > +                                "\"")))))
> 
> The leading slash in search-input-file is unnecessary.
I prefer it and search-input-file is explicitly coded to go both ways.

>   You can also use
> '(format #f "~s" (search-input-file inputs "bin/tracker3"))', which
> is shorter / more readable (?).
I see string-append preferred in the code base, but I can do either. 
How strongly do you feel I ought to use format?

Cheers

Previous Next

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