Update nautilus on core-updates-frozen

  • Done
  • quality assurance status badge
Details
2 participants
  • Maxim Cournoyer
  • Vivien Kraus
Owner
unassigned
Submitted by
Vivien Kraus
Severity
normal
V
V
Vivien Kraus wrote on 13 Nov 2021 10:01
(address . bug-guix@gnu.org)
875yswl988.fsf@planete-kraus.eu
Dear guix,

If we update gnome-autoar (the tool to manage archives), we can update
nautilus. What do you think?

Vivien
From bcdf96f406b6b108be3cd0e701ad9f08756dd450 Mon Sep 17 00:00:00 2001
From: Vivien Kraus <vivien@planete-kraus.eu>
Date: Sat, 13 Nov 2021 08:57:15 +0000
Subject: [PATCH 1/3] gnu: gnome-autoar: Upgrade to 0.4.1.

* gnu/packages/gnome.scm (gnome-autoar): Update to 0.4.1.
* gnu/packages/gnome.scm (gnome-autoar) [build-system]: Switch to meson.
* gnu/packages/gnome.scm (gnome-autoar) [native-inputs]: Add glib:bin for
glib-mkenums.
---
gnu/packages/gnome.scm | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)

Toggle diff (29 lines)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index bc885156e4..a0005f0f63 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -8837,7 +8837,7 @@ (define-public gtk-vnc
(define-public gnome-autoar
(package
(name "gnome-autoar")
- (version "0.3.3")
+ (version "0.4.1")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/"
@@ -8845,10 +8845,11 @@ (define-public gnome-autoar
name "-" version ".tar.xz"))
(sha256
(base32
- "012w7rhhpxvlrnnhqy01vwzg1wxqpy8jbqgizn47wnip7bvh0917"))))
- (build-system glib-or-gtk-build-system)
+ "03hmm7cjgjvyxlflghfa89s1amj16qapl2c9pv0r2bfrp87dasv4"))))
+ (build-system meson-build-system)
(native-inputs
`(("gobject-introspection" ,gobject-introspection)
+ ("glib:bin" ,glib "bin")
("pkg-config" ,pkg-config)))
(propagated-inputs
`(("libarchive" ,libarchive))) ; Required by gnome-autoar-0.pc
--
2.33.1
From 9103c852de3eee1e0f3a1ace79a2e1860812ee23 Mon Sep 17 00:00:00 2001
From: Vivien Kraus <vivien@planete-kraus.eu>
Date: Sat, 13 Nov 2021 08:49:32 +0000
Subject: [PATCH 2/3] gnu: nautilus: Use libsoup 2 because of tracker.

* gnu/packages/gnome.scm (nautilus) [inputs]: Use libsoup-2.
* gnu/packages/gnome.scm (nautilus) [arguments]: Use meson 0.59.
---
gnu/packages/gnome.scm | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)

