[gnome-initial-setup/wip/port-to-gtk4] fixup! build: Drop soup2 build option
- From: Georges Basile Stavracas Neto <gbsneto src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-initial-setup/wip/port-to-gtk4] fixup! build: Drop soup2 build option
- Date: Mon, 25 Jul 2022 15:39:19 +0000 (UTC)
commit 402ae0964f311094ff084da5d4c2127c2f980e81
Author: Georges Basile Stavracas Neto <georges stavracas gmail com>
Date: Mon Jul 25 12:39:10 2022 -0300
fixup! build: Drop soup2 build option
gnome-initial-setup/meson.build | 13 ++++++++++++-
subprojects/geocode-glib.wrap | 3 +++
2 files changed, 15 insertions(+), 1 deletion(-)
---
diff --git a/gnome-initial-setup/meson.build b/gnome-initial-setup/meson.build
index 05e03650..3c057e32 100644
--- a/gnome-initial-setup/meson.build
+++ b/gnome-initial-setup/meson.build
@@ -34,12 +34,23 @@ libadwaita_dep = dependency(
default_options: ['examples=false', 'introspection=disabled', 'tests=false', 'vapi=false'],
)
+geocode_glib_2_dep = dependency(
+ 'geocode-glib-2.0',
+ fallback: ['geocode-glib', 'geocode_glib_dep'],
+ default_options: [
+ 'enable-gtk-doc=false',
+ 'enable-installed-tests=false',
+ 'enable-introspection=false',
+ 'soup2=false',
+ ],
+)
+
dependencies = [
dependency ('libnm', version: '>= 1.2'),
dependency ('libnma-gtk4', version: '>= 1.0'),
dependency ('polkit-gobject-1', version: '>= 0.103'),
dependency ('accountsservice'),
- dependency ('geocode-glib-2.0'),
+ geocode_glib_2_dep,
dependency ('gnome-desktop-4'),
dependency ('gsettings-desktop-schemas', version: '>= 3.37.1'),
dependency ('fontconfig'),
diff --git a/subprojects/geocode-glib.wrap b/subprojects/geocode-glib.wrap
new file mode 100644
index 00000000..072642ad
--- /dev/null
+++ b/subprojects/geocode-glib.wrap
@@ -0,0 +1,3 @@
+[wrap-git]
+url = https://gitlab.freedesktop.org/pwithnall/malcontent.git
+revision = 2f64f3865eef635626e7afeae6a532b29e0fe574
\ No newline at end of file
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]