[bug#52412] [PATCH] [core-updates-frozen] Fix and upgrade gnome-maps.

[bug#52412] [PATCH] [core-updates-frozen] Fix and upgrade gnome-maps.

[Vivien Kraus via Guix-patches via]

[-- Attachment #1.1: Type: text/plain, Size: 117 bytes --]


Dear Guix,

GNOME Maps requires libsoup 2, even in the new 41.2 release. What do you
think?

Best regards,

Vivien


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.2: Fix GNOME Maps --]
[-- Type: text/x-patch, Size: 1394 bytes --]

From 9213a51aa6ed7b86c48df725aba27d63dbf84691 Mon Sep 17 00:00:00 2001
From: Vivien Kraus <vivien@planete-kraus.eu>
Date: Fri, 10 Dec 2021 14:40:40 +0100
Subject: [PATCH 1/2] gnu: gnome-maps: Build with libsoup 2.

* gnu/packages/geo.scm (gnome-maps) [inputs]: Use libsoup-minimal-2 instead of
libsoup and webkitgtk-with-libsoup2 instead of webkitgtk.
---
 gnu/packages/geo.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm
index 19618ab731..d1ebdd971a 100644
--- a/gnu/packages/geo.scm
+++ b/gnu/packages/geo.scm
@@ -281,7 +281,7 @@ (define-public gnome-maps
        ("libgee" ,libgee)
        ("libhandy" ,libhandy)
        ("libsecret" ,libsecret)
-       ("libsoup" ,libsoup)
+       ("libsoup" ,libsoup-minimal-2)
        ("libgweather" ,libgweather)
        ("libxml2" ,libxml2)
        ("librsvg" ,librsvg)
@@ -295,7 +295,7 @@ (define-public gnome-maps
        ("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
        ("gtk+" ,gtk+)
        ("rest" ,rest)
-       ("webkitgtk" ,webkitgtk)))
+       ("webkitgtk" ,webkitgtk-with-libsoup2)))
     (synopsis "Graphical map viewer and wayfinding program")
     (description "GNOME Maps is a graphical map viewer.  It uses map data from
 the OpenStreetMap project.  It can provide directions for walking, bicycling,
-- 
2.34.0


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.3: Upgrade GNOME Maps --]
[-- Type: text/x-patch, Size: 1260 bytes --]

From 311362310cbcb1f3e108b23a84355e831f8b440e Mon Sep 17 00:00:00 2001
From: Vivien Kraus <vivien@planete-kraus.eu>
Date: Fri, 10 Dec 2021 14:42:32 +0100
Subject: [PATCH 2/2] gnu: gnome-maps: Upgrade to 41.2.

* gnu/packages/geo.scm (gnome-maps): Upgrade to 41.2.
---
 gnu/packages/geo.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm
index d1ebdd971a..84da1820f9 100644
--- a/gnu/packages/geo.scm
+++ b/gnu/packages/geo.scm
@@ -216,7 +216,7 @@ (define-public geos
 (define-public gnome-maps
   (package
     (name "gnome-maps")
-    (version "40.5")
+    (version "41.2")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnome/sources/" name "/"
@@ -224,7 +224,7 @@ (define-public gnome-maps
                                   name "-" version ".tar.xz"))
               (sha256
                (base32
-                "02bdkmb3wyzfrbq726634v4g1hyh9za70cc2ivlbp7zc2n1jgp5c"))))
+                "037xmkmcmcw87vb1c1s3y225m8757k331cvk1m8cshf6mx61p0l1"))))
     (build-system meson-build-system)
     (arguments
      `(#:meson ,meson-0.59         ;positional arguments error with meson 0.60
-- 
2.34.0


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 658 bytes --]

bug#52412: [PATCH] [core-updates-frozen] Fix and upgrade gnome-maps.

[Mathieu Othacehe]

Hey,

> GNOME Maps requires libsoup 2, even in the new 41.2 release. What do you
> think?

Looks nice, pushed both patches to core-updates-frozen.

Thanks for fixing it,

Mathieu