Toggle diff (25 lines)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index a0005f0f63..250e200783 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -9081,7 +9081,8 @@ (define-public nautilus
"03gn416vvpvyy75pj3xkpxrqilbvjhqbvrdi5fdaivp50zzg47mp"))))
(build-system meson-build-system)
(arguments
- '(#:glib-or-gtk? #t
+ `(#:glib-or-gtk? #t
+ #:meson ,meson-0.59
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'skip-gtk-update-icon-cache
@@ -9111,7 +9112,7 @@ (define-public nautilus
("libportal" ,libportal)
("libseccomp" ,libseccomp)
("libselinux" ,libselinux)
- ("libsoup" ,libsoup)
+ ("libsoup" ,libsoup-minimal-2) ; to satisfy tracker dependencies
("tracker" ,tracker)
("tracker-miners" ,tracker-miners)
;; XXX: gtk+ is required by libnautilus-extension.pc
--
2.33.1
From 1a9f43b31715e5a3b2269501d35dd4ab094a9cb8 Mon Sep 17 00:00:00 2001
From: Vivien Kraus <vivien@planete-kraus.eu>
Date: Sat, 13 Nov 2021 08:58:20 +0000
Subject: [PATCH 3/3] gnu: nautilus: Update to 41.0.

* gnu/packages/gnome.scm (nautilus): Upgrade to 41.0.
* gnu/packages/gnome.scm (nautilus) [arguments]: Use meson 0.59.
---
gnu/packages/gnome.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (24 lines)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 250e200783..e10d9ca481 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -9070,7 +9070,7 @@ (define-public tracker-miners
(define-public nautilus
(package
(name "nautilus")
- (version "40.2")
+ (version "41.0")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/"
@@ -9078,7 +9078,7 @@ (define-public nautilus
name "-" version ".tar.xz"))
(sha256
(base32
- "03gn416vvpvyy75pj3xkpxrqilbvjhqbvrdi5fdaivp50zzg47mp"))))
+ "1rd1a0wjh2sc7mzw6m61rryvgxpi2lin4xj0x9khqw04q6nl3fgr"))))
(build-system meson-build-system)
(arguments
`(#:glib-or-gtk? #t
--
2.33.1
-----BEGIN PGP SIGNATURE-----

iQGzBAEBCAAdFiEEq4yIHjMvkliPpwQnO7C8EjLYuCwFAmGPfwcACgkQO7C8EjLY
uCz9Lgv9F6NbBdA94asB/ToRdLqxLf5cR+pP7cwJqhdeOhwloYra6Gqru/XNbjbe
+sGjV1qxR4+PjoNh4Dptv72AeQo55mB2XSN6t0EAWjahuYcs8HKX9MIKq44kiaoA
W/szH0ishszNP/XP1hRx97qzJieE1xzqq7QnVOIe81/2CVxYTV319QWatvO1Hywr
mii7L+OHAS45faZqj//73vvWqG9Kh8HmcEA74bBXhUycD/AZZYXQq3HYkR30sQbd
E8y3BhwiZoE/pHKrEiJwAnlbvkmhAHhfAi/ykjS1V0Q9kk2o8PRTmjcyhzqV1sYC
VhTeM9DGWQ6HZQTtrwDcCLQ13fGY48Oh8o96DO93RzAz8Hpiy8DMB2/zsUO1tV3P
eGiyJxi8mIsr3EYj4Tp7rLWvMsUYpAh4xbA9o14m81TRHzsxq9o7D5Hv0j6dtMnL
M0khiz8sL/MjX2/0CiL4X4O61Zw4E0tPpNHOkDy0DWxNyM7SxEjBlebd6g5SU24k
05KOlEVG
=kQu9
-----END PGP SIGNATURE-----

V
V
Vivien Kraus wrote on 13 Nov 2021 11:49
Re: bug#51805: Don’t upgrade nautilus if you don’t want to
(address . 51805@debbugs.gnu.org)
87ilwwjplu.fsf@planete-kraus.eu
As a precision, the second patch is the only one required, apply the
others at your discretion.

Vivien
-----BEGIN PGP SIGNATURE-----

iQGzBAEBCAAdFiEEq4yIHjMvkliPpwQnO7C8EjLYuCwFAmGPmJ0ACgkQO7C8EjLY
uCwzQQv8Ce1qqlwyyeoe0yYKLKtwVHXHouowcGF2dqkl+sVl+eVJM3rqroNdJ2MX
FttqFQUm8WJmnVjLveaaqwyeQxi4QVS0ifJUUIPhhtT8fX62Jg/EZcHFN7WmaVtU
zdpCOrmoIoofvNh46wiKKdbEzBUd9m9IAHqg16kj23WAEFnQ8WVnN+4DLnjTRxei
A7RwSXF23UDbhMBGhHJJmxb+8Kcorjp8qfxQvsWa5xpAqljIi5mQhTBpPQouPvW0
6HerovRHW66Edn4bvIPTGJHB8Wx0mycNqzvSK7ZpLPUp4jTNrc0Vd0QhcO3g+e3c
KBypGpPLCD633EV06EgbYr0CUO2fXHuDG9Y65VJpDHMRCG2Y1nJOiTOuSYLTJJAg
MM1jJVexzR6pQWouhp0uX6x4dtyXQYbPzl/lRqRG08OCyqDVKIipOpOkiM+fF+1/
u5ili++KSSQpMWmBJ4cjHpJBbrW8U4IhyaC8WP7mmDJ6EvH9a+KPrn9WK5tuBXmk
5vvix9aF
=XvoR
-----END PGP SIGNATURE-----

M
M
Maxim Cournoyer wrote on 21 Nov 2021 15:15
Re: bug#51805: Update nautilus on core-updates-frozen
(name . Vivien Kraus)(address . vivien@planete-kraus.eu)(address . 51805-done@debbugs.gnu.org)
87o86dbnnd.fsf@gmail.com
Hello,

I applied the remaining patches from this series to core-updates-frozen.

Thank you!

Maxim
Closed
?