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

  • Done
  • quality assurance status badge
Details
2 participants
  • Mathieu Othacehe
  • Vivien Kraus
Owner
unassigned
Submitted by
Vivien Kraus
Severity
normal

Debbugs page

Vivien Kraus wrote 3 years ago
(address . guix-patches@gnu.org)
87r1akzi6r.fsf@planete-kraus.eu
Dear Guix,

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

Best regards,

Vivien
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(-)

Toggle diff (24 lines)
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
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(-)

Toggle diff (24 lines)
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
-----BEGIN PGP SIGNATURE-----

iQGzBAEBCAAdFiEEq4yIHjMvkliPpwQnO7C8EjLYuCwFAmGzWiwACgkQO7C8EjLY
uCxISwwAt3VXY3XZkNjFpdk/+GKjhLvgs/pKr9X2EadGAhOGpOeBIzedu5BcNXCl
OfjAj7H41OumjyowPBgWWypWQf6232Ro3bzcK0E4AS1S7qWBPuGwpBb6VwUr/hK1
TInL6EZTTjOxpjv0YipBuIWbMrMKTbiT1oLz7O7bV4j47OlHMfkTGJfh0KZHwKPR
WXyrupSowbI746Pu9twn3F52De7dH4yKyZxZWUh5x4x60ZqCOVZXXyo3DMTN298m
4uOekHQtmy/8er8KGvDoVq7mM/cmF1QScU/j9glAnXXGVmkEF4t9igPY/S832pMp
/AsckmpSH19e/2/72OJs2SOEckLUziBiRcfXaCuwztji2kC4T2zzOrzN0RfXbtKH
GefkIhAuuKx4wj/g2hK+V057VCx0Yf2O76oMqFbfL53fNB3RIaGS9DI9Jo/JgaAZ
uRw0u2II/j8D8nEHm5tEf7HfexIZUUwuxQMOHpO2++yJCPvNyD2gUViGmDeJVe73
o8+EiADN
=X7nj
-----END PGP SIGNATURE-----

Mathieu Othacehe wrote 3 years ago
(name . Vivien Kraus)(address . vivien@planete-kraus.eu)(address . 52412-done@debbugs.gnu.org)
8735n0cr91.fsf@gnu.org
Hey,

Toggle quote (3 lines)
> 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
Closed
?
Your comment

This issue is archived.

To comment on this conversation send an email to 52412@debbugs.gnu.org

To respond to this issue using the mumi CLI, first switch to it
mumi current 52412
Then, you may apply the latest patchset in this issue (with sign off)
mumi am -- -s
Or, compose a reply to this issue
mumi compose
Or, send patches to this issue
mumi send-email *.patch
You may also tag this issue. See list of standard tags. For example, to set the confirmed and easy tags
mumi command -t +confirmed -t +easy
Or, remove the moreinfo tag and set the help tag
mumi command -t -moreinfo -t +help