[gnome-build-meta/abderrahim/update-fdsdk: 1/3] core-deps: add geocode-glib-1

[Jordan Petridis <jpetridis src gnome org>]

commit 7b42b0ea2650b3cb208d1dbe0ec3ae78042d8415
Author: Jordan Petridis <jordan centricular com>
Date:   Fri Jul 1 15:30:54 2022 +0300

    core-deps: add geocode-glib-1
    
    We now build geocode-glib against libsoup, but we still have apps
    that haven't finished porting yet, so we need to add soup2 build
    for the time being.

 elements/core-deps/geocode-glib-1.bst | 21 +++++++++++++++++++++
 elements/core-deps/geocode-glib.bst   |  6 ++++++
 elements/core/gnome-calendar.bst      |  2 +-
 elements/core/gnome-maps.bst          |  2 +-
 elements/core/gnome-photos.bst        |  2 +-
 5 files changed, 30 insertions(+), 3 deletions(-)
---
diff --git a/elements/core-deps/geocode-glib-1.bst b/elements/core-deps/geocode-glib-1.bst
new file mode 100644
index 000000000..d40b8347d
--- /dev/null
+++ b/elements/core-deps/geocode-glib-1.bst
@@ -0,0 +1,21 @@
+kind: meson
+
+sources:
+- kind: git_tag
+  url: gnome:geocode-glib.git
+  track: master
+
+build-depends:
+- sdk/gobject-introspection.bst
+- sdk/gtk-doc.bst
+- freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
+
+depends:
+- sdk/glib.bst
+- sdk/json-glib.bst
+- sdk/libsoup-2.4.bst
+- freedesktop-sdk.bst:bootstrap-import.bst
+
+variables:
+  meson-local: >-
+    -Dsoup2=true
diff --git a/elements/core-deps/geocode-glib.bst b/elements/core-deps/geocode-glib.bst
index 36a1aac8a..905b8b7cd 100644
--- a/elements/core-deps/geocode-glib.bst
+++ b/elements/core-deps/geocode-glib.bst
@@ -19,3 +19,9 @@ depends:
 variables:
   meson-local: >-
     -Dsoup2=false
+
+public:
+  bst:
+    # The icons overlap with geocode-glib-1
+    overlap-whitelist:
+    - '%{datadir}/icons/**'
diff --git a/elements/core/gnome-calendar.bst b/elements/core/gnome-calendar.bst
index fe8d0c461..1a48ccecf 100644
--- a/elements/core/gnome-calendar.bst
+++ b/elements/core/gnome-calendar.bst
@@ -8,9 +8,9 @@ sources:
 build-depends:
 - sdk/appstream-glib.bst
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
-
 depends:
 - core-deps/evolution-data-server.bst
+- core-deps/geocode-glib.bst
 - core-deps/gnome-online-accounts.bst
 - core-deps/libgweather.bst
 - sdk/adwaita-icon-theme.bst
diff --git a/elements/core/gnome-maps.bst b/elements/core/gnome-maps.bst
index cae060b5c..bb992726b 100644
--- a/elements/core/gnome-maps.bst
+++ b/elements/core/gnome-maps.bst
@@ -7,7 +7,7 @@ build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
 depends:
 - core-deps/clutter-gtk.bst
-- core-deps/geocode-glib.bst
+- core-deps/geocode-glib-1.bst
 - core-deps/libchamplain.bst
 - core-deps/libgweather.bst
 - core-deps/librest-0.7.bst
diff --git a/elements/core/gnome-photos.bst b/elements/core/gnome-photos.bst
index bc76761fd..918407414 100644
--- a/elements/core/gnome-photos.bst
+++ b/elements/core/gnome-photos.bst
@@ -22,7 +22,7 @@ runtime-depends:
 depends:
 - core-deps/babl.bst
 - core-deps/gegl.bst
-- core-deps/geocode-glib.bst
+- core-deps/geocode-glib-1.bst
 - core-deps/gexiv2.bst
 - core-deps/gfbgraph.bst
 - core-deps/gnome-online-accounts.bst