* [bug#65696] [PATCH gnome-team 1/4] gnu: gnome-clocks: Update to 44.0.
2023-09-02 9:19 [bug#65696] [PATCH gnome-team 0/4] Remove libgweather4-with-libsoup2 Liliana Marie Prikler
@ 2023-08-29 20:22 ` Liliana Marie Prikler
2023-08-29 20:23 ` [bug#65696] [PATCH gnome-team 2/4] gnu: gnome-calendar: Update to 44.1 Liliana Marie Prikler
` (4 subsequent siblings)
5 siblings, 0 replies; 19+ messages in thread
From: Liliana Marie Prikler @ 2023-08-29 20:22 UTC (permalink / raw)
To: 65696; +Cc: liliana.prikler, maxim.cournoyer, rg
* gnu/packages/gnome.scm (gnome-clocks): Update to 44.0.
[inputs]: Replace geocode-glib-with-libsoup2 with geocode-glib.
Replace libgweather4-with-libsoup2 with libgweather4.
---
gnu/packages/gnome.scm | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index d4e78bb08d..f9a2cc941b 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -10266,7 +10266,7 @@ (define-public libzapojit
(define-public gnome-clocks
(package
(name "gnome-clocks")
- (version "42.0")
+ (version "44.0")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/"
@@ -10274,7 +10274,7 @@ (define-public gnome-clocks
name "-" version ".tar.xz"))
(sha256
(base32
- "1q3gvniwd4dkr1ghqpp05zr7qswdhaxqrn8j6bm3qbh39bdihw8f"))))
+ "0f1q9wxixjnhwypp6zaplxzj2lrk3x8gfy0x7811m3ybcmrskmqp"))))
(build-system meson-build-system)
(arguments
'(#:glib-or-gtk? #t
@@ -10295,13 +10295,13 @@ (define-public gnome-clocks
vala))
(inputs
(list geoclue
- geocode-glib-with-libsoup2
+ geocode-glib
glib
gnome-desktop
gsound
gtk
libadwaita
- libgweather4-with-libsoup2))
+ libgweather4))
(home-page "https://wiki.gnome.org/Apps/Clocks")
(synopsis "GNOME's clock application")
(description
--
2.41.0
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [bug#65696] [PATCH gnome-team 2/4] gnu: gnome-calendar: Update to 44.1.
2023-09-02 9:19 [bug#65696] [PATCH gnome-team 0/4] Remove libgweather4-with-libsoup2 Liliana Marie Prikler
2023-08-29 20:22 ` [bug#65696] [PATCH gnome-team 1/4] gnu: gnome-clocks: Update to 44.0 Liliana Marie Prikler
@ 2023-08-29 20:23 ` Liliana Marie Prikler
2023-09-05 3:04 ` Maxim Cournoyer
2023-09-02 8:36 ` [bug#65696] [PATCH gnome-team 3/4] gnu: gnome-initial-setup: Update to 44.0 Liliana Marie Prikler
` (3 subsequent siblings)
5 siblings, 1 reply; 19+ messages in thread
From: Liliana Marie Prikler @ 2023-08-29 20:23 UTC (permalink / raw)
To: 65696; +Cc: liliana.prikler, maxim.cournoyer, rg
* gnu/packages/gnome.scm (gnome-calendar): Update to 44.1.
[inputs]: Replace evolution-data-server-3.44 with evolution-data-server.
Replace geocode-glib-with-libsoup2 with geocode-glib.
Replace gnome-online-accounts-3.44 with gnome-online-accounts.
Replace libgweather4-with-libsoup2 with libgweather.
---
gnu/packages/gnome.scm | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index f9a2cc941b..c980098e93 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -10312,7 +10312,7 @@ (define-public gnome-clocks
(define-public gnome-calendar
(package
(name "gnome-calendar")
- (version "42.2")
+ (version "44.1")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/"
@@ -10320,7 +10320,7 @@ (define-public gnome-calendar
name "-" version ".tar.xz"))
(sha256
(base32
- "1ggvnl2jnc24nzpkjvsk57vpckjzb14a7mmnk6jjm84nmqxccz5f"))))
+ "0zmpyd5qgryrxflgcapfp6jxph3z31qycs148r715gbhnqwbg89h"))))
(build-system meson-build-system)
(arguments
`(#:glib-or-gtk? #t
@@ -10337,16 +10337,14 @@ (define-public gnome-calendar
`(,glib "bin") ; For glib-compile-schemas
pkg-config))
(inputs
- ;; Note: not propagating evolution-data-server-3.44 to keep profiles
- ;; clean from libsoup2.
- (list evolution-data-server-3.44
+ (list evolution-data-server
geoclue
- geocode-glib-with-libsoup2
- gnome-online-accounts-3.44
+ geocode-glib
+ gnome-online-accounts
gsettings-desktop-schemas
libadwaita
libdazzle
- libgweather4-with-libsoup2))
+ libgweather4))
(home-page "https://wiki.gnome.org/Apps/Calendar")
(synopsis "GNOME's calendar application")
(description
--
2.41.0
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [bug#65696] [PATCH gnome-team 3/4] gnu: gnome-initial-setup: Update to 44.0.
2023-09-02 9:19 [bug#65696] [PATCH gnome-team 0/4] Remove libgweather4-with-libsoup2 Liliana Marie Prikler
2023-08-29 20:22 ` [bug#65696] [PATCH gnome-team 1/4] gnu: gnome-clocks: Update to 44.0 Liliana Marie Prikler
2023-08-29 20:23 ` [bug#65696] [PATCH gnome-team 2/4] gnu: gnome-calendar: Update to 44.1 Liliana Marie Prikler
@ 2023-09-02 8:36 ` Liliana Marie Prikler
2023-09-05 3:03 ` Maxim Cournoyer
2023-09-02 9:15 ` [bug#65696] [PATCH gnome-team 4/4] gnu: Remove libgweather4-with-libsoup2 Liliana Marie Prikler
` (2 subsequent siblings)
5 siblings, 1 reply; 19+ messages in thread
From: Liliana Marie Prikler @ 2023-09-02 8:36 UTC (permalink / raw)
To: 65696; +Cc: liliana.prikler, maxim.cournoyer, rg
* gnu/packages/gnome.scm (gnome-initial-setup): Update to 44.0.
[inputs]: Remove cheese and libhandy.
Add libadwaita.
Replace gnome-online-account-3.44 with gnome-online-accounts.
Replace libgweather4-with-libsoup2 with libgweather4.
Replace rest with rest-next.
Replace webkitgtk-with-libsoup2 with webkitgtk-next.
---
gnu/packages/gnome.scm | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index c980098e93..40dafe891d 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -1524,7 +1524,7 @@ (define-public libmediaart
(define-public gnome-initial-setup
(package
(name "gnome-initial-setup")
- (version "42.2")
+ (version "44.0")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/gnome-initial-setup/"
@@ -1532,7 +1532,7 @@ (define-public gnome-initial-setup
"/gnome-initial-setup-" version ".tar.xz"))
(sha256
(base32
- "0yxy39a7d2whphd0jskvra5q8zy4v7m7lziy5fxibgls4j5xk0sd"))))
+ "1zxv0i6lwcnjs4m0ny08wxbfz25ygnwkbh4l3dkrhapqr1nzqg2r"))))
(build-system meson-build-system)
(arguments
(list
@@ -1556,28 +1556,27 @@ (define-public gnome-initial-setup
pkg-config))
(inputs
(list accountsservice
- cheese
elogind
gdm
geoclue
gnome-desktop
- gnome-online-accounts-3.44
+ gnome-online-accounts
gstreamer
ibus
json-glib
mit-krb5
+ libadwaita
libgnomekbd
- libgweather4-with-libsoup2
- libhandy
+ libgweather4
libnma
libpwquality
libsecret
network-manager
packagekit
polkit
- rest
+ rest-next
upower
- webkitgtk-with-libsoup2))
+ webkitgtk-next))
(synopsis "Initial setup wizard for GNOME desktop")
(description "This package provides a set-up wizard when a
user logs into GNOME for the first time. It typically provides a
--
2.41.0
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [bug#65696] [PATCH gnome-team 4/4] gnu: Remove libgweather4-with-libsoup2.
2023-09-02 9:19 [bug#65696] [PATCH gnome-team 0/4] Remove libgweather4-with-libsoup2 Liliana Marie Prikler
` (2 preceding siblings ...)
2023-09-02 8:36 ` [bug#65696] [PATCH gnome-team 3/4] gnu: gnome-initial-setup: Update to 44.0 Liliana Marie Prikler
@ 2023-09-02 9:15 ` Liliana Marie Prikler
2023-09-05 3:03 ` Maxim Cournoyer
2023-09-02 11:34 ` [bug#65696] [PATCH gnome-team v2 1/7] gnu: gnome-autoar: Update to 0.4.4 Liliana Marie Prikler
2023-09-05 3:05 ` [bug#65696] [PATCH gnome-team 0/4] Remove libgweather4-with-libsoup2 Maxim Cournoyer
5 siblings, 1 reply; 19+ messages in thread
From: Liliana Marie Prikler @ 2023-09-02 9:15 UTC (permalink / raw)
To: 65696; +Cc: liliana.prikler, maxim.cournoyer, rg
It no longer has any dependents other than itself.
* gnu/packages/gnome.scm (libgweather4-with-libsoup2): Delete variable.
---
gnu/packages/gnome.scm | 12 ------------
1 file changed, 12 deletions(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 40dafe891d..23dcb46060 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -5908,18 +5908,6 @@ (define-public libgweather4
libsoup
libxml2))))
-(define-public libgweather4-with-libsoup2
- (package
- (inherit libgweather4)
- (name "libgweather4-with-libsoup2")
- (arguments (substitute-keyword-arguments (package-arguments libgweather4)
- ((#:configure-flags flags)
- #~(cons "-Dsoup2=true" #$flags))))
- (propagated-inputs
- (modify-inputs (package-propagated-inputs libgweather4)
- (replace "geocode-glib" geocode-glib-with-libsoup2)
- (replace "libsoup" libsoup-minimal-2)))))
-
(define-public gnome-settings-daemon
(package
(name "gnome-settings-daemon")
--
2.41.0
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [bug#65696] [PATCH gnome-team 0/4] Remove libgweather4-with-libsoup2
@ 2023-09-02 9:19 Liliana Marie Prikler
2023-08-29 20:22 ` [bug#65696] [PATCH gnome-team 1/4] gnu: gnome-clocks: Update to 44.0 Liliana Marie Prikler
` (5 more replies)
0 siblings, 6 replies; 19+ messages in thread
From: Liliana Marie Prikler @ 2023-09-02 9:19 UTC (permalink / raw)
To: 65696; +Cc: liliana.prikler, maxim.cournoyer, rg
Hi Guix,
this series allows us to remove an obsolete package :)
It also updates three packages belonging to gnome.
Cheers
Liliana Marie Prikler (4):
gnu: gnome-clocks: Update to 44.0.
gnu: gnome-calendar: Update to 44.1.
gnu: gnome-initial-setup: Update to 44.0.
gnu: Remove libgweather4-with-libsoup2.
gnu/packages/gnome.scm | 49 +++++++++++++++---------------------------
1 file changed, 17 insertions(+), 32 deletions(-)
base-commit: baf5b0745446dabe8166d860996dc54cfa09db3e
prerequisite-patch-id: afaee255d9c76105d3c075e3b1302efe2e720121
prerequisite-patch-id: 939c99edaaebbcf04c00d099004421e548082316
prerequisite-patch-id: c27258fdbc2dce067cbcadc0cbb79255131e7b13
prerequisite-patch-id: 17b7d0a8a3e698b5dac1e6e83448876cf7ed828a
prerequisite-patch-id: 904c70b8c150f8046b0779e1a109c89b58b1a6f3
prerequisite-patch-id: 4b1376cfe285b3ddabb88fab0ed8372effd33561
prerequisite-patch-id: 0238ddcf9e9140c7f3726b34a3ea51c4e0cec422
prerequisite-patch-id: 3149ef71903b81ee78ed180cea370852705a3cac
prerequisite-patch-id: 0c0e3b6be8544d07597c8eae54832136f5450887
--
2.41.0
^ permalink raw reply [flat|nested] 19+ messages in thread
* [bug#65696] [PATCH gnome-team v2 1/7] gnu: gnome-autoar: Update to 0.4.4.
2023-09-02 9:19 [bug#65696] [PATCH gnome-team 0/4] Remove libgweather4-with-libsoup2 Liliana Marie Prikler
` (3 preceding siblings ...)
2023-09-02 9:15 ` [bug#65696] [PATCH gnome-team 4/4] gnu: Remove libgweather4-with-libsoup2 Liliana Marie Prikler
@ 2023-09-02 11:34 ` Liliana Marie Prikler
2023-09-02 11:34 ` [bug#65696] [PATCH gnome-team v2 2/7] gnu: tracker: Update to 3.5.3 Liliana Marie Prikler
` (5 more replies)
2023-09-05 3:05 ` [bug#65696] [PATCH gnome-team 0/4] Remove libgweather4-with-libsoup2 Maxim Cournoyer
5 siblings, 6 replies; 19+ messages in thread
From: Liliana Marie Prikler @ 2023-09-02 11:34 UTC (permalink / raw)
To: 65696; +Cc: Maxim Cournoyer, liliana.prikler, rg
* gnu/packages/gnome.scm (gnome-autoar): Update to 0.4.4.
---
gnu/packages/gnome.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 5ac54b5f6b..a9e3f67e72 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -9356,7 +9356,7 @@ (define-public gtk-vnc
(define-public gnome-autoar
(package
(name "gnome-autoar")
- (version "0.4.3")
+ (version "0.4.4")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/"
@@ -9364,7 +9364,7 @@ (define-public gnome-autoar
name "-" version ".tar.xz"))
(sha256
(base32
- "124y4j3wgb6axgfzw9f00865r033fg7b0qy9qgfsp5ilan4hgpvv"))))
+ "1hn3rzd6z2g2xvnx8icifybq26vvxk44qmqz392b2g6g7crvxby0"))))
(build-system meson-build-system)
(native-inputs
(list gobject-introspection `(,glib "bin") pkg-config))
base-commit: baf5b0745446dabe8166d860996dc54cfa09db3e
prerequisite-patch-id: 388709973c645542e3e3919b655c4582e4efba83
prerequisite-patch-id: 939c99edaaebbcf04c00d099004421e548082316
prerequisite-patch-id: c27258fdbc2dce067cbcadc0cbb79255131e7b13
prerequisite-patch-id: 17b7d0a8a3e698b5dac1e6e83448876cf7ed828a
prerequisite-patch-id: 904c70b8c150f8046b0779e1a109c89b58b1a6f3
prerequisite-patch-id: 4b1376cfe285b3ddabb88fab0ed8372effd33561
prerequisite-patch-id: 1fd04a0630ed00a31531385cb6b4ee457ff29713
prerequisite-patch-id: 3149ef71903b81ee78ed180cea370852705a3cac
prerequisite-patch-id: a00ae3ccb3cf2ebdbbf16c749821cf3a047e3502
prerequisite-patch-id: c6e6bfe44465fbf1477a8d379f821926037c2b9e
prerequisite-patch-id: ee43b1b9627833bd220c2a5987b1d4ca6ceeaf1c
prerequisite-patch-id: b48031f5489b0678ac7b63458cc35385834655b4
--
2.41.0
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [bug#65696] [PATCH gnome-team v2 2/7] gnu: tracker: Update to 3.5.3.
2023-09-02 11:34 ` [bug#65696] [PATCH gnome-team v2 1/7] gnu: gnome-autoar: Update to 0.4.4 Liliana Marie Prikler
@ 2023-09-02 11:34 ` Liliana Marie Prikler
2023-09-02 11:35 ` [bug#65696] [PATCH gnome-team v2 3/7] gnu: tracker-miners: Update to 3.5.2 Liliana Marie Prikler
` (4 subsequent siblings)
5 siblings, 0 replies; 19+ messages in thread
From: Liliana Marie Prikler @ 2023-09-02 11:34 UTC (permalink / raw)
To: 65696; +Cc: Maxim Cournoyer, liliana.prikler, rg
* gnu/packages/gnome.scm (tracker): Update to 3.5.3.
---
gnu/packages/gnome.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index a9e3f67e72..abd79eac08 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -9382,7 +9382,7 @@ (define-public gnome-autoar
(define-public tracker
(package
(name "tracker")
- (version "3.4.2")
+ (version "3.5.3")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/tracker/"
@@ -9390,7 +9390,7 @@ (define-public tracker
"tracker-" version ".tar.xz"))
(sha256
(base32
- "0c8ppm03b9r6lyxalama8sjmw3km4jibbswqra7qf17pli1g2vaf"))))
+ "1vi878f95a2nlvqz46ph6f05hywjb2ni0znqavhdkrbvi6qchrhl"))))
(build-system meson-build-system)
(arguments
(list
--
2.41.0
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [bug#65696] [PATCH gnome-team v2 3/7] gnu: tracker-miners: Update to 3.5.2.
2023-09-02 11:34 ` [bug#65696] [PATCH gnome-team v2 1/7] gnu: gnome-autoar: Update to 0.4.4 Liliana Marie Prikler
2023-09-02 11:34 ` [bug#65696] [PATCH gnome-team v2 2/7] gnu: tracker: Update to 3.5.3 Liliana Marie Prikler
@ 2023-09-02 11:35 ` Liliana Marie Prikler
2023-09-02 11:36 ` [bug#65696] [PATCH gnome-team v2 5/7] gnu: nautilus: Update to 44.2 Liliana Marie Prikler
` (3 subsequent siblings)
5 siblings, 0 replies; 19+ messages in thread
From: Liliana Marie Prikler @ 2023-09-02 11:35 UTC (permalink / raw)
To: 65696; +Cc: Maxim Cournoyer, liliana.prikler, rg
* gnu/packages/gnome.scm (tracker-miners): Update to 3.5.2.
[#:phases]<fix-tests>: Adjust accordingly.
[inputs]: Add gst-plugins-base.
---
gnu/packages/gnome.scm | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index abd79eac08..9f70b7cc97 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -9500,7 +9500,7 @@ (define-public tracker
(define-public tracker-miners
(package
(name "tracker-miners")
- (version "3.3.1")
+ (version "3.5.2")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/tracker-miners/"
@@ -9508,7 +9508,7 @@ (define-public tracker-miners
"/tracker-miners-" version ".tar.xz"))
(sha256
(base32
- "151w6ljq1gk9idqfq9qs3w16vms91jnxy59c9kx6jaf0fb9cdp9y"))))
+ "0sbc3fmvqg5hvdl5sq8w77lqmk9i6vc13izcxck8winrrgx93ys0"))))
(build-system meson-build-system)
(arguments
`(#:glib-or-gtk? #t
@@ -9542,12 +9542,7 @@ (define-public tracker-miners
;; to be true and the UPower daemon to be started.
(substitute* "examples/python/meson.build"
(("foreach example_name:.*")
- "foreach example_name: []"))
- ;; Disable this test that is failing randomly:
- ;; https://gitlab.gnome.org/GNOME/tracker-miners/-/issues/170.
- (substitute* "tests/libtracker-miner/meson.build"
- (("'miner-fs'.*")
- ""))))
+ "foreach example_name: []"))))
(replace 'check
(lambda* (#:key tests? #:allow-other-keys)
(when tests?
@@ -9579,6 +9574,7 @@ (define-public tracker-miners
giflib
glib
gstreamer
+ gst-plugins-base
icu4c
json-glib
libcue
--
2.41.0
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [bug#65696] [PATCH gnome-team v2 5/7] gnu: nautilus: Update to 44.2.
2023-09-02 11:34 ` [bug#65696] [PATCH gnome-team v2 1/7] gnu: gnome-autoar: Update to 0.4.4 Liliana Marie Prikler
2023-09-02 11:34 ` [bug#65696] [PATCH gnome-team v2 2/7] gnu: tracker: Update to 3.5.3 Liliana Marie Prikler
2023-09-02 11:35 ` [bug#65696] [PATCH gnome-team v2 3/7] gnu: tracker-miners: Update to 3.5.2 Liliana Marie Prikler
@ 2023-09-02 11:36 ` Liliana Marie Prikler
2023-09-02 11:37 ` [bug#65696] [PATCH gnome-team v2 4/7] gnu: libadwaita: Update to 1.3.4 Liliana Marie Prikler
` (2 subsequent siblings)
5 siblings, 0 replies; 19+ messages in thread
From: Liliana Marie Prikler @ 2023-09-02 11:36 UTC (permalink / raw)
To: 65696; +Cc: Maxim Cournoyer, liliana.prikler, rg
* gnu/packages/gnome.scm (nautilus): Update to 44.2.
[#:phases]: Add ‘patch-tracker3-command’.
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 6ad2434b11..b460812348 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -9618,7 +9618,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 "/"
@@ -9626,7 +9626,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)
@@ -9635,6 +9635,13 @@ (define-public nautilus
#:glib-or-gtk? #t
#:phases
#~(modify-phases %standard-phases
+ (add-after 'unpack 'patch-tracker3-command
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "src/nautilus-tag-manager.c"
+ (("\"tracker3\"")
+ (string-append "\""
+ (search-input-file inputs "/bin/tracker3")
+ "\"")))))
(add-after 'unpack 'disable-tracker-tests
;; The tracker test hangs in the build container (see:
;; https://gitlab.gnome.org/GNOME/nautilus/-/issues/2486).
@@ -9645,8 +9652,9 @@ (define-public nautilus
(add-after 'unpack 'skip-gtk-update-icon-cache
;; Don't create 'icon-theme.cache'.
(lambda _
- (substitute* "build-aux/meson/postinstall.py"
- (("gtk-update-icon-cache") "true"))))
+ (substitute* "meson.build"
+ (("gtk_update_icon_cache: true")
+ "gtk_update_icon_cache: false"))))
(delete 'check)
(add-after 'install 'check
(assoc-ref %standard-phases 'check))
@@ -9673,18 +9681,18 @@ (define-public nautilus
gnome-autoar
gst-plugins-base
json-glib
- libhandy
+ libadwaita
libportal
libseccomp
libselinux
tracker
tracker-miners
- ;; XXX: gtk+ is required by libnautilus-extension.pc
+ ;; XXX: gtk is required by libnautilus-extension.pc
;;
- ;; Don't propagate it to reduces "profile pollution" of the 'gnome' meta
+ ;; Don't propagate it to reduce "profile pollution" of the 'gnome' meta
;; package. See:
;; <http://lists.gnu.org/archive/html/guix-devel/2016-03/msg00283.html>.
- gtk+
+ gtk
libexif
libxml2))
(native-search-paths
diff --git a/gnu/packages/patches/nautilus-extension-search-path.patch b/gnu/packages/patches/nautilus-extension-search-path.patch
index d5dc35b241..1394956315 100644
--- a/gnu/packages/patches/nautilus-extension-search-path.patch
+++ b/gnu/packages/patches/nautilus-extension-search-path.patch
@@ -1,54 +1,62 @@
Allow Nautilus to search for extensions in the directories listed
in $NAUTILUS_EXTENSION_PATH.
-diff --git a/src/nautilus-module.c b/src/nautilus-module.c
-index bf474bd..42e2a4e 100644
---- a/src/nautilus-module.c
-+++ b/src/nautilus-module.c
-@@ -211,6 +211,10 @@ static void
+Index: nautilus-44.2/src/nautilus-module.c
+===================================================================
+--- nautilus-44.2.orig/src/nautilus-module.c
++++ nautilus-44.2/src/nautilus-module.c
+@@ -220,8 +220,16 @@ static void
load_module_dir (const char *dirname)
{
GDir *dir;
+-
+ static GHashTable *loaded = NULL;
+ g_autoptr (GStrvBuilder) installed_module_name_builder = g_strv_builder_new ();
++
++ if (installed_module_names != NULL)
++ g_strv_builder_addv (installed_module_name_builder,
++ (const gchar **)installed_module_names);
+
+ if (loaded == NULL)
+ loaded = g_hash_table_new (g_str_hash, g_str_equal);
-
++
dir = g_dir_open (dirname, 0, NULL);
-@@ -221,15 +225,22 @@ load_module_dir (const char *dirname)
- while ((name = g_dir_read_name (dir)))
+ if (dir)
+@@ -232,16 +240,24 @@ load_module_dir (const char *dirname)
{
if (g_str_has_suffix (name, "." G_MODULE_SUFFIX))
-- {
+ {
- char *filename;
-
- filename = g_build_filename (dirname,
- name,
- NULL);
-- nautilus_module_load_file (filename);
+- nautilus_module_load_file (filename, installed_module_name_builder);
- g_free (filename);
-- }
-+ {
-+ /* Make sure each module is loaded only twice or this could
-+ lead to a crash. Double loading can occur if DIRNAME
-+ occurs more than once in $NAUTILUS_EXTENSION_PATH. */
-+ if (!g_hash_table_contains (loaded, name))
-+ {
-+ char *filename;
++ /* Make sure each module is loaded only twice or this could
++ lead to a crash. Double loading can occur if DIRNAME
++ occurs more than once in $NAUTILUS_EXTENSION_PATH. */
++ if (!g_hash_table_contains (loaded, name))
++ {
++ char *filename;
+
-+ filename = g_build_filename (dirname,
-+ name,
-+ NULL);
-+ nautilus_module_load_file (filename);
-+ g_hash_table_add (loaded, g_strdup (name));
-+ g_free (filename);
-+ }
-+ }
- }
++ filename = g_build_filename (dirname,
++ name,
++ NULL);
++ nautilus_module_load_file (filename,
++ installed_module_name_builder);
++ g_hash_table_add (loaded, g_strdup (name));
++ g_free (filename);
++ }
+ }
+- }
++ }
g_dir_close (dir);
-@@ -257,10 +268,24 @@ nautilus_module_setup (void)
+ }
+
+@@ -278,10 +294,24 @@ nautilus_module_setup (void)
if (!initialized)
{
--
2.41.0
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [bug#65696] [PATCH gnome-team v2 4/7] gnu: libadwaita: Update to 1.3.4.
2023-09-02 11:34 ` [bug#65696] [PATCH gnome-team v2 1/7] gnu: gnome-autoar: Update to 0.4.4 Liliana Marie Prikler
` (2 preceding siblings ...)
2023-09-02 11:36 ` [bug#65696] [PATCH gnome-team v2 5/7] gnu: nautilus: Update to 44.2 Liliana Marie Prikler
@ 2023-09-02 11:37 ` Liliana Marie Prikler
2023-09-02 11:58 ` [bug#65696] [PATCH gnome-team v2 6/7] gnu: vte: Update to 0.72.2 Liliana Marie Prikler
2023-09-02 11:59 ` [bug#65696] [PATCH gnome-team v2 7/7] gnu: gnome-console: Update to 44.4 Liliana Marie Prikler
5 siblings, 0 replies; 19+ messages in thread
From: Liliana Marie Prikler @ 2023-09-02 11:37 UTC (permalink / raw)
To: 65696; +Cc: Maxim Cournoyer, liliana.prikler, rg
* gnu/packages/gnome.scm (libadwaita): Update to 1.3.4.
---
gnu/packages/gnome.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 9f70b7cc97..6ad2434b11 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -13275,7 +13275,7 @@ (define-public ocrfeeder
(define-public libadwaita
(package
(name "libadwaita")
- (version "1.2.0")
+ (version "1.3.4")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/libadwaita/"
@@ -13283,7 +13283,7 @@ (define-public libadwaita
"libadwaita-" version ".tar.xz"))
(sha256
(base32
- "0326qs0zhfi6zv52p90axnicmv0qb2l2hwpyv60pk9lvwcdkwbrj"))))
+ "1gdimh85f5hb6jhnivjaai4m08nz4x9iif5rxdckn8b0lzrwl740"))))
(build-system meson-build-system)
(arguments
`(#:phases
--
2.41.0
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [bug#65696] [PATCH gnome-team v2 6/7] gnu: vte: Update to 0.72.2.
2023-09-02 11:34 ` [bug#65696] [PATCH gnome-team v2 1/7] gnu: gnome-autoar: Update to 0.4.4 Liliana Marie Prikler
` (3 preceding siblings ...)
2023-09-02 11:37 ` [bug#65696] [PATCH gnome-team v2 4/7] gnu: libadwaita: Update to 1.3.4 Liliana Marie Prikler
@ 2023-09-02 11:58 ` Liliana Marie Prikler
2023-09-02 11:59 ` [bug#65696] [PATCH gnome-team v2 7/7] gnu: gnome-console: Update to 44.4 Liliana Marie Prikler
5 siblings, 0 replies; 19+ messages in thread
From: Liliana Marie Prikler @ 2023-09-02 11:58 UTC (permalink / raw)
To: 65696; +Cc: Maxim Cournoyer, liliana.prikler, rg
* gnu/packages/gnome.scm (vte): Update to 0.72.2.
---
gnu/packages/gnome.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index b460812348..acad9f10be 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -4492,7 +4492,7 @@ (define-public vala-0.52
(define-public vte
(package
(name "vte")
- (version "0.70.2")
+ (version "0.72.2")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/vte/"
@@ -4500,7 +4500,7 @@ (define-public vte
"vte-" version ".tar.xz"))
(sha256
(base32
- "102d6cd9f96czlq01ixhymfp0z20khw0dl5bgvan9xg31lwb85ad"))))
+ "17hwfkb0vakjgf1gbmjma54hdrppzqfbfqj1jr9iz656hp8nz5pp"))))
(build-system meson-build-system)
(arguments
(list #:configure-flags #~(list "-Dvapi=true"
--
2.41.0
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [bug#65696] [PATCH gnome-team v2 7/7] gnu: gnome-console: Update to 44.4.
2023-09-02 11:34 ` [bug#65696] [PATCH gnome-team v2 1/7] gnu: gnome-autoar: Update to 0.4.4 Liliana Marie Prikler
` (4 preceding siblings ...)
2023-09-02 11:58 ` [bug#65696] [PATCH gnome-team v2 6/7] gnu: vte: Update to 0.72.2 Liliana Marie Prikler
@ 2023-09-02 11:59 ` Liliana Marie Prikler
2023-09-07 1:50 ` Maxim Cournoyer
5 siblings, 1 reply; 19+ messages in thread
From: Liliana Marie Prikler @ 2023-09-02 11:59 UTC (permalink / raw)
To: 65696; +Cc: Maxim Cournoyer, liliana.prikler, rg
* gnu/packages/gnome.scm (gnome-console): Update to 44.4.
[arguments]: Remove #:phases.
<#:configure-flas>: Remove “-Dnautilus=enabled”.
[inputs]: Remove gtk+, libhandy, nautilus and vte.
Add gtk, libadwaita and vte-with-gtk-4.
---
gnu/packages/gnome.scm | 20 ++++++--------------
1 file changed, 6 insertions(+), 14 deletions(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index acad9f10be..1f91156da4 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -5375,7 +5375,7 @@ (define-public gnome-sudoku
(define-public gnome-console
(package
(name "gnome-console")
- (version "42.2")
+ (version "44.4")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/gnome-console/"
@@ -5383,28 +5383,20 @@ (define-public gnome-console
"gnome-console-" version ".tar.xz"))
(sha256
(base32
- "0jbh8g3hmc35fy5fbscqf0831xpg1kv66ci9hykpbia4hz0yc9kx"))))
+ "13asis4fabsm0wy3m6bk4k3bmnh6a9c9bwwpv6b3why0lvll87xr"))))
(build-system meson-build-system)
(arguments
(list #:glib-or-gtk? #t
- #:configure-flags #~(list "-Dtests=true"
- "-Dnautilus=enabled")
- #:phases #~(modify-phases %standard-phases
- (add-after 'unpack 'patch-nautilus-extension-path
- (lambda _
- (substitute* "nautilus/meson.build"
- (("'extensions-[0-9.]*'")
- "'site-extensions'")))))))
+ #:configure-flags #~(list "-Dtests=true")))
(native-inputs (list `(,glib "bin")
gettext-minimal
sassc
pkg-config
`(,gtk+ "bin")
desktop-file-utils))
- (inputs (list gtk+
- libhandy
- nautilus
- vte
+ (inputs (list gtk
+ libadwaita
+ vte-with-gtk-4
libgtop
gsettings-desktop-schemas))
(home-page "https://gitlab.gnome.org/GNOME/console")
--
2.41.0
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [bug#65696] [PATCH gnome-team 3/4] gnu: gnome-initial-setup: Update to 44.0.
2023-09-02 8:36 ` [bug#65696] [PATCH gnome-team 3/4] gnu: gnome-initial-setup: Update to 44.0 Liliana Marie Prikler
@ 2023-09-05 3:03 ` Maxim Cournoyer
2023-09-05 16:55 ` Liliana Marie Prikler
0 siblings, 1 reply; 19+ messages in thread
From: Maxim Cournoyer @ 2023-09-05 3:03 UTC (permalink / raw)
To: Liliana Marie Prikler; +Cc: 65696, rg
Liliana Marie Prikler <liliana.prikler@gmail.com> writes:
> * gnu/packages/gnome.scm (gnome-initial-setup): Update to 44.0.
> [inputs]: Remove cheese and libhandy.
> Add libadwaita.
> Replace gnome-online-account-3.44 with gnome-online-accounts.
> Replace libgweather4-with-libsoup2 with libgweather4.
> Replace rest with rest-next.
> Replace webkitgtk-with-libsoup2 with webkitgtk-next.
Can't we update our webkitgtk whole to webkitgtk-next?
Otherwise LGTM.
--
Thanks,
Maxim
^ permalink raw reply [flat|nested] 19+ messages in thread
* [bug#65696] [PATCH gnome-team 4/4] gnu: Remove libgweather4-with-libsoup2.
2023-09-02 9:15 ` [bug#65696] [PATCH gnome-team 4/4] gnu: Remove libgweather4-with-libsoup2 Liliana Marie Prikler
@ 2023-09-05 3:03 ` Maxim Cournoyer
0 siblings, 0 replies; 19+ messages in thread
From: Maxim Cournoyer @ 2023-09-05 3:03 UTC (permalink / raw)
To: Liliana Marie Prikler; +Cc: 65696, rg
Hi,
Liliana Marie Prikler <liliana.prikler@gmail.com> writes:
> It no longer has any dependents other than itself.
>
> * gnu/packages/gnome.scm (libgweather4-with-libsoup2): Delete variable.
Yay! LGTM.
--
Thanks,
Maxim
^ permalink raw reply [flat|nested] 19+ messages in thread
* [bug#65696] [PATCH gnome-team 2/4] gnu: gnome-calendar: Update to 44.1.
2023-08-29 20:23 ` [bug#65696] [PATCH gnome-team 2/4] gnu: gnome-calendar: Update to 44.1 Liliana Marie Prikler
@ 2023-09-05 3:04 ` Maxim Cournoyer
0 siblings, 0 replies; 19+ messages in thread
From: Maxim Cournoyer @ 2023-09-05 3:04 UTC (permalink / raw)
To: Liliana Marie Prikler; +Cc: 65696, rg
Hi Liliana,
Liliana Marie Prikler <liliana.prikler@gmail.com> writes:
> * gnu/packages/gnome.scm (gnome-calendar): Update to 44.1.
> [inputs]: Replace evolution-data-server-3.44 with evolution-data-server.
> Replace geocode-glib-with-libsoup2 with geocode-glib.
> Replace gnome-online-accounts-3.44 with gnome-online-accounts.
> Replace libgweather4-with-libsoup2 with libgweather.
LGTM!
--
Thanks,
Maxim
^ permalink raw reply [flat|nested] 19+ messages in thread
* [bug#65696] [PATCH gnome-team 0/4] Remove libgweather4-with-libsoup2
2023-09-02 9:19 [bug#65696] [PATCH gnome-team 0/4] Remove libgweather4-with-libsoup2 Liliana Marie Prikler
` (4 preceding siblings ...)
2023-09-02 11:34 ` [bug#65696] [PATCH gnome-team v2 1/7] gnu: gnome-autoar: Update to 0.4.4 Liliana Marie Prikler
@ 2023-09-05 3:05 ` Maxim Cournoyer
5 siblings, 0 replies; 19+ messages in thread
From: Maxim Cournoyer @ 2023-09-05 3:05 UTC (permalink / raw)
To: Liliana Marie Prikler; +Cc: 65696, rg
Hi,
Liliana Marie Prikler <liliana.prikler@gmail.com> writes:
> Hi Guix,
>
> this series allows us to remove an obsolete package :)
> It also updates three packages belonging to gnome.
>
> Cheers
>
> Liliana Marie Prikler (4):
> gnu: gnome-clocks: Update to 44.0.
> gnu: gnome-calendar: Update to 44.1.
> gnu: gnome-initial-setup: Update to 44.0.
> gnu: Remove libgweather4-with-libsoup2.
LGTM, with some comment about whether we could further unify our
webkitgtk package (to webkitgtk-next).
--
Thanks,
Maxim
^ permalink raw reply [flat|nested] 19+ messages in thread
* [bug#65696] [PATCH gnome-team 3/4] gnu: gnome-initial-setup: Update to 44.0.
2023-09-05 3:03 ` Maxim Cournoyer
@ 2023-09-05 16:55 ` Liliana Marie Prikler
0 siblings, 0 replies; 19+ messages in thread
From: Liliana Marie Prikler @ 2023-09-05 16:55 UTC (permalink / raw)
To: Maxim Cournoyer; +Cc: 65696, rg
Am Montag, dem 04.09.2023 um 23:03 -0400 schrieb Maxim Cournoyer:
> Liliana Marie Prikler <liliana.prikler@gmail.com> writes:
>
> > * gnu/packages/gnome.scm (gnome-initial-setup): Update to 44.0.
> > [inputs]: Remove cheese and libhandy.
> > Add libadwaita.
> > Replace gnome-online-account-3.44 with gnome-online-accounts.
> > Replace libgweather4-with-libsoup2 with libgweather4.
> > Replace rest with rest-next.
> > Replace webkitgtk-with-libsoup2 with webkitgtk-next.
>
> Can't we update our webkitgtk whole to webkitgtk-next?
Unlike the other -next packages, webkitgtk vs webkitgtk-next is just
the GTK3 vs. GTK4 difference. We would need webkitgtk-next-next or
similar for the API version 5 vs. 6 difference, but afaik most of GNOME
44 is happy with 5, so it's no biggie.
Cheers
^ permalink raw reply [flat|nested] 19+ messages in thread
* [bug#65696] [PATCH gnome-team v2 7/7] gnu: gnome-console: Update to 44.4.
2023-09-02 11:59 ` [bug#65696] [PATCH gnome-team v2 7/7] gnu: gnome-console: Update to 44.4 Liliana Marie Prikler
@ 2023-09-07 1:50 ` Maxim Cournoyer
2023-09-07 18:35 ` bug#65696: " Liliana Marie Prikler
0 siblings, 1 reply; 19+ messages in thread
From: Maxim Cournoyer @ 2023-09-07 1:50 UTC (permalink / raw)
To: Liliana Marie Prikler; +Cc: 65696
Hi,
This series LGTM.
--
Thanks,
Maxim
^ permalink raw reply [flat|nested] 19+ messages in thread
* bug#65696: [PATCH gnome-team v2 7/7] gnu: gnome-console: Update to 44.4.
2023-09-07 1:50 ` Maxim Cournoyer
@ 2023-09-07 18:35 ` Liliana Marie Prikler
0 siblings, 0 replies; 19+ messages in thread
From: Liliana Marie Prikler @ 2023-09-07 18:35 UTC (permalink / raw)
To: Maxim Cournoyer; +Cc: 65696-done
Am Mittwoch, dem 06.09.2023 um 21:50 -0400 schrieb Maxim Cournoyer:
> Hi,
>
> This series LGTM.
Aaaand it's pushed.
^ permalink raw reply [flat|nested] 19+ messages in thread
end of thread, other threads:[~2023-09-07 18:36 UTC | newest]
Thread overview: 19+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-09-02 9:19 [bug#65696] [PATCH gnome-team 0/4] Remove libgweather4-with-libsoup2 Liliana Marie Prikler
2023-08-29 20:22 ` [bug#65696] [PATCH gnome-team 1/4] gnu: gnome-clocks: Update to 44.0 Liliana Marie Prikler
2023-08-29 20:23 ` [bug#65696] [PATCH gnome-team 2/4] gnu: gnome-calendar: Update to 44.1 Liliana Marie Prikler
2023-09-05 3:04 ` Maxim Cournoyer
2023-09-02 8:36 ` [bug#65696] [PATCH gnome-team 3/4] gnu: gnome-initial-setup: Update to 44.0 Liliana Marie Prikler
2023-09-05 3:03 ` Maxim Cournoyer
2023-09-05 16:55 ` Liliana Marie Prikler
2023-09-02 9:15 ` [bug#65696] [PATCH gnome-team 4/4] gnu: Remove libgweather4-with-libsoup2 Liliana Marie Prikler
2023-09-05 3:03 ` Maxim Cournoyer
2023-09-02 11:34 ` [bug#65696] [PATCH gnome-team v2 1/7] gnu: gnome-autoar: Update to 0.4.4 Liliana Marie Prikler
2023-09-02 11:34 ` [bug#65696] [PATCH gnome-team v2 2/7] gnu: tracker: Update to 3.5.3 Liliana Marie Prikler
2023-09-02 11:35 ` [bug#65696] [PATCH gnome-team v2 3/7] gnu: tracker-miners: Update to 3.5.2 Liliana Marie Prikler
2023-09-02 11:36 ` [bug#65696] [PATCH gnome-team v2 5/7] gnu: nautilus: Update to 44.2 Liliana Marie Prikler
2023-09-02 11:37 ` [bug#65696] [PATCH gnome-team v2 4/7] gnu: libadwaita: Update to 1.3.4 Liliana Marie Prikler
2023-09-02 11:58 ` [bug#65696] [PATCH gnome-team v2 6/7] gnu: vte: Update to 0.72.2 Liliana Marie Prikler
2023-09-02 11:59 ` [bug#65696] [PATCH gnome-team v2 7/7] gnu: gnome-console: Update to 44.4 Liliana Marie Prikler
2023-09-07 1:50 ` Maxim Cournoyer
2023-09-07 18:35 ` bug#65696: " Liliana Marie Prikler
2023-09-05 3:05 ` [bug#65696] [PATCH gnome-team 0/4] Remove libgweather4-with-libsoup2 Maxim Cournoyer
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.