[geary/mjog/build-updates: 3/3] Remove optional Enchant 1.x optional dependency
- From: Michael Gratton <mjog src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [geary/mjog/build-updates: 3/3] Remove optional Enchant 1.x optional dependency
- Date: Sat, 7 Mar 2020 23:28:51 +0000 (UTC)
commit 68ec62d050b4be36da9d5c8818fe1feb804a1ae6
Author: Michael Gratton <mike vee net>
Date: Sat Mar 7 18:06:45 2020 +1100
Remove optional Enchant 1.x optional dependency
meson.build | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
---
diff --git a/meson.build b/meson.build
index b18f2286..7c3b4e00 100644
--- a/meson.build
+++ b/meson.build
@@ -71,7 +71,7 @@ webkit2gtk = dependency('webkit2gtk-4.0', version: '>=' + target_webkit)
# We need appdata.its from appstream-glib:
# https://gitlab.gnome.org/GNOME/geary/issues/439
appstream_glib = dependency('appstream-glib', version: '>=0.7.10')
-enchant = dependency('enchant-2', version: '>=2.1', required: false) # see below
+enchant = dependency('enchant-2', version: '>=2.1')
folks = dependency('folks', version: '>=0.11')
gck = dependency('gck-1')
gcr = dependency('gcr-3', version: '>= 3.10.1')
@@ -100,11 +100,6 @@ libytnef = dependency('libytnef', version: '>= 1.9.3', required: get_option('tne
posix = valac.find_library('posix')
webkit2gtk_web_extension = dependency('webkit2gtk-web-extension-4.0', version: '>=' + target_webkit)
-# Can currently use either Enchant 1 or 2
-if not enchant.found()
- enchant = dependency('enchant', version: '>=1.6')
-endif
-
# Libunwind system dependencies above ensures appropriate versions,
# but this declared depencency is what we actually build against so we
# can include the custom VAPI correctly. We need to add unwind_lib to
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]