Subject: Re: [bug#74493] [PATCH] gnu: geoclue: Update to 2.7.2.

From: Maxim Cournoyer <[email-masked]>
Date: Sun, 24 Nov 2024 21:37:53 +0900

Hi,

Sergey Trofimov <[email-masked]> writes:

> * gnu/packages/gnome.scm (geoclue): Update to 2.7.2.
> * gnu/packages/patches/geoclue-config.patch: Adjust.
> ---
>  gnu/packages/gnome.scm                    |  6 +-
>  gnu/packages/patches/geoclue-config.patch | 76 ++++++++++++++++-------
>  2 files changed, 57 insertions(+), 25 deletions(-)
>
> diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
> index b8accb737d..5fb98ff568 100644
> --- a/gnu/packages/gnome.scm
> +++ b/gnu/packages/gnome.scm
> @@ -5760,7 +5760,7 @@ (define-public colord
>  (define-public geoclue
>    (package
>      (name "geoclue")
> -    (version "2.6.0")
> +    (version "2.7.2")
>      (source
>       (origin
>         (method url-fetch)
> @@ -5768,7 +5768,7 @@ (define-public geoclue
>          (string-append "https://gitlab.freedesktop.org/geoclue/geoclue/-/archive/"
>                         version "/geoclue-" version ".tar.bz2"))
>         (sha256
> -        (base32 "1854i8lih1jkks5w38xv8k5gs7s8629qjg3cg96ji0ffk35yzjfd"))
> +        (base32 "1ljn4k1zlfx0ymmdz8ycfb976vx8r61sx68q854r0xinl124mlh1"))
>         (patches (search-patches "geoclue-config.patch"))))
>      (build-system meson-build-system)
>      (arguments
> @@ -5786,7 +5786,7 @@ (define-public geoclue
>             `(,glib "bin")
>             glib-networking
>             json-glib
> -           libsoup-minimal-2))
> +           libsoup-minimal))

LGTM so far.

>      (home-page "https://gitlab.freedesktop.org/geoclue/geoclue/-/wikis/home")
>      (synopsis "Geolocation service")
>      (description "Geoclue is a D-Bus service that provides location
> diff --git a/gnu/packages/patches/geoclue-config.patch b/gnu/packages/patches/geoclue-config.patch
> index e4ef6f2d33..fed7782171 100644
> --- a/gnu/packages/patches/geoclue-config.patch
> +++ b/gnu/packages/patches/geoclue-config.patch
> @@ -1,27 +1,59 @@
> -Allow the configuration file to be specified via an environment variable.
> +From 45e310482350cfab628f359f2b0efebf06fb7c77 Mon Sep 17 00:00:00 2001
> +From: Sergey Trofimov <[email-masked]>
> +Date: Sat, 23 Nov 2024 14:12:21 +0100
> +Subject: [PATCH] Allow the configuration file to be specified via an
> + environment variable.

Please drop the git metadata; as it isn't useful (e.g. you are not the
original author of this patch, which this would seem to claim).

I typically only keep the git metadata if it came from the original
author (e.g. I wrote it from scratch and submitted it for inclusion
upstream).

If you use Emacs with magit it has a means to save a commit diff to a
file (W-s on the diff if I recall), in case that helps.

With this small adjustment, feel free to push to master.

-- 
Thanks,
Maxim