[gnome-initial-setup/wip/wjt/geocode-glib-2.0: 2/2] Build against geocode-glib-2.0 when using soup3




commit 41a490f6d00bf6dc45c688e733363b53e062e564
Author: Will Thompson <wjt endlessos org>
Date:   Thu Jun 30 15:54:34 2022 +0100

    Build against geocode-glib-2.0 when using soup3
    
    geocode-glib 3.26.3 was released today, with optional soup3 support.
    When built against soup3, it generates a geocode-glib-2.0 pkg-config
    file rather than geocode-glib-1.0.
    
    Adjust our dependency based on initial setup's own soup2 flag.

 gnome-initial-setup/meson.build | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
---
diff --git a/gnome-initial-setup/meson.build b/gnome-initial-setup/meson.build
index d3249f23..c5a2bcfc 100644
--- a/gnome-initial-setup/meson.build
+++ b/gnome-initial-setup/meson.build
@@ -35,7 +35,11 @@ else
   webkitgtk_dep = dependency ('webkit2gtk-4.1')
 endif
 
-geocode_glib_dep = dependency ('geocode-glib-1.0')
+if get_option('soup2')
+  geocode_glib_dep = dependency ('geocode-glib-1.0')
+else
+  geocode_glib_dep = dependency ('geocode-glib-2.0')
+endif
 geocode_soup_version = geocode_glib_dep.get_pkgconfig_variable('soupapiversion')
 if geocode_soup_version == ''
   geocode_soup_version = '2.4' # Pre libsoup3 support


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]