From 7ddba7bf66c3d2d30e3720a2923c6918a68cb082 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Wed, 5 Oct 2022 21:44:00 +0200 Subject: [PATCH] gnu: gnome-maps: Update to 43.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/geo.scm (gnome-maps): Update to 43.0. [arguments]<#:meson>: Use meson-0.63. <#:phases>: Replace ‘skip-gtk-update-icon-cache’ with ‘skip-cache-and-database-updates’. Update accordingly. --- gnu/packages/geo.scm | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 43b37c8d7e..353336ca7a 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -255,7 +255,7 @@ topology functions.") (define-public gnome-maps (package (name "gnome-maps") - (version "43.rc") ;for libsoup 3 support + (version "43.0") ;for libsoup 3 support (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -263,18 +263,23 @@ topology functions.") name "-" version ".tar.xz")) (sha256 (base32 - "16a3j896fwxgnvrmx27jnrvhxzh3v22paaq87ad57yp8wkq946il")))) + "1r1l6ajs6zz316m8zac5r0l3qgdv616xh376bfn2fflcnz7wys08")))) (build-system meson-build-system) (arguments (list #:glib-or-gtk? #t + #:meson meson-0.63 #:phases #~(modify-phases %standard-phases - (add-after 'unpack 'skip-gtk-update-icon-cache - ;; Don't create 'icon-theme.cache'. + (add-after 'unpack 'skip-cache-and-database-updates (lambda _ - (substitute* "meson_post_install.py" - (("gtk-update-icon-cache") "true")))) + (substitute* "meson.build" + (("([a-z_]*): true" all option) + (cond ; cond rather than match saves an import + ((member option '("gtk_update_icon_cache" + "update_desktop_database")) + (string-append option ": false")) + (else all)))))) (add-after 'unpack 'patch-dbus-service (lambda _ (substitute* "data/org.gnome.Maps.service.in"