From c73d0555fedfca8f860e76e86143086b251b695e Mon Sep 17 00:00:00 2001
From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Date: Mon, 22 Aug 2022 20:59:58 -0400
Subject: [PATCH] gnu: geocode-glib: Update to 3.26.4 and build with libsoup 3.

* gnu/packages/gnome.scm (geocode-glib): Update to 3.26.4.
[arguments]: Use gexps.
[configure-flags]: Add "-Dsoup2=false".
[native-inputs, inputs]: Remove labels.
[propagated-inputs]: Replace libsoup-minimal-2 with libsoup.
(geocode-glib-with-libsoup2): New variable.
(gnome-settings-daemon)[inputs]: Replace geocode-glib with
geocode-glib-with-libsoup2.
(gnome-clocks): Replace geocode-glib with geocode-glib-with-libsoup2.
---
 gnu/packages/gnome.scm                    | 52 ++++++++++++++---------
 gnu/packages/patches/geoclue-config.patch |  2 +
 2 files changed, 34 insertions(+), 20 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 0c5257241d..d7db928044 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -5432,7 +5432,7 @@ (define-public geoclue
 (define-public geocode-glib
   (package
     (name "geocode-glib")
-    (version "3.26.2")
+    (version "3.26.4")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnome/sources/geocode-glib/"
@@ -5440,29 +5440,31 @@ (define-public geocode-glib
                                   "geocode-glib-" version ".tar.xz"))
               (sha256
                (base32
-                "1l8g0f13xgkrk335afr9w8k46mziwb2jnyhl07jccl5yl37q9zh1"))))
+                "1aipd82qk404qy88pyfgplzgi83db4hi51vkl54h8isqs4k6i6id"))))
     (build-system meson-build-system)
     (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         ;; The tests require a bunch of locales.
-         (add-before 'check 'set-locales
-           (lambda* (#:key inputs #:allow-other-keys)
-             (setenv "GUIX_LOCPATH"
-                     (search-input-directory inputs "lib/locale")))))))
+     (list
+      #:configure-flags #~(list "-Dsoup2=false")
+      #:phases
+      #~(modify-phases %standard-phases
+          ;; The tests require a bunch of locales.
+          (add-before 'check 'set-locales
+            (lambda* (#:key inputs #:allow-other-keys)
+              (setenv "GUIX_LOCPATH"
+                      (search-input-directory inputs "lib/locale")))))))
     (native-inputs
-     `(("glib:bin" ,glib "bin") ; for glib-mkenums
-       ("glibc-locales" ,glibc-locales) ; for tests
-       ("gettext" ,gettext-minimal)
-       ("gobject-introspection" ,gobject-introspection)
-       ("gtk-doc" ,gtk-doc/stable)
-       ("pkg-config" ,pkg-config)
-       ("json-glib" ,json-glib)))
+     (list `(,glib "bin")               ;for glib-mkenums
+           glibc-locales                ;for tests
+           gettext-minimal
+           gobject-introspection
+           gtk-doc/stable
+           pkg-config
+           json-glib))
     (propagated-inputs
-     ;; geocode-glib-1.0.pc refers to GIO.
+     ;; geocode-glib-2.0.pc refers to GIO.
      (list glib))
     (inputs
-     `(("libsoup" ,libsoup-minimal-2)))
+     (list libsoup))
     (home-page "https://github.com/GNOME/geocode-glib/")
     (synopsis "Geocoding and reverse-geocoding library")
     (description
@@ -5472,6 +5474,16 @@ (define-public geocode-glib
 faster results and to avoid unnecessary server load.")
     (license license:lgpl2.0+)))
 
+(define-public geocode-glib-with-libsoup2
+  (package
+    (inherit geocode-glib)
+    (name "geocode-glib-with-libsoup2")
+    (arguments (substitute-keyword-arguments (package-arguments geocode-glib)
+                 ((#:configure-flags flags ''())
+                  #~(delete "-Dsoup2=false" #$flags))))
+    (inputs (modify-inputs (package-inputs geocode-glib)
+              (replace "libsoup" libsoup-minimal-2)))))
+
 (define-public upower
   (package
     (name "upower")
@@ -5698,7 +5710,7 @@ (define-public gnome-settings-daemon
            lcms
            libnotify
            geoclue
-           geocode-glib
+           geocode-glib-with-libsoup2
            libgweather
            gnome-desktop
            nss
@@ -9847,7 +9859,7 @@ (define-public gnome-clocks
            gtk+
            gsound
            geoclue
-           geocode-glib
+           geocode-glib-with-libsoup2
            libgweather
            libhandy
            gnome-desktop))
diff --git a/gnu/packages/patches/geoclue-config.patch b/gnu/packages/patches/geoclue-config.patch
index a3a6694cf7..e4ef6f2d33 100644
--- a/gnu/packages/patches/geoclue-config.patch
+++ b/gnu/packages/patches/geoclue-config.patch
@@ -1,3 +1,5 @@
+Allow the configuration file to be specified via an environment variable.
+
 diff --git a/src/gclue-config.c b/src/gclue-config.c
 index 7ab2a67..e41f3df 100644
 --- a/src/gclue-config.c