[bug#70831] [PATCH 0/2] Update gnome-maps to 46.10

[bug#70831] [PATCH 0/2] Update gnome-maps to 46.10

[Jonathan Brielmaier via Guix-patches via]

gnome-maps is running fine.
Remarks:
* I filed an issue to make the libportal dependency optional: https://gitlab.gnome.org/GNOME/gnome-maps/-/issues/696
* should we use `#:disallowed-references (,tzdata-for-tests)` for
gnome-maps?

Jonathan Brielmaier (2):
  gnu: libshumate: Update to 1.2.1.
  gnu: gnome-maps: Update to 46.10.

 gnu/packages/geo.scm   | 16 +++++++++++++---
 gnu/packages/gnome.scm | 12 +++++++-----
 2 files changed, 20 insertions(+), 8 deletions(-)


base-commit: aa9ac252206615713ab988d7068da9e14a9bccc0
--
2.41.0

[bug#70831] [PATCH 1/2] gnu: libshumate: Update to 1.2.1.

[Jonathan Brielmaier via Guix-patches via]

* gnu/packages/gnome.scm (libshumate): Update to 1.2.1.
[arguments]: Drop `-Dlibsoup3=true` configure flag as it got removed
upstream.  It only supports libsoup3 now.
[native-inputs]: Add gperf.
[propagated-inputs]: Add json-glib and protobuf-c.

Change-Id: Ibe63b6f2060f6684f8f68f44c2221ba9d6ad5a45
---
 gnu/packages/gnome.scm | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 489f23865b..ab76f9c019 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -43,7 +43,7 @@
 ;;; Copyright © 2019, 2020 Martin Becze <mjbecze@riseup.net>
 ;;; Copyright © 2019 David Wilson <david@daviwil.com>
 ;;; Copyright © 2019, 2020 Raghav Gururajan <raghavgururajan@disroot.org>
-;;; Copyright © 2019, 2020 Jonathan Brielmaier <jonathan.brielmaier@web.de>
+;;; Copyright © 2019, 2020, 2024 Jonathan Brielmaier <jonathan.brielmaier@web.de>
 ;;; Copyright © 2019-2022 Liliana Marie Prikler <liliana.prikler@gmail.com>
 ;;; Copyright © 2020 Oleg Pykhalov <go.wigust@gmail.com>
 ;;; Copyright © 2020 Pierre Neidhardt <mail@ambrevar.xyz>
@@ -5030,7 +5030,7 @@ (define-public rest-next
 (define-public libshumate
   (package
     (name "libshumate")
-    (version "1.0.5")
+    (version "1.2.1")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnome/sources/" name "/"
@@ -5038,11 +5038,10 @@ (define-public libshumate
                                   name "-" version ".tar.xz"))
               (sha256
                (base32
-                "0v4m07vxm3m4a2vqkp2wfsc3zsf92fpigc1k8yq49vkpj7gxikx8"))))
+                "04cwakbdr68nw4kh956xhf447fawz8badpyd76hg4ir1gq3yw18i"))))
     (build-system meson-build-system)
     (arguments
-     (list #:configure-flags #~(list "-Dlibsoup3=true")
-           #:phases
+     (list #:phases
            #~(modify-phases %standard-phases
                (replace 'check
                  (lambda* (#:key tests? test-options #:allow-other-keys)
@@ -5062,6 +5061,7 @@ (define-public libshumate
      (list gi-docgen
            `(,glib "bin")
            gobject-introspection
+           gperf
            pkg-config
            ;; For tests:
            xorg-server-for-tests
@@ -5072,7 +5072,9 @@ (define-public libshumate
      (list cairo
            glib
            gtk
+           json-glib
            libsoup
+           protobuf-c
            sqlite))
     (home-page "https://wiki.gnome.org/Projects/libshumate")
     (synopsis "GtkWidget C library for displaying maps")
--
2.41.0

[bug#70831] [PATCH 2/2] gnu: gnome-maps: Update to 46.10.

[Jonathan Brielmaier via Guix-patches via]

* gnu/packages/geo.scm (gnome-maps): Update to 46.10.
[arguments]: Add phase to setup time zones for a new test.
[native-inputs]: Add libportal and tzdata-for-tests.

Change-Id: Ife9b17eda68662d2adb289acfeacf1dc8f179a46
---
 gnu/packages/geo.scm | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm
index 985fa77231..1dd0c7ba92 100644
--- a/gnu/packages/geo.scm
+++ b/gnu/packages/geo.scm
@@ -22,6 +22,7 @@
 ;;; Copyright © 2022 Roman Scherer <roman.scherer@burningswell.com>
 ;;; Copyright © 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
 ;;; Copyright © 2022 Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
+;;; Copyright © 2024 Jonathan Brielmaier <jonathan.brielmaier@web.de>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -83,6 +84,7 @@ (define-module (gnu packages geo)
   #:use-module (gnu packages flex)
   #:use-module (gnu packages fonts)
   #:use-module (gnu packages fontutils)
+  #:use-module (gnu packages freedesktop)
   #:use-module (gnu packages gcc)
   #:use-module (gnu packages gettext)
   #:use-module (gnu packages ghostscript)
@@ -472,7 +474,7 @@ (define-public geos
 (define-public gnome-maps
   (package
     (name "gnome-maps")
-    (version "44.5")
+    (version "46.10")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnome/sources/" name "/"
@@ -480,7 +482,7 @@ (define-public gnome-maps
                                   name "-" version ".tar.xz"))
               (sha256
                (base32
-                "026488yb6azwb2sm0yy0iaipk914l3agvb7d8azks4kyjqlslyb8"))))
+                "1br1ak0cwvvv8rszj9ffyvir7qcbxys940ygy22dzzn2l2byw9az"))))
     (build-system meson-build-system)
     (arguments
      (list
@@ -496,6 +498,12 @@ (define-public gnome-maps
                                     "update_desktop_database"))
                    (string-append option ": false"))
                   (else all))))))
+          (add-before 'check 'check-setup
+            (lambda* (#:key native-inputs inputs #:allow-other-keys)
+              ;; for timeTest
+              (setenv "TZDIR"
+                      (search-input-directory (or native-inputs inputs)
+                                              "share/zoneinfo"))))
           (add-after 'install 'wrap
             (lambda _
               (let ((gi-typelib-path (getenv "GI_TYPELIB_PATH")))
@@ -510,7 +518,9 @@ (define-public gnome-maps
      (list gettext-minimal
            `(,glib "bin")
            gobject-introspection
-           pkg-config))
+           libportal
+           pkg-config
+           tzdata-for-tests))
     (inputs
      (list folks
            evolution-data-server
--
2.41.0

[bug#70831] [PATCH 1/2] gnu: libshumate: Update to 1.2.1.

[Maxim Cournoyer]

Jonathan Brielmaier <jonathan.brielmaier@web.de> writes:

> * gnu/packages/gnome.scm (libshumate): Update to 1.2.1.
> [arguments]: Drop `-Dlibsoup3=true` configure flag as it got removed
> upstream.  It only supports libsoup3 now.
> [native-inputs]: Add gperf.
> [propagated-inputs]: Add json-glib and protobuf-c.
>
> Change-Id: Ibe63b6f2060f6684f8f68f44c2221ba9d6ad5a45

Reviewed-by: Maxim Cournoyer <maxim.cournoyer@gmail>

-- 
Thanks,
Maxim

[bug#70831] [PATCH 0/2] Update gnome-maps to 46.10

[Christopher Baines]

[-- Attachment #1: Type: text/plain, Size: 765 bytes --]

Jonathan Brielmaier via Guix-patches via <guix-patches@gnu.org> writes:

> gnome-maps is running fine.
> Remarks:
> * I filed an issue to make the libportal dependency optional: https://gitlab.gnome.org/GNOME/gnome-maps/-/issues/696
> * should we use `#:disallowed-references (,tzdata-for-tests)` for
> gnome-maps?

That seems fine to me.

> Jonathan Brielmaier (2):
>   gnu: libshumate: Update to 1.2.1.
>   gnu: gnome-maps: Update to 46.10.
>
>  gnu/packages/geo.scm   | 16 +++++++++++++---
>  gnu/packages/gnome.scm | 12 +++++++-----
>  2 files changed, 20 insertions(+), 8 deletions(-)
>
>
> base-commit: aa9ac252206615713ab988d7068da9e14a9bccc0

These changes look good though, so I've pushed them to master as
173420d73c5df7b1b5efe1dd186c57dcdb2ae6ae.

Chris

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